drm/amdgpu: Make pin_size values atomic

Concurrent execution of the non-atomic arithmetic could result in
completely bogus values.

v2:
* Rebased on v2 of the previous patch

Cc: stable@vger.kernel.org
Bugzilla: https://bugs.freedesktop.org/106872
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 51b16de008bbccbcd8ee654963b9784f1c514e63..53435da158c229e5d0e7f3d85afb4cadc61dd6f1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1589,9 +1589,9 @@ struct amdgpu_device {
        DECLARE_HASHTABLE(mn_hash, 7);
 
        /* tracking pinned memory */
-       u64 vram_pin_size;
-       u64 visible_pin_size;
-       u64 gart_pin_size;
+       atomic64_t vram_pin_size;
+       atomic64_t visible_pin_size;
+       atomic64_t gart_pin_size;
 
        /* amdkfd interface */
        struct kfd_dev          *kfd;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 9881a1e55df3e321df116fd5de3e39bae94f74ed..5a2a5ba29f9a1bef41429015cf541f0406f6f03e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -262,7 +262,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev,
                return;
        }
 
-       total_vram = adev->gmc.real_vram_size - adev->vram_pin_size;
+       total_vram = adev->gmc.real_vram_size - atomic64_read(&adev->vram_pin_size);
        used_vram = amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
        free_vram = used_vram >= total_vram ? 0 : total_vram - used_vram;
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index c00bd9591dadaa88e07a143822de50e047fb141e..207f238649b47f1b46a3c001594425b0a5c2cfaa 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -501,13 +501,13 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
        case AMDGPU_INFO_VRAM_GTT: {
                struct drm_amdgpu_info_vram_gtt vram_gtt;
 
-               vram_gtt.vram_size = adev->gmc.real_vram_size;
-               vram_gtt.vram_size -= adev->vram_pin_size;
-               vram_gtt.vram_cpu_accessible_size = adev->gmc.visible_vram_size;
-               vram_gtt.vram_cpu_accessible_size -= adev->visible_pin_size;
+               vram_gtt.vram_size = adev->gmc.real_vram_size -
+                       atomic64_read(&adev->vram_pin_size);
+               vram_gtt.vram_cpu_accessible_size = adev->gmc.visible_vram_size -
+                       atomic64_read(&adev->visible_pin_size);
                vram_gtt.gtt_size = adev->mman.bdev.man[TTM_PL_TT].size;
                vram_gtt.gtt_size *= PAGE_SIZE;
-               vram_gtt.gtt_size -= adev->gart_pin_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;
        }
@@ -516,16 +516,16 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
 
                memset(&mem, 0, sizeof(mem));
                mem.vram.total_heap_size = adev->gmc.real_vram_size;
-               mem.vram.usable_heap_size =
-                       adev->gmc.real_vram_size - adev->vram_pin_size;
+               mem.vram.usable_heap_size = adev->gmc.real_vram_size -
+                       atomic64_read(&adev->vram_pin_size);
                mem.vram.heap_usage =
                        amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
                mem.vram.max_allocation = mem.vram.usable_heap_size * 3 / 4;
 
                mem.cpu_accessible_vram.total_heap_size =
                        adev->gmc.visible_vram_size;
-               mem.cpu_accessible_vram.usable_heap_size =
-                       adev->gmc.visible_vram_size - adev->visible_pin_size;
+               mem.cpu_accessible_vram.usable_heap_size = adev->gmc.visible_vram_size -
+                       atomic64_read(&adev->visible_pin_size);
                mem.cpu_accessible_vram.heap_usage =
                        amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
                mem.cpu_accessible_vram.max_allocation =
@@ -533,8 +533,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
 
                mem.gtt.total_heap_size = adev->mman.bdev.man[TTM_PL_TT].size;
                mem.gtt.total_heap_size *= PAGE_SIZE;
-               mem.gtt.usable_heap_size = mem.gtt.total_heap_size
-                       - adev->gart_pin_size;
+               mem.gtt.usable_heap_size = mem.gtt.total_heap_size -
+                       atomic64_read(&adev->gart_pin_size);
                mem.gtt.heap_usage =
                        amdgpu_gtt_mgr_usage(&adev->mman.bdev.man[TTM_PL_TT]);
                mem.gtt.max_allocation = mem.gtt.usable_heap_size * 3 / 4;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index f0239feceab4b22c80d691ba877ad65c128ada18..1fd83ed175fa23f352d871ff75a115c1f4bb9983 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -916,10 +916,11 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
 
        domain = amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type);
        if (domain == AMDGPU_GEM_DOMAIN_VRAM) {
-               adev->vram_pin_size += amdgpu_bo_size(bo);
-               adev->visible_pin_size += amdgpu_vram_mgr_bo_visible_size(bo);
+               atomic64_add(amdgpu_bo_size(bo), &adev->vram_pin_size);
+               atomic64_add(amdgpu_vram_mgr_bo_visible_size(bo),
+                            &adev->visible_pin_size);
        } else if (domain == AMDGPU_GEM_DOMAIN_GTT) {
-               adev->gart_pin_size += amdgpu_bo_size(bo);
+               atomic64_add(amdgpu_bo_size(bo), &adev->gart_pin_size);
        }
 
 error:
@@ -968,10 +969,11 @@ int amdgpu_bo_unpin(struct amdgpu_bo *bo)
                return 0;
 
        if (bo->tbo.mem.mem_type == TTM_PL_VRAM) {
-               adev->vram_pin_size -= amdgpu_bo_size(bo);
-               adev->visible_pin_size -= amdgpu_vram_mgr_bo_visible_size(bo);
+               atomic64_sub(amdgpu_bo_size(bo), &adev->vram_pin_size);
+               atomic64_sub(amdgpu_vram_mgr_bo_visible_size(bo),
+                            &adev->visible_pin_size);
        } else if (bo->tbo.mem.mem_type == TTM_PL_TT) {
-               adev->gart_pin_size -= amdgpu_bo_size(bo);
+               atomic64_sub(amdgpu_bo_size(bo), &adev->gart_pin_size);
        }
 
        for (i = 0; i < bo->placement.num_placement; i++) {