lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 20 Jun 2022 14:50:59 +0200 From: Greg Kroah-Hartman <gregkh@...uxfoundation.org> To: linux-kernel@...r.kernel.org Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, stable@...r.kernel.org, Martin Roukala <martin.roukala@...uf.org>, Mike Lothian <mike@...eburn.co.uk>, Christian König <christian.koenig@....com>, Michel Dänzer <mdaenzer@...hat.com>, Alex Deucher <alexander.deucher@....com> Subject: [PATCH 5.18 121/141] drm/amdgpu: Fix GTT size reporting in amdgpu_ioctl From: Michel Dänzer <mdaenzer@...hat.com> commit c904e3acbab3fd97649cd4ab1ff7f1521ad3a255 upstream. The commit below changed the TTM manager size unit from pages to bytes, but failed to adjust the corresponding calculations in amdgpu_ioctl. Fixes: dfa714b88eb0 ("drm/amdgpu: remove GTT accounting v2") Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1930 Bug: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6642 Tested-by: Martin Roukala <martin.roukala@...uf.org> Tested-by: Mike Lothian <mike@...eburn.co.uk> Reviewed-by: Christian König <christian.koenig@....com> Signed-off-by: Michel Dänzer <mdaenzer@...hat.com> Signed-off-by: Alex Deucher <alexander.deucher@....com> Cc: stable@...r.kernel.org # 5.18.x Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org> --- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -634,7 +634,6 @@ int amdgpu_info_ioctl(struct drm_device atomic64_read(&adev->visible_pin_size), vram_gtt.vram_size); vram_gtt.gtt_size = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT)->size; - vram_gtt.gtt_size *= PAGE_SIZE; vram_gtt.gtt_size -= atomic64_read(&adev->gart_pin_size); return copy_to_user(out, &vram_gtt, min((size_t)size, sizeof(vram_gtt))) ? -EFAULT : 0; @@ -667,7 +666,6 @@ int amdgpu_info_ioctl(struct drm_device mem.cpu_accessible_vram.usable_heap_size * 3 / 4; mem.gtt.total_heap_size = gtt_man->size; - mem.gtt.total_heap_size *= PAGE_SIZE; mem.gtt.usable_heap_size = mem.gtt.total_heap_size - atomic64_read(&adev->gart_pin_size); mem.gtt.heap_usage = ttm_resource_manager_usage(gtt_man);
Powered by blists - more mailing lists