From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D762FFD4F08 for ; Tue, 10 Mar 2026 17:50:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4031C10E0F2; Tue, 10 Mar 2026 17:50:28 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="uxNiu6QJ"; dkim-atps=neutral Received: from PH7PR06CU001.outbound.protection.outlook.com (mail-westus3azon11010052.outbound.protection.outlook.com [52.101.201.52]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1E04E10E0F2 for ; Tue, 10 Mar 2026 17:50:27 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zHkJ0WgeDWI+yZfXo5u9fEAE8wBXqad9CvoC3wdyJyrFVY/Wokw/VeZfvaFKRSA+7NBqeM3ZAeMWCRjQVu+cy3g8vxtoeRJTuPOUCdCcNZaBTYQVHrr77EbTtMGVQIBck4HJKfqoVaYUy8HdjYPwa0DNhzOE42O1KuPv34fujBuQpvn3TS+8prDUZDLcO0APWTPF5SYPpYgBDDAddCCvxh5wtjcu5pIRZD3tDYfSkLH7BS3SrMkaD1pSTS4kEzOMJp1KxDtx379k7EEI1JV5qkB/fUsxZwoVXhNHmAQlXJ94Mqsbr2KZgiF6pYUMIAn4jwlpkpX2LYZTAxBoDP3zNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=d7D1PM+W4W4yf5wiXFxHF1R2hs5jJCy3LowM9q1+44Q=; b=nMo5Y2laROzTv5DlEg7Ie3PhPfPTvIYM1ID4I4aI4iGvMZtOApVYrHT/CMRi9Ud747G3NCW+ctlRzWB83092KzevBHIue7uvbd3ckELaDzNPnOKxjoFibDwlbnC6QcU5UmJu4S3uxSVJqTCINNvPHd34khZ0Trs3rPNFLTJKRxqHgQ2ZHaadRbCK078K48CGn8hWb+SaCBv5tg3w5APJ25JoR7a9L+kkS0kxjSFZ8pUy3XWQ58gXTqwybmBFBReaYFPYMc74OXSQpE7+t9Y9jzsibfSX+0zYgHIRCl47bBz6JVbnL52FbCoqi1/b3OTcORsWwogI5I8xXBLnkyMBSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d7D1PM+W4W4yf5wiXFxHF1R2hs5jJCy3LowM9q1+44Q=; b=uxNiu6QJoce3AYGsq7KqFc8F12rz0zThFwh8dkTMzNtKJoiGPaoet9/pK9oc+zKLnhHx/XAxlXDq98896/2FQKUEqnNIF7WJr8VNZ/67Nh6aXocAT9NdWrVqvjZUhOpvms9ZX0YwiBn7fW+gVDgQEuqlhlacRmkx+CBrVE6VYbg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=amd.com; Received: from SA0PR12MB4557.namprd12.prod.outlook.com (2603:10b6:806:9d::10) by LV2PR12MB5944.namprd12.prod.outlook.com (2603:10b6:408:14f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.11; Tue, 10 Mar 2026 17:50:22 +0000 Received: from SA0PR12MB4557.namprd12.prod.outlook.com ([fe80::885a:79b3:8288:287]) by SA0PR12MB4557.namprd12.prod.outlook.com ([fe80::885a:79b3:8288:287%5]) with mapi id 15.20.9700.010; Tue, 10 Mar 2026 17:50:22 +0000 Message-ID: <75bf73a3-496c-4b84-ab49-3c4ace01b953@amd.com> Date: Tue, 10 Mar 2026 12:50:19 -0500 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH V1] accel/amdxdna: Fix runtime suspend deadlock when there is pending job To: Lizhi Hou , ogabbay@kernel.org, quic_jhugo@quicinc.com, dri-devel@lists.freedesktop.org, maciej.falkowski@linux.intel.com Cc: linux-kernel@vger.kernel.org, max.zhen@amd.com, sonal.santan@amd.com References: <20260310174936.335616-1-lizhi.hou@amd.com> Content-Language: en-US From: Mario Limonciello In-Reply-To: <20260310174936.335616-1-lizhi.hou@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: SA1P222CA0135.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c2::13) To SA0PR12MB4557.namprd12.prod.outlook.com (2603:10b6:806:9d::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA0PR12MB4557:EE_|LV2PR12MB5944:EE_ X-MS-Office365-Filtering-Correlation-Id: e241f173-3c38-4a27-8e52-08de7ecd806d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|1800799024|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: CAvalpmIySBcu3NpszFJYMNmT9QzmQHpYhR65WKX1LdcfOcS97dxgdjWHIdBqqMeqB6UIoxdd5Zs2eKKSFKx3xkkCp2wZIE4Dgpk64T+yq3a1+MU/OtamTNaaF1FAXbgmbR4jmOtls7Zubh2ifl+o8ipWkmCar1i5yXmOS3pTOY4ZVHo0td8HYxsEYGCyNYVc3NCCM6SS6RXKl9v7ptx+surO/eHHBF6FLHT6Q+WY5T4TIPsEIrER26rbRndcjRuDWbgKC2Q0t1wTza+jCQ5q7sBaqhw8MLDctts+UZYl7Dh/q9r2hqyfpKab+Wqxse/GTt4mUklRO5LdLo0WfOR4+ostU0js8YCySK+0moXIOEenZ7EK+JsysPtaVeheEFyrQnnVyP32st78ffsRtjKbMYMP7N1UvNahsCEbzcnNhoSbtwA65EGBDpiXXfS9lyjVX9UqHPvgnrSyUR+HzH9EV92BiVmKMOfLkLKf9zz3qvtsdZ2rFEHl7DiRtdz5TyCrRm/W48HaAmrjT3LaNjhsp+mENovVHKm/WF+Tump8L+DSgVaSWNnsLvWGUy5cpLrv2OSJQNYOOv9e1HOGZIzr83VXRIi2f6DsS1zzwPOTL+7srkJe3e1RLi72Au8Ux4rcEZiUXGMBHu8K1CrimPcULKp9dx5TV3pgtGe4YgZpO8+ppfxtHaVDaf2ibdLrZh01Nc2oIWfvWdpnjfsebwMjhJo6b4fND9Uj6oe0n5ESSA= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA0PR12MB4557.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(1800799024)(22082099003)(18002099003)(56012099003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YUhzRS9mQnR1RERaRTQxYy9pejFFeDdDN2ZQZitHUC9makdGSy9jSVdERllP?= =?utf-8?B?bnZ6VjhvUFc5bjFzVlFkRXVIZXp2K1dBemgySWxDRnhvY0psSktJWlZJcFd4?= =?utf-8?B?S3NwbUw4WnRLTFhBYVJ4MU5ucWFSVjZhVXB5b3RCSisvYUJCdVlEOW1ucDgz?= =?utf-8?B?WWV3RlBXdmVCN2E0UzJJQWFWd0xvNWJpZGxNUVZrU3Z4SGxCYlRrVFNKT01G?= =?utf-8?B?SEFaNDJndUIvcUJaTStSeFc4aFdwc0pKNjArMnZOb1JSSUpFMWNxaHByYmR6?= =?utf-8?B?UWw2d2pXVituNUVZTXVqVUZMeWd3b0tlTHFYQVk5Z1lSU3pFTkRWZVAvUHpX?= =?utf-8?B?eWdKRUxUaFJlTTZiMEQwSHpCOFZtNTdQUzRPbmFQV2MzR0JyVkhDS2JGMWZB?= =?utf-8?B?Yk9zdUZ2WDlyQ3M0WG1YdEQ5QStVVThxMUY3Q0RRRlF1bzZqT2h1MjZycUs3?= =?utf-8?B?YU5FRTZZRUdRZzhEUXo4YWlkWm9hdmN4cmZVS0lteFU5TDdxY3h3Q29hM0Ur?= =?utf-8?B?MWFZWG5yOU9XY043cVJIdE5FTGtqdGJWUzJvL2JFOGV6MnVOcTBTQ0Z4dXlJ?= =?utf-8?B?S21pM25pTC9Fa29rTSs4OFphWmFzQW05c0h3cHlGVjFzbUJrRjB4Z2ZvRGlU?= =?utf-8?B?Vjk4d1ZqY01zZGo4VTU1VXlpNzJTRTFVWVB0cnZEd1dGOU5GcXkvYXpTNEl0?= =?utf-8?B?SWhyMlpEZnZ1WkZUVkk2dWhoNzRFaktNamRiekJONW1URk9JTGhJR2NOcGRh?= =?utf-8?B?SVBHNXozcUxXd0U4bGhsMjRGVTRLK0xYMzd0elpRWUFEUEl4M1kzRjNqQzdJ?= =?utf-8?B?K21rQVYra3NweWZJTy9HSXpxeUJHbmRjZ3d0UjA3eitQRTVXNUNWLytSSE8r?= =?utf-8?B?Q3RxQ3hXcHh6OExnQmJaMU5sRU55N2ZNbFN5U201WFErVmNGeHNaZmZMM1pn?= =?utf-8?B?Nm1QMUlUREtSanZ3RkMwVnlSTy9vR2N1WVJ2aTlWTEt1V0pMWE1WMkVMQlBx?= =?utf-8?B?VXpmL0ljWlFqS3hJMUtsWk91elVVOW9yOVQ2dUdzMjhVL0lqUC9ERWYyeFhx?= =?utf-8?B?cGNkbnlDRHlQZlUwVU5CTGllSzJxdHRnYm12MzdiNWRrTHVjanNHWDh2bFdK?= =?utf-8?B?VWY5LytsUFJKVTdjVjJ0cEZNM0FjMU9jcjFmWW5sZDVxbU12NXRMbnZuOS9u?= =?utf-8?B?Wm9WVmwvYzdZVGwxK3JmWWVtYVRzYXE3Z1VHMEhjRGI0UStnSllNRTVGL1NT?= =?utf-8?B?cXNpaHQ0UHdJbFZ1OVVJRkp5dkkxeE5XZmtVWFJVL2FYcnVnRXMwOWk0YWUr?= =?utf-8?B?U1V4KzNzRFhWV2JCUmdBMEFxbXNHTk9LamNuL3VNKzhyS1dQRGpLM08rSmJs?= =?utf-8?B?bTlkcWhQUDAxczJFdHJmYVNOZ28vTDExN2F6dk1ISGNGK1cvb0luVkcxSExD?= =?utf-8?B?MURPTS9zYW9wemdodFgrbUY5SWhweU4xM3dVV05TWHdzbkJqREczV0xQdHFq?= =?utf-8?B?SGduLzhxN0VFUGFqajUwSjd5REdHWmVDN3grUjlmQU95M3hydjlXeFRtY1ds?= =?utf-8?B?OEZxd3RQU1hseER5N0JCMzhHczRqaTMyK2grbnBzNlYzWk5Jc0RjMXZkbHBq?= =?utf-8?B?aTFiVHVhd2VESXp1Y2xaWHExY0UwQkF6ZHB4U2JTRHora01wdEpFc3VsL1pE?= =?utf-8?B?QkY5cWUvanJPTUtTaWJCUFRVTTdTclZKVWUxSmVxd1hlaWU5Tncxakt3cHln?= =?utf-8?B?NFZXVXFtRXlEeUVUWGFwNVJlZXpkRCtRVGtwQXhyYUFHVWl0ZUtwaUJNNDY5?= =?utf-8?B?eFdwOGFoVFkwV3FIYTJIVlVGM3ExU0JLcUZ4UFBoOEg3b2xZNTJMdjRqc3lI?= =?utf-8?B?MVJYV2sxODVNSU9yOEtvVmhuSlVKd0hKY3dOUXpyMzB6T1pqekdpR21SZ2di?= =?utf-8?B?VnR2VDgyTDd6UG9NcXNqam1qWFRSK3k3VGpFVW5oa2Z0UlRnWkhRazVGd2Vs?= =?utf-8?B?eUViTnBybTRETWIyQ2wyZUJNSml0aXpnRjV3M3c2N1JXbFBkeS9ZT1M4VHR4?= =?utf-8?B?eTM5bXYxRWlqMHFNZ1RPK3U0NVloKzJxZGk0NkVhMHoyWTdocVZiQWs4d2dv?= =?utf-8?B?WkVOb3NqQ2JDaGh1TU9BdDcxeS92dFJXYUIwbUkzaTg1aWN0LzRveGNxVnZF?= =?utf-8?B?aTBXUkNCbkM5Y0orYUJSaXdWOFlodFlUVHlRWFhYa045K3M2amV0bDN1STZB?= =?utf-8?B?TUI0TkNBTWdhSEk5RDM1QUdKQTYrdTZxTURXei8xYzdYUGhpb1ZKVWg2S3pt?= =?utf-8?B?VW1WeU03UDNZMFk2M2dEaFNDN1NZb3BydGswTmU5NmNkanZkdXdDUT09?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: e241f173-3c38-4a27-8e52-08de7ecd806d X-MS-Exchange-CrossTenant-AuthSource: SA0PR12MB4557.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2026 17:50:22.2276 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Dmu/1NfYPVl8PiOxeRdidYvFu6DCGCHxClPF/Kqobz5WIyvZzbex+1qGDnyCSyB4cjeETaI3rq9BcFyxgvEFsg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5944 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 3/10/26 12:49 PM, Lizhi Hou wrote: > The runtime suspend callback drains the running job workqueue before > suspending the device. If a job is still executing and calls > pm_runtime_resume_and_get(), it can deadlock with the runtime suspend > path. > > Fix this by moving pm_runtime_resume_and_get() from the job execution > routine to the job submission routine, ensuring the device is resumed > before the job is queued and avoiding the deadlock during runtime > suspend. > > Signed-off-by: Lizhi Hou Fixes tag? > --- > drivers/accel/amdxdna/aie2_ctx.c | 14 ++------------ > drivers/accel/amdxdna/amdxdna_ctx.c | 10 ++++++++++ > 2 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/accel/amdxdna/aie2_ctx.c b/drivers/accel/amdxdna/aie2_ctx.c > index afee5e667f77..c0d348884f74 100644 > --- a/drivers/accel/amdxdna/aie2_ctx.c > +++ b/drivers/accel/amdxdna/aie2_ctx.c > @@ -165,7 +165,6 @@ aie2_sched_notify(struct amdxdna_sched_job *job) > > trace_xdna_job(&job->base, job->hwctx->name, "signaled fence", job->seq); > > - amdxdna_pm_suspend_put(job->hwctx->client->xdna); > job->hwctx->priv->completed++; > dma_fence_signal(fence); > > @@ -290,19 +289,11 @@ aie2_sched_job_run(struct drm_sched_job *sched_job) > struct dma_fence *fence; > int ret; > > - ret = amdxdna_pm_resume_get(hwctx->client->xdna); > - if (ret) > + if (!hwctx->priv->mbox_chann) > return NULL; > > - if (!hwctx->priv->mbox_chann) { > - amdxdna_pm_suspend_put(hwctx->client->xdna); > - return NULL; > - } > - > - if (!mmget_not_zero(job->mm)) { > - amdxdna_pm_suspend_put(hwctx->client->xdna); > + if (!mmget_not_zero(job->mm)) > return ERR_PTR(-ESRCH); > - } > > kref_get(&job->refcnt); > fence = dma_fence_get(job->fence); > @@ -333,7 +324,6 @@ aie2_sched_job_run(struct drm_sched_job *sched_job) > > out: > if (ret) { > - amdxdna_pm_suspend_put(hwctx->client->xdna); > dma_fence_put(job->fence); > aie2_job_put(job); > mmput(job->mm); > diff --git a/drivers/accel/amdxdna/amdxdna_ctx.c b/drivers/accel/amdxdna/amdxdna_ctx.c > index 666dfd7b2a80..838430903a3e 100644 > --- a/drivers/accel/amdxdna/amdxdna_ctx.c > +++ b/drivers/accel/amdxdna/amdxdna_ctx.c > @@ -17,6 +17,7 @@ > #include "amdxdna_ctx.h" > #include "amdxdna_gem.h" > #include "amdxdna_pci_drv.h" > +#include "amdxdna_pm.h" > > #define MAX_HWCTX_ID 255 > #define MAX_ARG_COUNT 4095 > @@ -445,6 +446,7 @@ amdxdna_arg_bos_lookup(struct amdxdna_client *client, > void amdxdna_sched_job_cleanup(struct amdxdna_sched_job *job) > { > trace_amdxdna_debug_point(job->hwctx->name, job->seq, "job release"); > + amdxdna_pm_suspend_put(job->hwctx->client->xdna); > amdxdna_arg_bos_put(job); > amdxdna_gem_put_obj(job->cmd_bo); > dma_fence_put(job->fence); > @@ -482,6 +484,12 @@ int amdxdna_cmd_submit(struct amdxdna_client *client, > goto cmd_put; > } > > + ret = amdxdna_pm_resume_get(xdna); > + if (ret) { > + XDNA_ERR(xdna, "Resume failed, ret %d", ret); > + goto put_bos; > + } > + > idx = srcu_read_lock(&client->hwctx_srcu); > hwctx = xa_load(&client->hwctx_xa, hwctx_hdl); > if (!hwctx) { > @@ -522,6 +530,8 @@ int amdxdna_cmd_submit(struct amdxdna_client *client, > dma_fence_put(job->fence); > unlock_srcu: > srcu_read_unlock(&client->hwctx_srcu, idx); > + amdxdna_pm_suspend_put(xdna); > +put_bos: > amdxdna_arg_bos_put(job); > cmd_put: > amdxdna_gem_put_obj(job->cmd_bo);