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 6F799C43458 for ; Mon, 13 Jul 2026 20:39:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C67A10EAF5; Mon, 13 Jul 2026 20:39:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="eTxn911L"; dkim-atps=neutral Received: from CH5PR02CU005.outbound.protection.outlook.com (mail-northcentralusazon11012012.outbound.protection.outlook.com [40.107.200.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 98A1A10EAF5 for ; Mon, 13 Jul 2026 20:39:04 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JjcUueSiifhdofu0M5sBiJsMbaPWGdeGPfBzwJs6zBsHJOBs1OzfWkzwcRKSAau9Yfla4//J53xo/676W6BPWlK1MBQAGFuGxys7BKkdn6xwhxj19ZWLOljfuyqYjsdLLxJ64hv3wAlKlqxIqF2oSTlcD0ow4qrWUJpicIf1uUXlYGC2vIK0O+DYEAqfcGyvF49sYPkAF2cNTHl1dtGjgjeC86KUDbYC3dJKf+z5dlkJ1aXKIBZWoyrf6kWpYztp5I3AUlg395rkWi1/s5YTUkIbmeqV1JjicvqoC24TO4aBkLtit3EYnHnA/WwJ+FWeEdrAjrGZ5vgEMUHo20SP6g== 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=/2lsgzcGMPM1SagF4AP9PNYW6skycc4i4KgsfBp2V/o=; b=JFDe4Um+anmOwh1XEtwqDVlmqM2fz7/3ZnrHnGQXsmdqDOk7e5bPKjbAMu9Di4Lm52kZMT382EpVOy9t+EK36RBT17r0zWqYGge2e3Larysgog2nk0QV8ISlNclvpSzQobYJubifQwDSzrWqa35vO7NcId7rhPXPW/pSeQotRLTZDkQTqDpQXD3rNrTR6gomJcT1NaHlD/3FhN9RT2+u0NLPB54VKwxXVTpU04EXR/Iu6Em8yevbT0jcUt4kIT/ydqh3a9lHuI1PMwNrkr2DVz2w36iaIPO8MxBHzoopi5wZcPJvGwVD4h0kBxLOhNq0Hw4LtswxbFN1eptZK/cBjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.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=/2lsgzcGMPM1SagF4AP9PNYW6skycc4i4KgsfBp2V/o=; b=eTxn911L8YwpbfX/TRX4+mqiOAZ88fldktAqUfNpqmcpCUB498icbeG3RhKW0cBg7pGNr5i+LY85mbS3AwJEl9Y3wp3SVdqJP8X6ZXExMjPxQuGbfnaDItiz87oGr0flvMQdwonx6WPzKE9fWK0qZL8lrK6DsyQSev91IEQ2gYI= Received: from MW4PR03CA0161.namprd03.prod.outlook.com (2603:10b6:303:8d::16) by CY5PR12MB6573.namprd12.prod.outlook.com (2603:10b6:930:43::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.202.18; Mon, 13 Jul 2026 20:38:59 +0000 Received: from MWH0EPF000C6193.namprd02.prod.outlook.com (2603:10b6:303:8d:cafe::1a) by MW4PR03CA0161.outlook.office365.com (2603:10b6:303:8d::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.202.19 via Frontend Transport; Mon, 13 Jul 2026 20:38:59 +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 MWH0EPF000C6193.mail.protection.outlook.com (10.167.249.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.223.9 via Frontend Transport; Mon, 13 Jul 2026 20:38:58 +0000 Received: from satlexmb07.amd.com (10.181.42.216) 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.41; Mon, 13 Jul 2026 15:38:57 -0500 Received: from p8.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.41 via Frontend Transport; Mon, 13 Jul 2026 15:38:57 -0500 From: Alex Deucher To: CC: Alex Deucher , Srinivasan Shanmugam , Prike Liang , "Sunil Khatri" Subject: [PATCH] drm/amdgpu/userq: properly account for resets Date: Mon, 13 Jul 2026 16:38:50 -0400 Message-ID: <20260713203850.650426-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000C6193:EE_|CY5PR12MB6573:EE_ X-MS-Office365-Filtering-Correlation-Id: a5193200-2d21-4adc-68ce-08dee11ec402 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700016|376014|82310400026|23010399003|18002099003|11063799006|56012099006; X-Microsoft-Antispam-Message-Info: jcENUb/unBSyLk/IYR2AtPv9G1bKdPqaWnQibsTJACQga0qaCmsZ/5Z232L00C6qVMxMvcG3Waqpc5BVyc8DPGWQRAJAK+x8vOeVEYl9bLQCkXgmf9te1tM3gApqKKjCJ3sWwGpgyiBUVFRi92yzeAwTQbEbtDuF7pmvHggXBpGmV+bDhk3HmAYE1HID3+Mp+tU8/EZ4ibhSPrgs+PjaGj4LenwxTUUMX3ExazdGQcc5fiSVGuccMosYk8IhYJfA30jbJB49evckzJ6afU7etIfLETMn2HbWsEsPTzO8W7L4nAQTzupJrOtA4bT53ZUV9VYxirU5lFTmMzjV2VoEKrZkCEstRrU/RKX+9+mwfZ4xIcNkxufwbMJ7RmDSkaPr9cHWq7SXhKjGvbcoijUzB7DoEITzBAn4tB80dU/G5u28cZhaxns7Z65gNQbeTa8p2FT0Dhjbif0cHSY5BkbDlFfeuU9xpxBczTdNtGUXxWzVXec6NsWwFroV++n4p+3ljnK//Ti2GGJdK3aR270Adn0HeO3VE99pg3V8MFKhHLgnLSvHLNIhZans20FfOSYcYGOHvjXb7JbDkIZpE0YeYH6UZygWEepHSPJknEik1lphYsMDLZvNhbiC0Co07CA5DO0KpX3TAM+PBGiEusAfwjOCGFJR8N2NGuFu9vCRhqn5J1kHxeTRvdj1qkpT/BhJNs2NANqigdcuYNbdiNppEQ== 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)(1800799024)(36860700016)(376014)(82310400026)(23010399003)(18002099003)(11063799006)(56012099006); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IjMbchyIQWxybUcOoa5fy9cfFwdJ3vT1loOf5/OrCDC2ukpPMbnMvgahol15ijH4sf2r7Hzpi9lBICm2ROARrHTpuevFE9lqUa8ZV//1Ko7itYOh2diz3h8cPb40bK2s1yi2tA1rMJPAKzH11i9pGWXJgI30ZKfgLIAWa8LJoph134xjfnLcec87wc/Xwrel1uq9BQ2+D+KJCUe3aBGup8K0j6U+IuIrV2bsWUjao/yG5lhGC00sJsy6yke7y0tOR9IWLLOpw5zl+1gml/lCcjhUrNKCb/JPoEK6VgtFnQmV/+dhj2udIVz2sZHVVtcvfmT9ZoFcFW5XRol2uzDElByJzxVaB9ymXNBOwlfbGjABdOhNrTs353Shm5FPYzRId8tAL4ROCHPZrIfQxJgMDOFgk2i5RZcOpva54dlFwwj9TvL3jZTet3RdRRpgYAVh X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2026 20:38:58.6144 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a5193200-2d21-4adc-68ce-08dee11ec402 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: MWH0EPF000C6193.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6573 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" We need to increment the reset counter, force fence completion, and set the wedged event when a user queue is reset. mes_userq_reset_queue() handles this for collateral damage, but the caller needs to handle this directly for the original guilty queue. Signed-off-by: Alex Deucher Cc: Srinivasan Shanmugam Cc: Prike Liang Cc: Sunil Khatri --- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c index 6aa75da27f912..5e1262636e1e9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c @@ -146,8 +146,13 @@ static void amdgpu_userq_hang_detect_work(struct work_struct *work) queue, NULL, NULL); else r = userq_funcs->reset(queue); - if (r) + if (r) { gpu_reset = true; + } else { + atomic_inc(&adev->gpu_reset_counter); + amdgpu_userq_fence_driver_force_completion(queue); + drm_dev_wedged_event(adev_to_drm(adev), DRM_WEDGE_RECOVERY_NONE, NULL); + } } else { gpu_reset = true; } -- 2.55.0