Skip to content

Commit 6bfa3b6

Browse files
PhilipYangAjfvogel
authored andcommitted
drm/amdkfd: KFD release_work possible circular locking
[ Upstream commit 1b9366c601039d60546794c63fbb83ce8e53b978 ] 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]> (cherry picked from commit 0d8562e358176106d9a0a3c8932cf706119eccde) Signed-off-by: Jack Vogel <[email protected]>
1 parent 19bf988 commit 6bfa3b6

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
@@ -842,6 +842,14 @@ struct kfd_process *kfd_create_process(struct task_struct *thread)
842842
return ERR_PTR(-EINVAL);
843843
}
844844

845+
/* If the process just called exec(3), it is possible that the
846+
* cleanup of the kfd_process (following the release of the mm
847+
* of the old process image) is still in the cleanup work queue.
848+
* Make sure to drain any job before trying to recreate any
849+
* resource for this process.
850+
*/
851+
flush_workqueue(kfd_process_wq);
852+
845853
/*
846854
* take kfd processes mutex before starting of process creation
847855
* so there won't be a case where two threads of the same process
@@ -860,14 +868,6 @@ struct kfd_process *kfd_create_process(struct task_struct *thread)
860868
if (process) {
861869
pr_debug("Process already found\n");
862870
} else {
863-
/* If the process just called exec(3), it is possible that the
864-
* cleanup of the kfd_process (following the release of the mm
865-
* of the old process image) is still in the cleanup work queue.
866-
* Make sure to drain any job before trying to recreate any
867-
* resource for this process.
868-
*/
869-
flush_workqueue(kfd_process_wq);
870-
871871
process = create_process(thread);
872872
if (IS_ERR(process))
873873
goto out;

0 commit comments

Comments
 (0)