From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 079C73AFA69; Mon, 5 May 2025 23:20:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746487214; cv=none; b=fBDL4EXxCYLVNo4TRgDn1R9cqiu7Kw8L570Yf6+3yxKfCgzED4QLDPFH3Jjz1GzMHxGyXwsHcN8E3DMct6WFD/liszoZY2Bd2BZRIVmVy5NWeti0RO1n1AO86PBtW+IyT1gSgVWIMiHMgf2nBPDW1QhlcpiJ3vDJWVmSHoc67t4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746487214; c=relaxed/simple; bh=ar1Hgh74LuGM12CBKVjeJklgZow5ZSNA6QBQMPoecTI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Zb3SjFiS5UqigWpP3HWBL+oEPZ6OQjwbi6wfzP8hQMM8jO+LLONuE9jEvLCBoIy/Ni2pxjcnxFOM3ESJwzkL4BCAzF6zRp06oXebIwoZ02/4kebaAZ5FjIh/LCul1FA9Me8yS8lmFOdYQd29eFoOMEz6tH/+lyBQbp4EMsE1aRM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HFZfrCUQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HFZfrCUQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96AACC4CEE4; Mon, 5 May 2025 23:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746487212; bh=ar1Hgh74LuGM12CBKVjeJklgZow5ZSNA6QBQMPoecTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HFZfrCUQ7kZwhP81PEtDsRBLmfZfZd4fo6h2t+WPiK5E8zp76l7D+Q/H1lG7Ra8Zp 7FS95Kkbuq4iRwZ8mEriu+6Rn5qPLOWB5R3/OppzIZjuJv79E5euYhy7ay4atsD7cW p4m+2nbl0Jyuo9eMCH1fyQZnUAp0OeBAHPT1+Fqv3+lIcEX31TBEjffREcC6PeA9nD 4KRgoq7I6wC/A5iAESpCUFFBjV1TUC2Av3XmRYloAksZ/Rx6GPmGObLZkWgwMxbnfh /s/eO0c03LgYkNYM2kFWLVfKe3LzM19khxFY+1BY/+JVp9OPjKmHpxkIPzVS4fUeY3 AlKd6eaDkSCrQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Philip Yang , Felix Kuehling , Alex Deucher , Sasha Levin , Felix.Kuehling@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.10 060/114] drm/amdkfd: KFD release_work possible circular locking Date: Mon, 5 May 2025 19:17:23 -0400 Message-Id: <20250505231817.2697367-60-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505231817.2697367-1-sashal@kernel.org> References: <20250505231817.2697367-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.237 Content-Transfer-Encoding: 8bit From: Philip Yang [ 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 Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c index 184527afe2bd5..05d2598f516d1 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c @@ -755,6 +755,14 @@ struct kfd_process *kfd_create_process(struct file *filep) if (thread->group_leader->mm != thread->mm) return ERR_PTR(-EINVAL); + /* If the process just called exec(3), it is possible that the + * cleanup of the kfd_process (following the release of the mm + * of the old process image) is still in the cleanup work queue. + * Make sure to drain any job before trying to recreate any + * resource for this process. + */ + flush_workqueue(kfd_process_wq); + /* * take kfd processes mutex before starting of process creation * 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) if (process) { pr_debug("Process already found\n"); } else { - /* If the process just called exec(3), it is possible that the - * cleanup of the kfd_process (following the release of the mm - * of the old process image) is still in the cleanup work queue. - * Make sure to drain any job before trying to recreate any - * resource for this process. - */ - flush_workqueue(kfd_process_wq); - process = create_process(thread); if (IS_ERR(process)) goto out; -- 2.39.5