[igt-dev] [PATCH] tests/amd_deadlock: add reset subtest

Jesse Zhang jesse.zhang at amd.com
Mon Sep 25 02:05:22 UTC 2023


Add an amdgpu reset test to the suite

V2:
  - improve subject and description  (Kamil,Luben)
  - sort the include alphabetically (Kamil)
  - Optimize some code (Luben)

Signed-off-by: Jesse Zhang <Jesse.Zhang at amd.com>
Signed-off-by: Tim Huang <tim.huang at amd.com>
---
 tests/amdgpu/amd_deadlock.c | 39 +++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/tests/amdgpu/amd_deadlock.c b/tests/amdgpu/amd_deadlock.c
index d805b8d18..4063ac61b 100644
--- a/tests/amdgpu/amd_deadlock.c
+++ b/tests/amdgpu/amd_deadlock.c
@@ -23,6 +23,9 @@
  * Based on libdrm/tests/amdgpu/deadlock_tests.c
  */
 
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include "lib/amdgpu/amd_memory.h"
 #include "lib/amdgpu/amd_command_submission.h"
 #include "lib/amdgpu/amd_dispatch.h"
@@ -70,6 +73,40 @@ amdgpu_gfx_illegal_mem_access(amdgpu_device_handle device_handle)
 	bad_access_helper(device_handle, 0, AMDGPU_HW_IP_GFX);
 }
 
+static void
+amdgpu_gpu_reset_test(amdgpu_device_handle device_handle, int drm_amdgpu)
+{
+	amdgpu_context_handle context_handle;
+	char debugfs_path[256], tmp[10];
+	uint32_t hang_state, hangs;
+	struct stat sbuf;
+	int r, fd;
+
+	r = amdgpu_cs_ctx_create(device_handle, &context_handle);
+	igt_assert_eq(r, 0);
+
+	r = fstat(drm_amdgpu, &sbuf);
+	igt_assert_eq(r, 0);
+
+	sprintf(debugfs_path, "/sys/kernel/debug/dri/%d/amdgpu_gpu_recover", minor(sbuf.st_rdev));
+	fd = open(debugfs_path, O_RDONLY);
+	igt_assert_fd(fd);
+
+	r = read(fd, tmp, ARRAY_SIZE(tmp));
+	igt_assert_lt(0,r);
+
+	r = amdgpu_cs_query_reset_state(context_handle, &hang_state, &hangs);
+	igt_assert_eq(r, 0);
+	igt_assert_eq(hang_state, AMDGPU_CTX_UNKNOWN_RESET);
+
+	close(fd);
+	r = amdgpu_cs_ctx_free(context_handle);
+	igt_assert_eq(r, 0);
+
+	amdgpu_gfx_dispatch_test(device_handle, AMDGPU_HW_IP_GFX);
+	amdgpu_gfx_dispatch_test(device_handle, AMDGPU_HW_IP_COMPUTE);
+}
+
 igt_main
 {
 	amdgpu_device_handle device;
@@ -116,6 +153,8 @@ igt_main
 	igt_subtest("dispatch_hang_slow_gfx")
 	amdgpu_dispatch_hang_slow_gfx(device);
 
+	igt_subtest("amdgpu-reset-test")
+	amdgpu_gpu_reset_test(device,fd);
 	igt_fixture {
 		amdgpu_device_deinitialize(device);
 		drm_close_driver(fd);
-- 
2.25.1



More information about the igt-dev mailing list