Received: by 2002:ab2:6991:0:b0:1f7:f6c3:9cb1 with SMTP id v17csp178491lqo; Tue, 7 May 2024 16:53:45 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVg2KeWwrXAQqZynyr1NlIMFWFcUQNA3RgcZkBKrfIBPOCArsMKQmY6xgBRzn7xnK5xn+Rzlqf/s5DV3/j05BCJS5ldJM4a6iibZr/0fQ== X-Google-Smtp-Source: AGHT+IGT5pPMQ+BngfAw/8VmDDbI7wAJ0POXaQ/6fVgbapSm/OOmZgh4HpyqCATlryVUjlM87ejn X-Received: by 2002:a17:902:7088:b0:1ec:711b:edc0 with SMTP id d9443c01a7336-1eeb0bae5edmr10531905ad.67.1715126024980; Tue, 07 May 2024 16:53:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715126024; cv=pass; d=google.com; s=arc-20160816; b=p+XQDMqtP81UOLHIaBlsHuyHM5V6MqG6G+pwVN4hyCNiN9inqx3bsKavZsqsK8y3ih x4KcEmVZDjcDknXryULmL7PLAIdVdJJCW2Cpmbm4YHAnR22KqBxQinfKCRr/MbDVHZji QpLwYCflhtiL+zQCvefb6HmEP0kPmvS2fpUG1fpTJ6eZ7uVzEznFx/4u2e0HYyxKsX/w /LAvQZ/4XYMftu+K46/1KAVpye8aOZu98a9BJ8ym/vOILSJM4JPMaI6NepDJeWnINS4W 2T9TcM5JhbFYQWWGImEl/Hx4TwBu6UZVPI4T5hAjyxl2AYTnQyqDVJegC4i2TEp4pyv1 GeKA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=dt2WQHqGBDdF+FgVDvzAnNDzodpkN7xWWYrVyXn7fqw=; fh=gifZI+4anRPXT7OqW6MB/CpWs6Nfx+EfObiCjHGo11g=; b=ieWQNDohYvVfO9owMeFODL0ib257cpyLJEHNZzz4SP/WiS7vQgJEImiNUQdbk+YK4J 0UsAAVTNNQvhZIlpgdosjR60OsyVCPApG8xowqQ4+1lnEfqcou0xcpX3ElNqv/j1CS2r 5+dYV0TztPLpu0lvyjjghB7A9QsEF/LVjOwqxn0WaFy8ZVgnJo7SfbdsOHP82bf7xA56 yeJOW7fMIZXRjjaiweVodxoAua2Pzl7yzDbMgVozWFG+t8swDlP0xoOLt3loHAVSbnFU 3w9a6IULF49JT9pY+Iy1iiEG2PQ5seefWcZ5aEseRTyBFV3+tbWCdg/6EVhLcFjACPWt J4zQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TtTM9Hu6; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-172386-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-172386-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id h19-20020a170902f2d300b001e675f9de65si10512194plc.304.2024.05.07.16.53.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 May 2024 16:53:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-172386-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TtTM9Hu6; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-172386-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-172386-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id E8446B25D98 for ; Tue, 7 May 2024 23:32:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B266A146011; Tue, 7 May 2024 23:09:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TtTM9Hu6" 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 D9E8C146000; Tue, 7 May 2024 23:09:46 +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=1715123386; cv=none; b=lF792/nEpMAoOkXTvtk2bDTM1z6nzmpxq+Ejym3dJXEzhNbY+K2KCa/36oGc2i6QvV4ZGOwkn9vKaI9+/Wpd5aL7NMaH3ufTmnrmsipU10q9pSvSAm1ZSy5seoAJUS3h0BAhSRBPjWzqK5ebsXgjWheRiTA+w0lat+c39SzB4YQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715123386; c=relaxed/simple; bh=cIft+zC2p2nwFimfdBQ8IvSQowxuOf9+IqyHq1DgoPo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XmaXAALH4Rf/h1Swaa++GpX31p8lvAFTGasvVaS+idjNaugibzpB0GUlL/uWcSN1tV9m2ppsdbC/KLXIV/9w4yXumCXlxfNK1KXTWG5cXPiq2ffye4n6Swf288VKfyz0vDvjx75oIqZ0ptiC77/G5YFROvkprZgA61loUEgrIdA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TtTM9Hu6; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DD79C2BBFC; Tue, 7 May 2024 23:09:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715123386; bh=cIft+zC2p2nwFimfdBQ8IvSQowxuOf9+IqyHq1DgoPo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TtTM9Hu6HPQuywbSC7L2AfuqAJ55pQ2jDAn8Hn6E2tmaEzKDckocyfEmQPGjv5k3E ePRjfVvJU58o9ghLxEiWdRMf2tQ4cfwhVFwaC4pctSVcFTlKWjBbZv+B9Vne517Emw Bn+LJB5b7PM0ISTH+NprmCEF9hQIl1aYSJmrD5B9ZEe16hbAitkF/zlpzeraD6z01r Mob+gY/uL8KouY3/+SxlOnHATVldM3beXOjA6B95++c8VK7eTcDQ37Y+cVfwQg+Ex+ ctPk7Rdb0eorvH17EEpa9OHRDnq7F3VO8JrctC7fI1GlZnlRziHADc/BjXbbHD0Ju5 MmIPK9lGyllCA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lancelot SIX , Felix Kuehling , Alex Deucher , Sasha Levin , Felix.Kuehling@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.8 43/52] drm/amdkfd: Flush the process wq before creating a kfd_process Date: Tue, 7 May 2024 19:07:09 -0400 Message-ID: <20240507230800.392128-43-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240507230800.392128-1-sashal@kernel.org> References: <20240507230800.392128-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 6.8.9 Content-Transfer-Encoding: 8bit From: Lancelot SIX [ Upstream commit f5b9053398e70a0c10aa9cb4dd5910ab6bc457c5 ] There is a race condition when re-creating a kfd_process for a process. This has been observed when a process under the debugger executes exec(3). In this scenario: - The process executes exec. - This will eventually release the process's mm, which will cause the kfd_process object associated with the process to be freed (kfd_process_free_notifier decrements the reference count to the kfd_process to 0). This causes kfd_process_ref_release to enqueue kfd_process_wq_release to the kfd_process_wq. - The debugger receives the PTRACE_EVENT_EXEC notification, and tries to re-enable AMDGPU traps (KFD_IOC_DBG_TRAP_ENABLE). - When handling this request, KFD tries to re-create a kfd_process. This eventually calls kfd_create_process and kobject_init_and_add. At this point the call to kobject_init_and_add can fail because the old kfd_process.kobj has not been freed yet by kfd_process_wq_release. This patch proposes to avoid this race by making sure to drain kfd_process_wq before creating a new kfd_process object. This way, we know that any cleanup task is done executing when we reach kobject_init_and_add. Signed-off-by: Lancelot SIX Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c index 58c1fe5421934..451bb058cc620 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c @@ -829,6 +829,14 @@ struct kfd_process *kfd_create_process(struct task_struct *thread) 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.43.0