From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11013010.outbound.protection.outlook.com [40.107.201.10]) (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 D389C3B52F7 for ; Tue, 10 Mar 2026 18:52:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.10 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773168736; cv=fail; b=Z5B4HBq5XAqoC0YKIcP/kROtif1ZH61YugN5qm8B0utDHLu49RxuBKXpg77QwmloZ7VxKHQhTUqCRxLTFIVBiPO+B1D0npKk9Mj8omtuodRY91ya2UPAOyqKvhWfHQ0lg7GJs8HCmOVMB7Hmz9zAFIScF8wxCiIxEl9clqw3y3o= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773168736; c=relaxed/simple; bh=N2KIlY697NjDpt2Ecfjm17RhTbNfra2JQ1+UVATTn9c=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=SD7Rmai6QtjEJ7FLSgmxLmTjI8J/31W6Jzg6GqowVznL3uL0wpVgpM7a34avEjGDDxqCHsQexTr4dg93lZa/WQXcQEweDPIttQoQe+eShGFaStSXhf0892WEean03g1ICBa+dhsb8qZ5R7r/XbxO98Iv5cWEQqs4dkvD779rNYw= 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=v8YLi7pj; arc=fail smtp.client-ip=40.107.201.10 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="v8YLi7pj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Qv4i2GuHOkm25ZE638qCr6Uw/gGXdHvAgGVNJlHjYqSB+QVV4guRsALOPk91cElfkt/tc3IfJuBrobkAb+Lkk3Qhnjv2Hf1yLvRLe4L6TCBtmoCZkyJ7qYBuTcAl1ybczbNZW9QfPPWEpwDM1lHvd8FFustFJriKUM60K9jKuZoRGWTQX5T5kOwyc8qfw6dgDXKizPMQEPmcTucI+l6vz01CycjjzNwhsQzpTw+p18wtmehyoJDSpsHHxfKbmdaX8JnqqTltLXJrUkwC/VMkDgOiGPoBW6H8D2aES8F45rsjBXm7Qq+odjFq5RnGaInRiNZ8uBI7bmJUt6726CsVVA== 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=OvFjOgtDutJgWAa8dXdhvGP8wGSDYr6t/PAaY5QPk6E=; b=Hkljk/qBtEYrDXgGGTIRRlZGBIwLh6c0eLRVvrsWWvImbL+qf2bvXPdhtqpoc1SR2XejtGWx+9BgEIazEA2cP9PhGdwErJYfMuwlrOZTeT/HEE5g1xrcC/OOmaT344OTVj6Riwk2WA8/c6nifmOKVySMtQ8YKuCIAgiiuJNBOktJwsrqqrsRToyEQPBBh3w3v3DWJlkLvCIyOEvueoCU8XQ1flbOfWU0WUPfzmnGl/AABurGhLRdK+Oqh2U73Ody9zN20spLBBMkUkhnDdBwqP8rS7duynOjYnmvorvBfTSluFEIHsKMcc54U3YOdR57FRUtvd+uFOBhTjU5zDhmXQ== 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=OvFjOgtDutJgWAa8dXdhvGP8wGSDYr6t/PAaY5QPk6E=; b=v8YLi7pjwH4+d8iNsYej2C4oEGa/UlfbDJekkLbmv7PK2q56Y/QTz5icL1UVwE1F40SPzUBRnVQe8G/phIFyPBptsQYKggik1jYg7OEQnWLIhk0jKYhtZ2NnTM+bBXYqrtaXa5j9OGGdcC85mneWKol81AGWdbjO+2I1wj6jIPY= Received: from PH7P221CA0047.NAMP221.PROD.OUTLOOK.COM (2603:10b6:510:33c::19) by DM4PR12MB8559.namprd12.prod.outlook.com (2603:10b6:8:17d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.5; Tue, 10 Mar 2026 18:52:06 +0000 Received: from MW1PEPF0001615D.namprd21.prod.outlook.com (2603:10b6:510:33c:cafe::89) by PH7P221CA0047.outlook.office365.com (2603:10b6:510:33c::19) 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:52:01 +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 MW1PEPF0001615D.mail.protection.outlook.com (10.167.249.88) 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:52:05 +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:52:05 -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:52:04 -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:52:04 -0500 Message-ID: <2277befc-a65b-f01b-fb4b-3223e8250697@amd.com> Date: Tue, 10 Mar 2026 11:52:03 -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 V2] accel/amdxdna: Fix runtime suspend deadlock when there is pending job Content-Language: en-US To: Mario Limonciello , , , , CC: , , References: <20260310180058.336348-1-lizhi.hou@amd.com> <8822df6a-e14f-4079-8a54-1ee7c1f78632@kernel.org> From: Lizhi Hou In-Reply-To: <8822df6a-e14f-4079-8a54-1ee7c1f78632@kernel.org> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MW1PEPF0001615D:EE_|DM4PR12MB8559:EE_ X-MS-Office365-Filtering-Correlation-Id: cdbbee1b-8916-470e-6ce8-08de7ed61fcf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700016|376014|18002099003|56012099003|22082099003|7053199007; X-Microsoft-Antispam-Message-Info: JWQJm+ptZObQcTf104Eu+mZGYJuUTFBePUpgiPHtQpA6GWg8iCUOEKw+APPeuF5O/4mIJ8OCtJ39ZtsJN6wIlSxVssSDk8WasKarzdftgt+j4osmzp6SBfxGh/Xz4Lj2u/cP64+LnqVxb0YA1oxRYIAnKsF0susLMYR8/1Q91OzkzlaBczK2vOHxXsPHLez73AVl5vV3e2bi/3qvIxavZzZDmVo2uuTiVosBRc5VfqqcQPw8Txw7ATWaEaQvuf4b5+GU4P5v3XgE/IRxkqlivsRLlnpiZjg/Iaf2giYa/nuDbxbVMJo93ZOg71crwMF2U5XNAYDXRScC1fOR8HZ7+xLjmttrTdXH802/UAxr1hYJZb0N+11I7nsKLLImMoLMKw9Xwp+ggylO4nXNkKHokG4aJ0wDTy6jS12Q/jkoNF5ysQksT4Wna8fz06FMoLN2xZsDK6aQSh5qTDyy+oD+1PztqivUXxbWGZuPSNEidigdKkY8CcpxsXea1RQIqJ7WUroIe0pnpCrv39Zauj+ZlH5rsTwk+t4JcQShc8jUjwDYiBxrWYiJN66fKQMMzagt4Jeup2vKdbLw0l3htZh0N+Ul7VkzFqFGAOcwJEDkKoSwjViJjFmLe9isiDGxNk+Ghxp+jH5IbYPyMr0CQcpPNr+o7rlYnAxIcCuv4mQ2zQefRVSfgtwGEIZlIgN75NCroHTBekjNAw9mSAKMVP6rfdIRXrfutP5LWgkZm2QxNRWa03bmEg9uYmftxi7+Scj8tCv+gMGSsgfXfs9+ASkNAw== 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)(82310400026)(1800799024)(36860700016)(376014)(18002099003)(56012099003)(22082099003)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: akYlaRcx/JDQYRUYO68464BeAU05wEFETTS2NLqk1rZyYQF35PEv4p7aNhdle6nmLpaeInDEDSAFGwgea8QBDeiQkmiAzC7Ih7WETZypflll0uIng8ulCvG/KgHAthw9Va2FJByaYOvS+AZicz2epwjseDci/Z3XBfvNCyDaFE/UJvSDRJxByBHqyNRfAT3FBZZZEqFOdCli34lmkZASr4k/VWFWahKW6DJ0YOUMQ1qZnSXGgjT4Xf6YXcBBjKHOMYI1aEXik79XCvfem0NrkneiR3Gkk3EaxPWWaldpQ2Z5XDqGZm+xQ0/zjLsREda4e051nHxLoJNGvUkUQmQ9FLkBc1xEDs9LvADOjqQH2dCip0jThaKT+tU9/RtCUXuvt+b1dqLHkVGwNzpSmMNQS5Vn6rGhyAxKBTr0uNxUH68xN//Xt2Da28BzfRjoWfLC X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2026 18:52:05.4189 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cdbbee1b-8916-470e-6ce8-08de7ed61fcf 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: MW1PEPF0001615D.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB8559 Applied to drm-misc-fixes On 3/10/26 11:33, Mario Limonciello wrote: > On 3/10/26 1:00 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. >> >> Fixes: 063db451832b ("accel/amdxdna: Enhance runtime power management") >> Signed-off-by: Lizhi Hou > Reviewed-by: Mario Limonciello (AMD) >> --- >>   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); >