drm/amdgpu: avoid double drm_exec_fini() in userq validate
Subsystems (2)
PATCH 1/1 drm/amdgpu: avoid double drm_exec_fini() in userq validate
From: Hongyan Xu <[email protected]>
When new_addition is true, amdgpu_userq_vm_validate() calls drm_exec_fini(&exec) before iterating over the collected HMM ranges and calling amdgpu_ttm_tt_get_user_pages().
If amdgpu_ttm_tt_get_user_pages() fails in that path, the code jumps to unlock_all and calls drm_exec_fini(&exec) a second time on the same exec object. drm_exec_fini() is not idempotent: it frees exec->objects and may also drop exec->contended and finalize the ww acquire context.
Route that error path directly to the range cleanup once exec has already been finalized.
Issue found using a prototype static analysis tool and confirmed by code review.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +2 -1
@@ -1193,7 +1193,7 @@ amdgpu_userq_vm_validate(struct amdgpu_userq_mgr *uq_mgr) bo = range->bo; ret =amdgpu_ttm_tt_get_user_pages (bo, range);if (ret) - goto unlock_all; + goto free_ranges; } invalidated = true;
@@ -1220,6 +1220,7 @@ amdgpu_userq_vm_validate(struct amdgpu_userq_mgr *uq_mgr) unlock_all:drm_exec_fini (&exec); +free_ranges:xa_for_each (&xa, tmp_key, range) {if (!range)continue ;
Signature · 1 line
2.50.1.windows.1
Please ignore the patch I sent previously. It was sent in error.
Sorry for the noise.
Thanks,
hongyan Xu