Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH] tests/amd_dispatch: add reset subtest
@ 2023-09-26  5:58 Jesse Zhang
  2023-09-26  8:16 ` [igt-dev] ✓ CI.xeBAT: success for tests/amd_dispatch: add reset subtest (rev3) Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Jesse Zhang @ 2023-09-26  5:58 UTC (permalink / raw)
  To: igt-dev; +Cc: Alex Deucher, Luben Tuikov, Christian Koenig

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@amd.com>
Signed-off-by: Tim Huang <tim.huang@amd.com
Reviewed-by: Vitaly Prosyak <vitaly.prosyak@amd.com>
---
 tests/amdgpu/amd_dispatch.c | 45 +++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/tests/amdgpu/amd_dispatch.c b/tests/amdgpu/amd_dispatch.c
index 77d63f7ad..b79b80578 100644
--- a/tests/amdgpu/amd_dispatch.c
+++ b/tests/amdgpu/amd_dispatch.c
@@ -5,6 +5,9 @@
  * Copyright 2023 Advanced Micro Devices, Inc.
  */
 
+#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"
@@ -21,6 +24,40 @@ amdgpu_dispatch_hang_slow_compute(amdgpu_device_handle device_handle)
 	amdgpu_dispatch_hang_slow_helper(device_handle, AMDGPU_HW_IP_COMPUTE);
 }
 
+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;
@@ -64,6 +101,14 @@ igt_main
 		}
 	}
 
+	igt_describe("Test-GPU-reset-using-amdgpu-debugfs-to-hang-the-job-on-gfx-ring");
+	igt_subtest_with_dynamic("amdgpu-reset-test-gfx-with-IP-GFX") {
+		if (arr_cap[AMD_IP_GFX]) {
+			igt_dynamic_f("amdgpu-reset-gfx")
+			amdgpu_gpu_reset_test(device,fd);
+		}
+	}
+
 	igt_fixture {
 		amdgpu_device_deinitialize(device);
 		drm_close_driver(fd);
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [igt-dev] [PATCH] tests/amd_dispatch: add reset subtest
@ 2023-09-26  5:55 Jesse Zhang
  2023-09-26  5:57 ` Zhang, Jesse(Jie)
  0 siblings, 1 reply; 6+ messages in thread
From: Jesse Zhang @ 2023-09-26  5:55 UTC (permalink / raw)
  To: igt-dev; +Cc: Alex Deucher, Luben Tuikov, Christian Koenig

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

Signed-off-by: Jesse Zhang <Jesse.Zhang@amd.com>
Signed-off-by: Tim Huang <tim.huang@amd.com
Reviewed-by: Vitaly Prosyak <vitaly.prosyak@amd.com>
---
 tests/amdgpu/amd_dispatch.c | 45 +++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/tests/amdgpu/amd_dispatch.c b/tests/amdgpu/amd_dispatch.c
index 77d63f7ad..b79b80578 100644
--- a/tests/amdgpu/amd_dispatch.c
+++ b/tests/amdgpu/amd_dispatch.c
@@ -5,6 +5,9 @@
  * Copyright 2023 Advanced Micro Devices, Inc.
  */
 
+#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"
@@ -21,6 +24,40 @@ amdgpu_dispatch_hang_slow_compute(amdgpu_device_handle device_handle)
 	amdgpu_dispatch_hang_slow_helper(device_handle, AMDGPU_HW_IP_COMPUTE);
 }
 
+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;
@@ -64,6 +101,14 @@ igt_main
 		}
 	}
 
+	igt_describe("Test-GPU-reset-using-amdgpu-debugfs-to-hang-the-job-on-gfx-ring");
+	igt_subtest_with_dynamic("amdgpu-reset-test-gfx-with-IP-GFX") {
+		if (arr_cap[AMD_IP_GFX]) {
+			igt_dynamic_f("amdgpu-reset-gfx")
+			amdgpu_gpu_reset_test(device,fd);
+		}
+	}
+
 	igt_fixture {
 		amdgpu_device_deinitialize(device);
 		drm_close_driver(fd);
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-09-26 18:29 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-26  5:58 [igt-dev] [PATCH] tests/amd_dispatch: add reset subtest Jesse Zhang
2023-09-26  8:16 ` [igt-dev] ✓ CI.xeBAT: success for tests/amd_dispatch: add reset subtest (rev3) Patchwork
2023-09-26  8:16 ` [igt-dev] ✓ Fi.CI.BAT: " Patchwork
2023-09-26 18:29 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2023-09-26  5:55 [igt-dev] [PATCH] tests/amd_dispatch: add reset subtest Jesse Zhang
2023-09-26  5:57 ` Zhang, Jesse(Jie)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox