drm/amdgpu: switch gtt_mgr to counting used pages
authorLang Yu <Lang.Yu@amd.com>
Tue, 22 Jun 2021 16:23:37 +0000 (12:23 -0400)
committerAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Wed, 23 Jun 2021 18:59:39 +0000 (14:59 -0400)
Change mgr->available into mgr->used (invert the value).

Makes more sense to do it this way since we don't need the spinlock any
more to double check the handling.

v3 (chk): separated from the TEMPOARAY FLAG change.

Signed-off-by: Lang Yu <Lang.Yu@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Acked-by: Nirmoy Das <nirmoy.das@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210622162339.761651-4-andrey.grodzovsky@amd.com
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h

index 3b452085616222ecc70b2630262ef460ca57d27d..543000304a1cb3e297e5daace0274bb9e6beb5eb 100644 (file)
@@ -132,14 +132,10 @@ static int amdgpu_gtt_mgr_new(struct ttm_resource_manager *man,
        struct amdgpu_gtt_node *node;
        int r;
 
-       if (!(place->flags & TTM_PL_FLAG_TEMPORARY)) {
-               spin_lock(&mgr->lock);
-               if (atomic64_read(&mgr->available) < num_pages) {
-                       spin_unlock(&mgr->lock);
-                       return -ENOSPC;
-               }
-               atomic64_sub(num_pages, &mgr->available);
-               spin_unlock(&mgr->lock);
+       if (!(place->flags & TTM_PL_FLAG_TEMPORARY) &&
+           atomic64_add_return(num_pages, &mgr->used) >  man->size) {
+               atomic64_sub(num_pages, &mgr->used);
+               return -ENOSPC;
        }
 
        node = kzalloc(struct_size(node, base.mm_nodes, 1), GFP_KERNEL);
@@ -177,7 +173,7 @@ err_free:
 
 err_out:
        if (!(place->flags & TTM_PL_FLAG_TEMPORARY))
-               atomic64_add(num_pages, &mgr->available);
+               atomic64_sub(num_pages, &mgr->used);
 
        return r;
 }
@@ -202,7 +198,7 @@ static void amdgpu_gtt_mgr_del(struct ttm_resource_manager *man,
        spin_unlock(&mgr->lock);
 
        if (!(res->placement & TTM_PL_FLAG_TEMPORARY))
-               atomic64_add(res->num_pages, &mgr->available);
+               atomic64_sub(res->num_pages, &mgr->used);
 
        kfree(node);
 }
@@ -217,9 +213,8 @@ static void amdgpu_gtt_mgr_del(struct ttm_resource_manager *man,
 uint64_t amdgpu_gtt_mgr_usage(struct ttm_resource_manager *man)
 {
        struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
-       s64 result = man->size - atomic64_read(&mgr->available);
 
-       return (result > 0 ? result : 0) * PAGE_SIZE;
+       return atomic64_read(&mgr->used) * PAGE_SIZE;
 }
 
 /**
@@ -269,9 +264,8 @@ static void amdgpu_gtt_mgr_debug(struct ttm_resource_manager *man,
        drm_mm_print(&mgr->mm, printer);
        spin_unlock(&mgr->lock);
 
-       drm_printf(printer, "man size:%llu pages, gtt available:%lld pages, usage:%lluMB\n",
-                  man->size, (u64)atomic64_read(&mgr->available),
-                  amdgpu_gtt_mgr_usage(man) >> 20);
+       drm_printf(printer, "man size:%llu pages,  gtt used:%llu pages\n",
+                  man->size, atomic64_read(&mgr->used));
 }
 
 static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func = {
@@ -303,7 +297,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
        size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;
        drm_mm_init(&mgr->mm, start, size);
        spin_lock_init(&mgr->lock);
-       atomic64_set(&mgr->available, gtt_size >> PAGE_SHIFT);
+       atomic64_set(&mgr->used, 0);
 
        ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, &mgr->manager);
        ttm_resource_manager_set_used(man, true);
index e69f3e8e06e571f2e0e7ea467a36374c95979cec..3205fd5200601c7f36da9143eedb4e258c20ab1b 100644 (file)
@@ -52,7 +52,7 @@ struct amdgpu_gtt_mgr {
        struct ttm_resource_manager manager;
        struct drm_mm mm;
        spinlock_t lock;
-       atomic64_t available;
+       atomic64_t used;
 };
 
 struct amdgpu_preempt_mgr {