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 812E9FD4F08 for ; Tue, 10 Mar 2026 17:49:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D2E0110E00F; Tue, 10 Mar 2026 17:49:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="DOLh3yWU"; dkim-atps=neutral Received: from BYAPR05CU005.outbound.protection.outlook.com (mail-westusazon11010060.outbound.protection.outlook.com [52.101.85.60]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7844610E00F for ; Tue, 10 Mar 2026 17:49:43 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=u7dPq1M74ubzNAgApJzbQ8A2PEU0/CV9hSIUkVhZqNZfI/T5C+MgIpoLKCFSMhQPyi/ifAENvuf2YsRKvTcP+zeRamT6a3f4wRN5OXvPXbwsJ4UgWetc9NXLrs85TSPCKv3iXfbmKc7F6xZRrawc2226Vl0zhmFeQHRxk2K/OMrYD0fxXBY4f5pYibnZGNmi+LVtb/nYy1KZFCVUIHgfvP83Tz/ymIuWvWKmKVuotgIs0h292acyG+D5Ur58EAKqIhDMagW/mGeTuZhh2VOnr7poW5+PR467eEc0Xm+20yBwRG6ZME3EJHtA40L0RhpxFimXeKR7wvcyNOr98uk4rg== 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=4JACryfUHLiMdSiI6V63Vf+YgxLUDeJev7TL73NTgSM=; b=H9yZFSKEYtAiosMF4mFQ7HjtTFaFiIbIOHDuh42omuDVJmXIzROGfMCUTHT573kkH1ES5N1ipvm9cOZ9Ii3zAYUr5o00ZGuLOjzm4EbFRbK/myrZib2+vUMXGSP41Lj/hbLQ6NWGEcqV6P5cJR5c85lNatInJdFAqJrSqHhUieFleB90iVrnPnyJup8Lc5AqCW9iUI9zjm0jUOw3XTs/qM/kPimIuazcL9HnHTSk1poSMWM97CcdtO48ACiIy8rnb/fLJ5EOMDmcZFXHfcOJHcUBuU3/RccCRjAvB4q17vp8mKv6gfNfuwZGFjj/I9Q88hZ7l7olwNimHv5Hiafy5w== 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=4JACryfUHLiMdSiI6V63Vf+YgxLUDeJev7TL73NTgSM=; b=DOLh3yWU7OTTLnFJ2cmKzjg26W2kNq9BcVWH81fSTxQUqaGJAhf1I3zXgqWKyvoCXPa7HIiges3l9UoWN5cMVPU9P0OFfBEI+04jEjFfq7DVbtyFDdGLvDIpq9ZX53vJ+LcdMxm/APPhLLHDiYBshLsod2bBk0oXpLpkHQXWJ7o= Received: from BN0PR04CA0068.namprd04.prod.outlook.com (2603:10b6:408:ea::13) by LV8PR12MB9155.namprd12.prod.outlook.com (2603:10b6:408:183::8) 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:49:39 +0000 Received: from BN2PEPF000044A8.namprd04.prod.outlook.com (2603:10b6:408:ea:cafe::4d) by BN0PR04CA0068.outlook.office365.com (2603:10b6:408:ea::13) 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 17:49:32 +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 BN2PEPF000044A8.mail.protection.outlook.com (10.167.243.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9678.18 via Frontend Transport; Tue, 10 Mar 2026 17:49:38 +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 12:49:38 -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 12:49:38 -0500 Received: from xsjlizhih51.xilinx.com (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 12:49:37 -0500 From: Lizhi Hou To: , , , , CC: Lizhi Hou , , , Subject: [PATCH V1] accel/amdxdna: Fix runtime suspend deadlock when there is pending job Date: Tue, 10 Mar 2026 10:49:36 -0700 Message-ID: <20260310174936.335616-1-lizhi.hou@amd.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000044A8:EE_|LV8PR12MB9155:EE_ X-MS-Office365-Filtering-Correlation-Id: f1a26ae8-ec4a-4a85-b157-08de7ecd66bb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700016|376014|82310400026|1800799024|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: fvayoRPs/hkxPGwkEypWzi3uwwGwd6Zw5Xsbi+res2kpkzfslYtxKBVQutAYZwjRfvOCpfsfxVZ7Zc2t7gAxWNG3G2txUc0SSlVhaH2gIH1hT7CxbllMiOhJidylLPf7K1+zzCHQJw/G6MvHp2HlF8RkMfZtlc2mweDch+tqGGyBMJ35m7ww5v8mZlmaggPyaSxL7Nw+SAaksEo/ZGfJJPyrHHBxtjuDaOHbuo+QUNsLWUwtx687RT2IEuofmMvu6aUyIwDEhShwaCVisHWhsaeZ5+TMRsuVsuWBBPapH4xKJFNEKzIjEUKuYgVfFEhtTu0OzPOdmoyQd6Gq6X/l8h9etPuSHTBtA6I1DP/VQIszhTrBVnX5pJBpYUubgbHlf1hU63YBFo8fRcmd/J5RkfCELRxcjVW4S/IUEXuHBXL51XDGuJiRR1EI2WiX48YtUOGFRmX00Es2KDk4LxvAC28IlPSlheqKo/iLbKYL6HnD4+p9pBqSQ9c+DnbNFBBKDz/XwhIDuBi8F0nt81WJqzeuBIbNR2LewW9FFvZEr4WxtazIjshX7FtHNER8ZoOb9GITHnWR/vvqd9IQczCk/+bCfVonPlOrpWJcDm+ywWbF5V6Z9Djed2F0CfgUQvaPpPG3xFbQtPSCRImsvZKTUKeZYqFQsWf2mK/y95Ez2lQBxzCLEDI88nn8sws7d5NrG24mMcC+G2n/7RlxboKJVi2nhlXi4VQ9IKXdjCh6bAaJNYBBumV2bGP4bkaCetmelRqypv1/f5djYRnxu9w5qQ== 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)(36860700016)(376014)(82310400026)(1800799024)(18002099003)(56012099003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jjoI7W//1Xdu0AQzMFC/Hu8cKe6gKQt2QWPN1zlGFrxuzbZfNVykQxe5Lqd0jmjuQwucVAHTMhXDIJvwoC8e2K4HvC7BDKko6ljCSt4sRw7sYQPFYa9Wjjd17c/WA4YkiUY9ojME8GFg1APltiTIU4g6RLxAT3gkxThBNHglqlIYmJ+ImDfMOw72nYq5nhGYhxWtlSsCexomNbl/hT/nIlFqZlKrsmMagCGEQuZQLavvwuV1a2HwDwxnRtlVMFtCCDtDnT3iUYnPAzEX1bGSyLq/FquLC6eneD8mkY6ZmX1mPJjyvchlYrBHlKnOlCAvU/fhC0V7K7zcm4rgqL1eSSmrFRwcuMqz+XSM65yo7H5oMfMfkbl+n2dz8sMMkxny8m6zXYeLrp7hG/ugRgXuH1sAH1IJ76Yj3iiahYGR04cqwQWfMfZpd8uChjExYK6w X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2026 17:49:38.9738 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f1a26ae8-ec4a-4a85-b157-08de7ecd66bb 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: BN2PEPF000044A8.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9155 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" 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 --- 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); -- 2.34.1