drm/amdkfd: fix restore worker race condition
Subsystems (3)
PATCH 1/1 drm/amdkfd: fix restore worker race condition
In free memory of gpu path, remove bo from validate_list to make sure restore worker don't access the BO any more, then unregister bo MMU interval notifier. Otherwise, the restore worker will crash in the middle of validating BO user pages if MMU interval notifer is gone.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +3 -3
@@ -1302,15 +1302,15 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(return -EBUSY ; } -/* No more MMU notifiers */ -amdgpu_mn_unregister (mem->bo); -/* Make sure restore workers don't access the BO any more */ bo_list_entry = &mem->validate_list;mutex_lock (&process_info->lock);list_del (&bo_list_entry->head);mutex_unlock (&process_info->lock); +/* No more MMU notifiers */ +amdgpu_mn_unregister (mem->bo); + ret =reserve_bo_and_cond_vms (mem,NULL ,BO_VM_ALL , &ctx);if (unlikely (ret))return ret;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 2020-05-21 um 10:42 a.m. schrieb Philip Yang:
Quoted 6 lines
In free memory of gpu path, remove bo from
validate_listto make sure restore worker don't access the BO any more, then unregister bo MMU interval notifier. Otherwise, the restore worker will crash in the middle of validating BO user pages if MMU interval notifer is gone.Signed-off-by Philip Yang <[email protected]>
Quoted 17 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +0
-3@@ -1302,15 +1302,15 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(return -EBUSY ; } -/* No more MMU notifiers */ -amdgpu_mn_unregister (mem->bo); -/* Make sure restore workers don't access the BO any more */ bo_list_entry = &mem->validate_list;
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( · line 1316
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +3
-0mutex_lock (&process_info->lock);list_del (&bo_list_entry->head);mutex_unlock (&process_info->lock); +/* No more MMU notifiers */ +amdgpu_mn_unregister (mem->bo); + ret =reserve_bo_and_cond_vms (mem,NULL ,BO_VM_ALL , &ctx);if (unlikely (ret))return ret;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx