Skip to content

Commit c8cc14e

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 <Philip.Yang@amd.com> Reviewed-by: Felix Kuehling <felix.kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 1964a69 commit c8cc14e

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
@@ -813,6 +813,14 @@ struct kfd_process *kfd_create_process(struct file *filep)
813813
if (thread->group_leader->mm != thread->mm)
814814
return ERR_PTR(-EINVAL);
815815

816+
/* If the process just called exec(3), it is possible that the
817+
* cleanup of the kfd_process (following the release of the mm
818+
* of the old process image) is still in the cleanup work queue.
819+
* Make sure to drain any job before trying to recreate any
820+
* resource for this process.
821+
*/
822+
flush_workqueue(kfd_process_wq);
823+
816824
/*
817825
* take kfd processes mutex before starting of process creation
818826
* so there won't be a case where two threads of the same process
@@ -825,14 +833,6 @@ struct kfd_process *kfd_create_process(struct file *filep)
825833
if (process) {
826834
pr_debug("Process already found\n");
827835
} else {
828-
/* If the process just called exec(3), it is possible that the
829-
* cleanup of the kfd_process (following the release of the mm
830-
* of the old process image) is still in the cleanup work queue.
831-
* Make sure to drain any job before trying to recreate any
832-
* resource for this process.
833-
*/
834-
flush_workqueue(kfd_process_wq);
835-
836836
process = create_process(thread);
837837
if (IS_ERR(process))
838838
goto out;

0 commit comments

Comments
 (0)