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 C404BC531F9 for ; Fri, 24 Jul 2026 06:49:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6415E10F2CB; Fri, 24 Jul 2026 06:49:50 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="QEsCQDNK"; dkim-atps=neutral Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010028.outbound.protection.outlook.com [52.101.56.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7144810F2CB for ; Fri, 24 Jul 2026 06:49:17 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cSmj9oQJzCW8gWlb6PKZfbZ1PcDU3JO1wlKd2hVWGzuDZRRGOZlb6ka7RC9N/hWHT+EzP4wsFmfVg6z/3Vur9yaqnvgn0OD4u2HSUQU7cZWMqvhdDz5lY20y+cgANNbGdQU7v0MfK3aRmFqaH+dsEbzMEOoGHLOL47g+H5O0495WteulFChPsfYblDNSaPSfTiypdX7g1MdVBkpeE3Ni3OVIdnX64bxuFg+yz07O4zlw5U0OYX3hOGdYtspqop7bTfGhYLH0Xc3uDvLaqxqvYvkvpwyxWCROoE9mz6HqiRp0RH636N9BzGFQxjdSmSN+t5yhVqZk2VRkhRYC1G8gFA== 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=jNNhvdjAkaf5cmPPqGMRk22Mpza8SPp7zd59PyaUVRE=; b=dKv5Y3RFrNoCMLZK6x0IejqqTMeokaez8xHoZ6pPlD9cmYPRicQcKvrXsZnvEDTBy0nd80eMaxOQHmgw6gxXv7LkVtZXBHntoJ4n3N3/8b6mYyrWMuBTRhR3XtAGURK2M7GpguRxITa7u/A1ql3PGRoe33vUUQ22tfsFEmSLc6jP/F8Z3SEQXxQKnIOlNtVNV/ajD/arZ0PgwZtZaHGgz34Uynnu0iTHa0duOQ2pEgbjh2Nd5ljHDbVb7Vyqltq8/Na8LPUG1RgJi9eiSqBMx7E6M8iPwnt9wpmlIt4/zQL8p5ZgNjNDDHVbNcEn3pWR4ks1Z5zjMHsA2IVX4n1LJg== 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=jNNhvdjAkaf5cmPPqGMRk22Mpza8SPp7zd59PyaUVRE=; b=QEsCQDNKkQy5RhCvjlv8yhn5WXuxG4IdZazBahK3el+tj5IhEHGdeQZ4sT3wOu1bClNKH9gbx/TD9oB3UNFfVQ5V/XbuRovV18xCciMEuW7e2jev2gAcurx2ifL5rsjVPIQSdSXL65wpfMc4uKlz+i0YlqvdvwDm3CxP2K2eBxg= Received: from BN9PR03CA0256.namprd03.prod.outlook.com (2603:10b6:408:ff::21) by SA1PR12MB5669.namprd12.prod.outlook.com (2603:10b6:806:237::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Fri, 24 Jul 2026 06:49:12 +0000 Received: from BN2PEPF000044A7.namprd04.prod.outlook.com (2603:10b6:408:ff:cafe::9) by BN9PR03CA0256.outlook.office365.com (2603:10b6:408:ff::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.245.11 via Frontend Transport; Fri, 24 Jul 2026 06:49:12 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BN2PEPF000044A7.mail.protection.outlook.com (10.167.243.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.270.5 via Frontend Transport; Fri, 24 Jul 2026 06:49:12 +0000 Received: from satlexmb07.amd.com (10.181.42.216) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Fri, 24 Jul 2026 01:49:11 -0500 Received: from JesseDEV.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; Fri, 24 Jul 2026 01:49:05 -0500 From: Jesse Zhang To: CC: Vitaly Prosyak , Alex Deucher , Christian Koenig , Jesse Zhang , Jesse Zhang Subject: [PATCH i-g-t v3 1/3] tests/amdgpu/amd_deadlock: add gfx user-queue clean-hang reset test Date: Fri, 24 Jul 2026 14:48:22 +0800 Message-ID: <20260724064904.527135-1-Jesse.Zhang@amd.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000044A7:EE_|SA1PR12MB5669:EE_ X-MS-Office365-Filtering-Correlation-Id: f37b5991-de85-4da5-7438-08dee94fab6a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700016|23010399003|1800799024|82310400026|376014|10067099003|3023799007|11063799006|6133799003|56012099006|18002099003; X-Microsoft-Antispam-Message-Info: Ki+8f+rTloGLOWZtNoFdNm1jrTRB1qYtro6O06FEJV8VbzH1sFfXMd698h662DX5lR8FXy1YUREBXbEg38zl5fgrPNAVz3oqzNI/uWx29he8mjm8uqlmrfhn2XUq2mAL3gS5wjqwXDrQvjgdiL65HDdGfrgkK0p59zhx/jM3uG+Dpglw2R96cduR4EQ4Ymerk5o7+mefG9hMFsxBHNbKEHtD+foSeh03dD2a4dD94S6SihRexoW7h4NC5gOO8v+JAVk7qBB+XKjNF4ZEbv+72GaErbRJt6oGJRW4U2dHsWD8c5Jjprn+u0AEg2QQSZn8ew+sZeRjBMU4BBkwA6DVH0VERq9bklR4mCjXAMgrcpSfCXE0UpzFvvBi106/hMEyOB4yUcnqp1EVrXxV52sbwJbMat3fXAsO+p3KgLExa5ekSJiNoXzAK3BYEtvO3Kybclhq2vlLizaUg8nlFZLxXHv1yNpodAyubgtP/SBqrjx00aa4Pq9Vo1wzdXs41eZUgDaBWKLDb/FDGQJnMjCR946+KaZwsBAv3cDdJ741vlGMRcec2laHXAFA7HAIW81qc/kTbnIZoKGr41WXHT3tTonZllIAXp2lW/T9KR7kxNvIehHDgs6VPaldAlvtGk8Y1D34X6KgR7tgumsM0halJxDws9XdE2epDZF3MwaU2j3wh1mleVwmbR3kj5TJI+/X X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:satlexmb07.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(36860700016)(23010399003)(1800799024)(82310400026)(376014)(10067099003)(3023799007)(11063799006)(6133799003)(56012099006)(18002099003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: y+DxXQ9CgPCVkHLITVJuT3cIGoY8BjKYSORxhGDPMZvgd+n+Nt6lSj9VZME0Xwfl8HspwJ69TktCm6UJb2yHv9CWrOF8ZMCfUdvuVtDOLaqiL16KioF5o3N+9n3Ij7v0is3CSNtKAZb4/pL5os1Jh6o6RMCiY302tlbPtg0U//U3Nwq2IXYbqUZZJKuMN9DQghJBfWe04vdqJhRmCNSRCzFMxScvuwA0lDqk/TVCUGGFD4hlcqToviRV90I7BiXfM5LKsfOOCeDVmT6uKAEsLQwuM/eeJg84IYnV8Z6wvVH168/+hq0EoCjH7f43a2aLT6NJJhQeAOw9+yY7K3qKR7962noU6rkp1PX0KD85FgYgkrrNQxYEBfrTK2stHZog2Dgz7Zk61P1Tgqa3+5MnTaUdUgnO3tVkgp8YQK+4wzq1wjtb7Ad5AQR0f1H0K+3h X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2026 06:49:12.0325 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f37b5991-de85-4da5-7438-08dee94fab6a 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000044A7.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB5669 X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Submit a gfx user-queue job whose only packet is a WAIT_REG_MEM that never completes (polls a resident BO for a value that never arrives). The queue hangs with no fault, so the driver recovers it with a per-queue reset. Add it as the amdgpu-deadlock-gfx-umq subtest, gated on AMDGPU_ENABLE_USERQTEST and per-queue reset capability. v2: refactor deadlock helper to use standard bit macros (Vitaly) Co-developed-by: Vitaly Prosyak Signed-off-by: Jesse Zhang --- lib/amdgpu/amd_deadlock_helpers.c | 100 ++++++++++++++++++++++++++++-- lib/amdgpu/amd_deadlock_helpers.h | 4 ++ tests/amdgpu/amd_deadlock.c | 9 +++ 3 files changed, 109 insertions(+), 4 deletions(-) diff --git a/lib/amdgpu/amd_deadlock_helpers.c b/lib/amdgpu/amd_deadlock_helpers.c index 06c577085..4395fc527 100644 --- a/lib/amdgpu/amd_deadlock_helpers.c +++ b/lib/amdgpu/amd_deadlock_helpers.c @@ -14,6 +14,7 @@ #include "amd_memory.h" #include "amd_deadlock_helpers.h" #include "lib/amdgpu/amd_command_submission.h" +#include "ioctl_wrappers.h" #define MAX_JOB_COUNT 20 @@ -150,8 +151,8 @@ amdgpu_wait_memory(amdgpu_device_handle device_handle, unsigned int ip_type, uin WAIT_REG_MEM_ENGINE(0)/* me */)); } - base_cmd->emit(base_cmd, (ib_result_mc_address + MEMORY_OFFSET * 4) & 0xfffffffc); - base_cmd->emit(base_cmd, ((ib_result_mc_address + MEMORY_OFFSET * 4) >> 32) & 0xffffffff); + base_cmd->emit(base_cmd, lower_32_bits(ib_result_mc_address + MEMORY_OFFSET * 4) & 0xfffffffc); + base_cmd->emit(base_cmd, upper_32_bits(ib_result_mc_address + MEMORY_OFFSET * 4)); base_cmd->emit(base_cmd, 0);/* reference value */ base_cmd->emit(base_cmd, 0xffffffff); /* and mask */ @@ -412,6 +413,97 @@ bad_access_helper(amdgpu_device_handle device_handle, unsigned int cmd_error, } } +/* + * Emit a WAIT_REG_MEM that waits forever: poll bo_mc (initialised to 0) for a + * value != 0. This is a valid packet that never completes, i.e. a clean hang + * with no page fault, so it can be recovered by a per-queue reset. + */ +static void gfx_ring_emit_wait_reg_mem_hang(struct amdgpu_ring_context *ring_context) +{ + uint32_t i = 0; + + ring_context->pm4[i++] = PACKET3(PACKET3_WAIT_REG_MEM, 5); + ring_context->pm4[i++] = WAIT_REG_MEM_MEM_SPACE(1) | /* memory */ + WAIT_REG_MEM_FUNCTION(4) | /* != */ + WAIT_REG_MEM_ENGINE(0); /* me */ + ring_context->pm4[i++] = lower_32_bits(ring_context->bo_mc) & 0xfffffffc; + ring_context->pm4[i++] = upper_32_bits(ring_context->bo_mc); + ring_context->pm4[i++] = 0; /* reference value */ + ring_context->pm4[i++] = 0xffffffff; /* and mask */ + ring_context->pm4[i++] = 0x00000004; /* poll interval */ + ring_context->pm4_dw = i; +} + +/* + * Submit a single job that hangs the queue on a WAIT_REG_MEM (no fault) and + * let per-queue reset recover it. Uses the normal (synchronised) submit path + * so the CP actually runs the packet. + */ +void amdgpu_hang_ring_helper(amdgpu_device_handle device_handle, unsigned int ip_type, + struct pci_addr *pci, bool user_queue) +{ + const struct amdgpu_ip_block_version *ip_block; + const int write_length = 128; + const int pm4_dw = 256; + struct amdgpu_ring_context *ring_context; + int r = 0; + + ip_block = get_ip_block(device_handle, ip_type); + ring_context = calloc(1, sizeof(*ring_context)); + igt_assert(ring_context); + + if (user_queue) { + ip_block->funcs->userq_create(device_handle, ring_context, ip_type); + } else { + r = amdgpu_cs_ctx_create(device_handle, &ring_context->context_handle); + igt_assert_eq(r, 0); + } + + ring_context->write_length = write_length; + ring_context->pm4 = calloc(pm4_dw, sizeof(*ring_context->pm4)); + ring_context->pm4_size = pm4_dw; + ring_context->res_cnt = 1; + ring_context->ring_id = 0; + ring_context->user_queue = user_queue; + igt_assert(ring_context->pm4); + + r = amdgpu_bo_alloc_and_map_sync(device_handle, + ring_context->write_length * sizeof(uint32_t), + 4096, AMDGPU_GEM_DOMAIN_GTT, + AMDGPU_GEM_CREATE_CPU_GTT_USWC, + AMDGPU_VM_MTYPE_UC, + &ring_context->bo, + (void **)&ring_context->bo_cpu, + &ring_context->bo_mc, + &ring_context->va_handle, + ring_context->timeline_syncobj_handle, + ++ring_context->point, user_queue); + igt_assert_eq(r, 0); + if (user_queue) { + r = amdgpu_timeline_syncobj_wait(device_handle, + ring_context->timeline_syncobj_handle, + ring_context->point); + igt_assert_eq(r, 0); + } + + /* the memory the queue polls stays 0, so the queue hangs */ + memset((void *)ring_context->bo_cpu, 0, ring_context->write_length * sizeof(uint32_t)); + ring_context->resources[0] = ring_context->bo; + + gfx_ring_emit_wait_reg_mem_hang(ring_context); + + amdgpu_test_exec_cs_helper(device_handle, ip_block->type, ring_context, 0); + + amdgpu_bo_unmap_and_free(ring_context->bo, ring_context->va_handle, ring_context->bo_mc, + ring_context->write_length * sizeof(uint32_t)); + if (user_queue) { + ip_block->funcs->userq_destroy(device_handle, ring_context, ip_type); + } else { + free(ring_context->pm4); + free(ring_context); + } +} + #define MAX_DMABUF_COUNT 0x20000 #define MAX_DWORD_COUNT 256 @@ -481,10 +573,10 @@ amdgpu_hang_sdma_helper(amdgpu_device_handle device_handle, uint8_t hang_type) /* override addr of buf1 and buf 2 in order to copy from buf2 to buf1 */ base_cmd->emit_at_offset(base_cmd, (0xffffffff & ring_context->bo_mc2), (offset - 4)); base_cmd->emit_at_offset(base_cmd, - ((0xffffffff00000000 & ring_context->bo_mc2) >> 32), (offset - 3)); + upper_32_bits(ring_context->bo_mc2), (offset - 3)); base_cmd->emit_at_offset(base_cmd, (0xffffffff & ring_context->bo_mc), (offset - 2)); base_cmd->emit_at_offset(base_cmd, - ((0xffffffff00000000 & ring_context->bo_mc) >> 32), (offset - 1)); + upper_32_bits(ring_context->bo_mc), (offset - 1)); ring_context->pm4 += ring_context->pm4_dw; } /* restore pm4 */ diff --git a/lib/amdgpu/amd_deadlock_helpers.h b/lib/amdgpu/amd_deadlock_helpers.h index c46ebb67b..accbf2e41 100644 --- a/lib/amdgpu/amd_deadlock_helpers.h +++ b/lib/amdgpu/amd_deadlock_helpers.h @@ -33,5 +33,9 @@ bad_access_ring_helper(amdgpu_device_handle device_handle, unsigned int cmd_erro void amdgpu_hang_sdma_ring_helper(amdgpu_device_handle device_handle, uint8_t hang_type, struct pci_addr *pci); + +void +amdgpu_hang_ring_helper(amdgpu_device_handle device_handle, unsigned int ip_type, + struct pci_addr *pci, bool user_queue); #endif diff --git a/tests/amdgpu/amd_deadlock.c b/tests/amdgpu/amd_deadlock.c index 5325c0ade..118948992 100644 --- a/tests/amdgpu/amd_deadlock.c +++ b/tests/amdgpu/amd_deadlock.c @@ -246,6 +246,15 @@ int igt_main() amdgpu_wait_memory_helper(device, AMDGPU_HW_IP_DMA, &pci, true); } } + + igt_describe("Test-per-queue-reset-of-a-cleanly-hung-gfx-user-queue"); + igt_subtest_with_dynamic("amdgpu-deadlock-gfx-umq") { + if (enable_test && userq_arr_cap[AMD_IP_GFX] && + is_reset_enable(AMD_IP_GFX, AMDGPU_RESET_TYPE_PER_QUEUE, &pci)) { + igt_dynamic_f("amdgpu-deadlock-gfx-umq") + amdgpu_hang_ring_helper(device, AMDGPU_HW_IP_GFX, &pci, true); + } + } #endif igt_fixture() { -- 2.49.0