Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: switch gtt_mgr to counting used pages

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

authored by

Lang Yu and committed by
Andrey Grodzovsky
2b70af79 9a22149e

+11 -17
+10 -16
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
··· 132 132 struct amdgpu_gtt_node *node; 133 133 int r; 134 134 135 - if (!(place->flags & TTM_PL_FLAG_TEMPORARY)) { 136 - spin_lock(&mgr->lock); 137 - if (atomic64_read(&mgr->available) < num_pages) { 138 - spin_unlock(&mgr->lock); 139 - return -ENOSPC; 140 - } 141 - atomic64_sub(num_pages, &mgr->available); 142 - spin_unlock(&mgr->lock); 135 + if (!(place->flags & TTM_PL_FLAG_TEMPORARY) && 136 + atomic64_add_return(num_pages, &mgr->used) > man->size) { 137 + atomic64_sub(num_pages, &mgr->used); 138 + return -ENOSPC; 143 139 } 144 140 145 141 node = kzalloc(struct_size(node, base.mm_nodes, 1), GFP_KERNEL); ··· 173 177 174 178 err_out: 175 179 if (!(place->flags & TTM_PL_FLAG_TEMPORARY)) 176 - atomic64_add(num_pages, &mgr->available); 180 + atomic64_sub(num_pages, &mgr->used); 177 181 178 182 return r; 179 183 } ··· 198 202 spin_unlock(&mgr->lock); 199 203 200 204 if (!(res->placement & TTM_PL_FLAG_TEMPORARY)) 201 - atomic64_add(res->num_pages, &mgr->available); 205 + atomic64_sub(res->num_pages, &mgr->used); 202 206 203 207 kfree(node); 204 208 } ··· 213 217 uint64_t amdgpu_gtt_mgr_usage(struct ttm_resource_manager *man) 214 218 { 215 219 struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man); 216 - s64 result = man->size - atomic64_read(&mgr->available); 217 220 218 - return (result > 0 ? result : 0) * PAGE_SIZE; 221 + return atomic64_read(&mgr->used) * PAGE_SIZE; 219 222 } 220 223 221 224 /** ··· 264 269 drm_mm_print(&mgr->mm, printer); 265 270 spin_unlock(&mgr->lock); 266 271 267 - drm_printf(printer, "man size:%llu pages, gtt available:%lld pages, usage:%lluMB\n", 268 - man->size, (u64)atomic64_read(&mgr->available), 269 - amdgpu_gtt_mgr_usage(man) >> 20); 272 + drm_printf(printer, "man size:%llu pages, gtt used:%llu pages\n", 273 + man->size, atomic64_read(&mgr->used)); 270 274 } 271 275 272 276 static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func = { ··· 297 303 size = (adev->gmc.gart_size >> PAGE_SHIFT) - start; 298 304 drm_mm_init(&mgr->mm, start, size); 299 305 spin_lock_init(&mgr->lock); 300 - atomic64_set(&mgr->available, gtt_size >> PAGE_SHIFT); 306 + atomic64_set(&mgr->used, 0); 301 307 302 308 ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, &mgr->manager); 303 309 ttm_resource_manager_set_used(man, true);
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
··· 52 52 struct ttm_resource_manager manager; 53 53 struct drm_mm mm; 54 54 spinlock_t lock; 55 - atomic64_t available; 55 + atomic64_t used; 56 56 }; 57 57 58 58 struct amdgpu_preempt_mgr {