Skip to content

Commit 2059e6e

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 0759d15 commit 2059e6e

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
@@ -812,6 +812,14 @@ struct kfd_process *kfd_create_process(struct task_struct *thread)
812812
return ERR_PTR(-EINVAL);
813813
}
814814

815+
/* If the process just called exec(3), it is possible that the
816+
* cleanup of the kfd_process (following the release of the mm
817+
* of the old process image) is still in the cleanup work queue.
818+
* Make sure to drain any job before trying to recreate any
819+
* resource for this process.
820+
*/
821+
flush_workqueue(kfd_process_wq);
822+
815823
/*
816824
* take kfd processes mutex before starting of process creation
817825
* so there won't be a case where two threads of the same process
@@ -830,14 +838,6 @@ struct kfd_process *kfd_create_process(struct task_struct *thread)
830838
if (process) {
831839
pr_debug("Process already found\n");
832840
} else {
833-
/* If the process just called exec(3), it is possible that the
834-
* cleanup of the kfd_process (following the release of the mm
835-
* of the old process image) is still in the cleanup work queue.
836-
* Make sure to drain any job before trying to recreate any
837-
* resource for this process.
838-
*/
839-
flush_workqueue(kfd_process_wq);
840-
841841
process = create_process(thread);
842842
if (IS_ERR(process))
843843
goto out;

0 commit comments

Comments
 (0)