From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from MW6PR02CU001.outbound.protection.outlook.com (mail-westus2azon11012034.outbound.protection.outlook.com [52.101.48.34]) (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 EAF893CFF43 for ; Tue, 10 Mar 2026 18:00:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.48.34 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165632; cv=fail; b=hkyGuXWiq7FeShmBH7cu5/awLdlup7UvrVmPHm0Pa4GFjZoK1Y3QLIocVIu7ahdsehCrHMASQtZKVNbMp62Cr1N0KUkEE6D9Hoc1TI8s59ehwyHTYVRn01xBhnbyKlcNksEUWFznHvvAz59VqzdF0E0Gk/leokKd9nAStRmQPfQ= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165632; c=relaxed/simple; bh=9tmgQDwR9Taxi2zw2ZfXxJwbL3BocRKZndaG4IN7OuA=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=PgkU5P8tRcvkZdOWCrpzwblrhaeLGSIEAkc5hAfSRZDlWpyNH56rXhfAW5UBXXuDS3C9nxNTierf5hw+AyXGBUuUzXYFPiyS5lfI/+t2x1tNwN/uD9S22Epvf71O/GNljgRGAAfs7Jr7/QHhUDtRsjzQErDY9rWntGD2MBNH30A= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=d3wHaDRO; arc=fail smtp.client-ip=52.101.48.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="d3wHaDRO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KZenax8JiDZZ7dloweGQXV79c5PAa2JrL1Ip+89vnfkOuuiqxpA4+2R0uaTMq35qA+c8iCAvKHeUZW3MCUDQ1rDe6aUvT8Gd4vxxCqwHm0E1aG3UyA4oXJx1Tz089Q717L+BolPC/0jiAk9zbrBUaXykm/iKwxZ7u50MmAUFDhFC+5TydvrLDIL2g1O/vnhi/KXhOZ2diZQ5HiJoDQ/o5fjbMm/q9vUiztnBqMDuiGs2a5cFTCvR6p8nw+Y/7QdN+62AIrWSWylmV+yKSI9zSWO2CfF1VngPUbv0PPLJmqXMoAgiCZyGadvknAS717pN712/MuFiJV+1YUHFhK+C/w== 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=YvWPuACEufP4U9h+aIVcLU5BlnbwzdARXVHV0uRDfes=; b=IJWmPTBDOMNr50P4G2+Zz1dmJB2ZWqYexNmabiVeBu7dCDv2BqVOsPQ74NsXO4+A158IsyJTgKtkzPMR4CAvIa2qGtzTQC+rIo80S1JMFHODaKfn9c1vrV+HaA9ptplAWcK0UC789E5t6EFTq/PDcnZU8+BHq2h6RqBPCdAlrZz8B5HW5EgTJ16a0bY2DeVbV6GFoU3FxWB4OpvdGCJL8XpT+m1/ZT4E2DOFG8/kKn/stZ9D4lXf3DgmRvYlFXI74R9nPfWpXGbva6/FIH/BDPyEbg2aY9IRA7mMNJjns6ljAguwWs3aCxRhGiawJt6qGay4xT6M8ekd5Rs421W/+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=YvWPuACEufP4U9h+aIVcLU5BlnbwzdARXVHV0uRDfes=; b=d3wHaDROybx0dhKOGxCJY5eW023555mN6mr1xWEaiBQ72KLBpxO3KWuy7Hax/XkfgG72B5j0T201Ex0ZgoqUDjGYglFi3+9q9c3RpsUnT3SOwhJ/jIDABCXoL+iA9xGWyE/yXd+nnCezl+ISG/c+rivVmLQDfdCKJHQomu/KXWU= Received: from PH1PEPF00013311.namprd07.prod.outlook.com (2603:10b6:518:1::c) by DM4PR12MB6279.namprd12.prod.outlook.com (2603:10b6:8:a3::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.10; Tue, 10 Mar 2026 18:00:22 +0000 Received: from MW1PEPF0001615B.namprd21.prod.outlook.com (2a01:111:f403:c903::2) by PH1PEPF00013311.outlook.office365.com (2603:1036:903:47::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9678.25 via Frontend Transport; Tue, 10 Mar 2026 18:00:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by MW1PEPF0001615B.mail.protection.outlook.com (10.167.249.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9723.1 via Frontend Transport; Tue, 10 Mar 2026 18:00:21 +0000 Received: from satlexmb10.amd.com (10.181.42.219) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Tue, 10 Mar 2026 13:00:20 -0500 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb10.amd.com (10.181.42.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Tue, 10 Mar 2026 13:00:20 -0500 Received: from [172.19.71.207] (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Tue, 10 Mar 2026 13:00:19 -0500 Message-ID: <6e3a74ca-403e-80eb-19b3-4aae21f8b743@amd.com> Date: Tue, 10 Mar 2026 11:00:18 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH V1] accel/amdxdna: Fix runtime suspend deadlock when there is pending job Content-Language: en-US To: Mario Limonciello , , , , CC: , , References: <20260310174936.335616-1-lizhi.hou@amd.com> <75bf73a3-496c-4b84-ab49-3c4ace01b953@amd.com> From: Lizhi Hou In-Reply-To: <75bf73a3-496c-4b84-ab49-3c4ace01b953@amd.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MW1PEPF0001615B:EE_|DM4PR12MB6279:EE_ X-MS-Office365-Filtering-Correlation-Id: 1c9ad3cb-f659-4e46-facc-08de7ecee5f2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|1800799024|36860700016|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: ejZ8GpixjNlYE+S933xHq5UIkrUUJ4nlmn5+vGye+YQIhk2XU3ZSMQaQp/CU3wIE81q2Loc0Ci5f3WXl1Mm5lHyJZgKTv/MQ+oWqe4kYOrSeQiwKSHXOXSMRIangG5niDGMVtc3R1ODOcya0wgRKRSXATxQlRT5+wiKXemecw9/hiDc8kdzind/RSaVKjAgi+kVFlxCr5+Y542sJqIZxq8II17cplCCfJ1YGjTDP9gxTlCYxOglMA9mIkYI/wm5Jv55XovrMuaUGf3+vJbGN/X/aCWSGOMxFT+xPp75n4f1VaWXJioUkFfe1+gkLZhYFAsInNiRvz9BPhin8f7szs+oL91zvYIzoKk+R+GwWfFrSexXGSZiKS49z9UUTJG0XHRaSaVT13/R8Q+fQSPpwZt9ayx7OkcKNuxqp3crsJb79LkN0MmTLwbpMAsTP2dVI1/9NfwdyUipRVBPsQ0gdIE8sgvwjlXHRg1JNEybskAs9AdnTlIuA/19ngosbBFDqjLIPLd+9yODbp78eKHhybJUDQ17pL1qYKfWw+RAKjgpoImwP1mdAjJi8NAXW9Sygg2oliskmIZYuRbPwof8zxRwJFHHvTMEFp/mk5QA9KIHj3iObZljmG3FouU23qS5uM2fh2/PBUE+QhZ4b5j9nv/FIysw5LoRW/aXRoKJ4DJx2zZz7dkMB6+3ngzDNSUGExpF1bbEfyrIlvaGoxwDcKUfE0h7RFyy56jKMzUFe54jeuvuocuOsLEETTDN8K6iuluk5VUVx6B03Ue6xy6mVdg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(1800799024)(36860700016)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bm32iMWS8DNBKVYI8Dc04Qpip1Bdk2l3cNFeqBL6RgL+noIv28euG4ETbmDypUovjVGUSREPScJk5QS7zcgf56OdvY3l5Hz/pl5Yz2AuLoe1prsBpu9/GOXQUL4Fx9/Gr6S2dpOTZQAfmf0sRWebS9Kyd/N/W+uzsEUFDcO61VRDOtS5apZmpw64aZtsQWRGK9F9bGqM9H0wMj1UeNqw2ccoO9Kc55xfysk6ujUR4EYC1Jr72XZUidymylmJ4coD3O1dxXB2Nnt0itpMYsOC9syYOiHSaibgjBf/P/r/E1qQJTyJxPooGVt/dRDAoo9g5S/1dz93jHoMgsi0Kchp7xyysg2SGwRnac7rLSnAvhz17WfA2UwC8N9HSjuAsYdax+S24lzXy1WpfBCgBre5hlW++2WyTD6l2dX7ERXQl94yFdqSJrWnajE6PW40vjv4 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2026 18:00:21.7962 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c9ad3cb-f659-4e46-facc-08de7ecee5f2 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MW1PEPF0001615B.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6279 On 3/10/26 10:50, Mario Limonciello wrote: > 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? I missed it again. I will send V2. Thanks, Lizhi >> --- >>   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); >