Skip to content

Commit 370e394

Browse files
PhilipYangAgregkh
authored andcommitted
drm/amdkfd: KFD release_work possible circular locking
[ Upstream commit 1b9366c ] If waiting for gpu reset done in KFD release_work, thers is WARNING: possible circular locking dependency detected #2 kfd_create_process kfd_process_mutex flush kfd release work #1 kfd release work wait for amdgpu reset work #0 amdgpu_device_gpu_reset kgd2kfd_pre_reset kfd_process_mutex Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock((work_completion)(&p->release_work)); lock((wq_completion)kfd_process_wq); lock((work_completion)(&p->release_work)); lock((wq_completion)amdgpu-reset-dev); To fix this, KFD create process move flush release work outside kfd_process_mutex. Signed-off-by: Philip Yang <[email protected]> Reviewed-by: Felix Kuehling <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 74dfce1 commit 370e394

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/gpu/drm/amd/amdkfd/kfd_process.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,14 @@ struct kfd_process *kfd_create_process(struct file *filep)
755755
if (thread->group_leader->mm != thread->mm)
756756
return ERR_PTR(-EINVAL);
757757

758+
/* If the process just called exec(3), it is possible that the
759+
* cleanup of the kfd_process (following the release of the mm
760+
* of the old process image) is still in the cleanup work queue.
761+
* Make sure to drain any job before trying to recreate any
762+
* resource for this process.
763+
*/
764+
flush_workqueue(kfd_process_wq);
765+
758766
/*
759767
* take kfd processes mutex before starting of process creation
760768
* so there won't be a case where two threads of the same process
@@ -767,14 +775,6 @@ struct kfd_process *kfd_create_process(struct file *filep)
767775
if (process) {
768776
pr_debug("Process already found\n");
769777
} else {
770-
/* If the process just called exec(3), it is possible that the
771-
* cleanup of the kfd_process (following the release of the mm
772-
* of the old process image) is still in the cleanup work queue.
773-
* Make sure to drain any job before trying to recreate any
774-
* resource for this process.
775-
*/
776-
flush_workqueue(kfd_process_wq);
777-
778778
process = create_process(thread);
779779
if (IS_ERR(process))
780780
goto out;

0 commit comments

Comments
 (0)