Skip to contentSkip to conversation

lib/amdgpu:fix the error when skip hotplug test

PATCH In review Jesse Zhang 2 participants 4 messages Nov 9, 2023 – Nov 29, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 3/3 lib/amdgpu:fix the error when skip hotplug test

For skipped cases, we should print "SKIP"
rather than "failure." For example

IGT-Version: 1.28-g4b3e1dc37 (x86_64) (Linux: 6.3.7+ x86_64)
Starting subtest: amdgpu_hotunplug_simple
SKIP ... more than 1 GPU is required for this test
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: Test assertion failure function amdgpu_hotunplug_test, file ../lib/amdgpu/amd_pci_unplug.c:305:
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: Failed assertion: r == 1
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: Last errno: 22, Invalid argument
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: error: 0 != 1
Stack trace:
#0 ../lib/igt_core.c:1988 __igt_fail_assert()
#1 ../lib/amdgpu/amd_pci_unplug.c:305 amdgpu_hotunplug_test.constprop.0.isra.0()
#2 [amdgpu_hotunplug_simple+0x29]
#3 ../tests/amdgpu/amd_pci_unplug.c:44 __igt_unique____real_main34()
#4 ../tests/amdgpu/amd_pci_unplug.c:34 main()
#5 ../sysdeps/nptl/libc_start_call_main.h:58 __libc_start_call_main()
#6 ../csu/libc-start.c:128 __libc_start_main@@GLIBC_2.34()
#7 [_start+0x25]
Subtest amdgpu_hotunplug_simple failed.

V2:
- replace igt_skip_on with igt_skip_f(Kamil)

Cc Vitaly Prosyak <[email protected]>
Cc Luben Tuikov <[email protected]>
Cc Alex Deucher <[email protected]>
Cc Christian Koenig <[email protected]>
Cc Tim Huang <[email protected]>
Cc Kamil Konieczny <[email protected]>
---
 lib/amdgpu/amd_pci_unplug.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
lib/amdgpu/amd_pci_unplug.c +7 -4
index b7af95dec..8346aeb98 100644
@@ -101,8 +101,7 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 
 	if (setup->open_device && setup->open_device2 && unplug->num_devices < 2) {
 		/*Not enough board for the test*/
-		printf("SKIP ... more than 1 GPU is required for this test\n");
-		goto release;
+		igt_skip_on_f(ret, "SKIP ... more than 1 GPU is required for this test\n");
 	}
 
 	tmp_str = amdgpu_get_device_from_fd(unplug->drm_amdgpu_fds[0]);
@@ -117,7 +116,9 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 		goto release;
 
 	if (minor_version < setup->minor_version_req)
-		goto release;
+		igt_skip_on_f(minor_version < setup->minor_version_req,
+			"It has minor_version: %d but it is required: %d for this test\n",
+			minor_version, setup->minor_version_req);
 
 	/* skip hotplug test on APU (Accelerated Processing Unit CPU + iGPU) */
 	r = amdgpu_query_gpu_info(unplug->device_handle, &gpu_info);
@@ -138,7 +139,9 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 		if (r != 0)
 			goto release;
 		if (minor_version < setup->minor_version_req)
-			goto release;
+			igt_skip_on_f(minor_version < setup->minor_version_req,
+				"It has minor_version: %d but it is required: %d for this test\n",
+				minor_version, setup->minor_version_req);
 
 		r = amdgpu_query_gpu_info(unplug->device_handle2, &gpu_info);
 		igt_assert_eq(r, 0);
Signature · 1 line
2.25.1
Reviewed-by on v1 3/3
#1 lore raw

Hi Jesse,

Quoted 42 lines · Jesse Zhang

For skipped cases, we should print "SKIP"
rather than "failure." For example

IGT-Version: 1.28-g4b3e1dc37 (x86_64) (Linux: 6.3.7+ x86_64)
Starting subtest: amdgpu_hotunplug_simple
SKIP ... more than 1 GPU is required for this test
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: Test assertion failure function amdgpu_hotunplug_test, file ../lib/amdgpu/amd_pci_unplug.c:305:
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: Failed assertion: r == 1
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: Last errno: 22, Invalid argument
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: error: 0 != 1
Stack trace:
#0 ../lib/igt_core.c:1988 __igt_fail_assert()
#1 ../lib/amdgpu/amd_pci_unplug.c:305 amdgpu_hotunplug_test.constprop.0.isra.0()
#2 [amdgpu_hotunplug_simple+0x29]
#3 ../tests/amdgpu/amd_pci_unplug.c:44 __igt_unique____real_main34()
#4 ../tests/amdgpu/amd_pci_unplug.c:34 main()
#5 ../sysdeps/nptl/libc_start_call_main.h:58 __libc_start_call_main()
#6 ../csu/libc-start.c:128 __libc_start_main@@GLIBC_2.34()
#7 [_start+0x25]
Subtest amdgpu_hotunplug_simple failed.

V2:
- replace igt_skip_on with igt_skip_f(Kamil)

Cc Vitaly Prosyak <[email protected]>
Cc Luben Tuikov <[email protected]>
Cc Alex Deucher <[email protected]>
Cc Christian Koenig <[email protected]>
Cc Tim Huang <[email protected]>
Cc Kamil Konieczny <[email protected]>
---
 lib/amdgpu/amd_pci_unplug.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
lib/amdgpu/amd_pci_unplug.c +0 -0
index b7af95dec..8346aeb98 100644

lib/amdgpu/amd_pci_unplug.c amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup · line 104

Quoted 6 lines
lib/amdgpu/amd_pci_unplug.c +1 -2
@@ -101,8 +101,7 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 
 	if (setup->open_device && setup->open_device2 && unplug->num_devices < 2) {
 		/*Not enough board for the test*/
-		printf("SKIP ... more than 1 GPU is required for this test\n");
-		goto release;
+		igt_skip_on_f(ret, "SKIP ... more than 1 GPU is required for this test\n");

--------------------------- ^^^^^^^^^
No need for repeating SKIP here.

With this fixed:

Quoted 28 lines
lib/amdgpu/amd_pci_unplug.c +6 -2
 	}
 
 	tmp_str = amdgpu_get_device_from_fd(unplug->drm_amdgpu_fds[0]);
@@ -117,7 +116,9 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 		goto release;
 
 	if (minor_version < setup->minor_version_req)
-		goto release;
+		igt_skip_on_f(minor_version < setup->minor_version_req,
+			"It has minor_version: %d but it is required: %d for this test\n",
+			minor_version, setup->minor_version_req);
 
 	/* skip hotplug test on APU (Accelerated Processing Unit CPU + iGPU) */
 	r = amdgpu_query_gpu_info(unplug->device_handle, &gpu_info);
@@ -138,7 +139,9 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 		if (r != 0)
 			goto release;
 		if (minor_version < setup->minor_version_req)
-			goto release;
+			igt_skip_on_f(minor_version < setup->minor_version_req,
+				"It has minor_version: %d but it is required: %d for this test\n",
+				minor_version, setup->minor_version_req);
 
 		r = amdgpu_query_gpu_info(unplug->device_handle2, &gpu_info);
 		igt_assert_eq(r, 0);
Signature · 1 line
2.25.1
#2 lore raw
In reply to Jesse Zhang

Hi Jesse,

one small nit about subject, put space after ':',

[PATCH i-g-t 3/3] lib/amdgpu:fix the error when skip hotplug test ----------------------------^^
s/amdgpu:fix/amdgpu: fix/

should be:
[PATCH i-g-t 3/3] lib/amdgpu: fix the error when skip hotplug test

Quoted 13 lines · Jesse Zhang

For skipped cases, we should print "SKIP"
rather than "failure." For example

IGT-Version: 1.28-g4b3e1dc37 (x86_64) (Linux: 6.3.7+ x86_64)
Starting subtest: amdgpu_hotunplug_simple
SKIP ... more than 1 GPU is required for this test
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: Test assertion failure function amdgpu_hotunplug_test, file ../lib/amdgpu/amd_pci_unplug.c:305:
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: Failed assertion: r == 1
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: Last errno: 22, Invalid argument
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: error: 0 != 1
Stack trace:
#0 ../lib/igt_core.c:1988 __igt_fail_assert()
#1 ../lib/amdgpu/amd_pci_unplug.c:305 amdgpu_hotunplug_test.constprop.0.isra.0()

--------- ^^^ -------------------------------------------- ^^^^

Did you write test inside library? Is it called from other tests?

Regards,
Kamil

Quoted 63 lines

#2 [amdgpu_hotunplug_simple+0x29]
#3 ../tests/amdgpu/amd_pci_unplug.c:44 __igt_unique____real_main34() #4 ../tests/amdgpu/amd_pci_unplug.c:34 main()
#5 ../sysdeps/nptl/libc_start_call_main.h:58 __libc_start_call_main() #6 ../csu/libc-start.c:128 __libc_start_main@@GLIBC_2.34() #7 [_start+0x25]
Subtest amdgpu_hotunplug_simple failed.

V2:
- replace igt_skip_on with igt_skip_f(Kamil)

Cc Vitaly Prosyak <[email protected]>
Cc Luben Tuikov <[email protected]>
Cc Alex Deucher <[email protected]>
Cc Christian Koenig <[email protected]>
Cc Tim Huang <[email protected]>
Cc Kamil Konieczny <[email protected]>
---
 lib/amdgpu/amd_pci_unplug.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
lib/amdgpu/amd_pci_unplug.c +7 -4
index b7af95dec..8346aeb98 100644
@@ -101,8 +101,7 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 
 	if (setup->open_device && setup->open_device2 && unplug->num_devices < 2) {
 		/*Not enough board for the test*/
-		printf("SKIP ... more than 1 GPU is required for this test\n");
-		goto release;
+		igt_skip_on_f(ret, "SKIP ... more than 1 GPU is required for this test\n");
 	}
 
 	tmp_str = amdgpu_get_device_from_fd(unplug->drm_amdgpu_fds[0]);
@@ -117,7 +116,9 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 		goto release;
 
 	if (minor_version < setup->minor_version_req)
-		goto release;
+		igt_skip_on_f(minor_version < setup->minor_version_req,
+			"It has minor_version: %d but it is required: %d for this test\n",
+			minor_version, setup->minor_version_req);
 
 	/* skip hotplug test on APU (Accelerated Processing Unit CPU + iGPU) */
 	r = amdgpu_query_gpu_info(unplug->device_handle, &gpu_info);
@@ -138,7 +139,9 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
 		if (r != 0)
 			goto release;
 		if (minor_version < setup->minor_version_req)
-			goto release;
+			igt_skip_on_f(minor_version < setup->minor_version_req,
+				"It has minor_version: %d but it is required: %d for this test\n",
+				minor_version, setup->minor_version_req);
 
 		r = amdgpu_query_gpu_info(unplug->device_handle2, &gpu_info);
 		igt_assert_eq(r, 0);
Signature · 1 line
2.25.1
#3 lore raw

[AMD Official Use Only - General]

HI Kamil,
Sorry for missing this email.
-----Original Message-----
From: Kamil Konieczny <[email protected]>
Sent: Friday, November 10, 2023 12:18 AM
To: [email protected]
Cc: Zhang, Jesse(Jie) <[email protected]>; Prosyak, Vitaly <[email protected]>; Deucher, Alexander <[email protected]>; Tuikov, Luben <[email protected]>; Koenig, Christian <[email protected]>; Huang, Tim <[email protected]>
Subject: Re: [PATCH i-g-t 3/3] lib/amdgpu:fix the error when skip hotplug test

Hi Jesse,

one small nit about subject, put space after ':',

[PATCH i-g-t 3/3] lib/amdgpu:fix the error when skip hotplug test ----------------------------^^ s/amdgpu:fix/amdgpu: fix/

should be:
[PATCH i-g-t 3/3] lib/amdgpu: fix the error when skip hotplug test
[Zhang, Jesse(Jie)] yes, thanks for this comment.

Quoted 16 lines · Jesse Zhang

For skipped cases, we should print "SKIP"
rather than "failure." For example

IGT-Version: 1.28-g4b3e1dc37 (x86_64) (Linux: 6.3.7+ x86_64) Starting
subtest: amdgpu_hotunplug_simple SKIP ... more than 1 GPU is required
for this test
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: Test assertion failure function amdgpu_hotunplug_test, file ../lib/amdgpu/amd_pci_unplug.c:305:
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: Failed
assertion: r == 1
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: Last errno: 22,
Invalid argument
(amd_pci_unplug:70496) amdgpu/amd_pci_unplug-CRITICAL: error: 0 != 1
Stack trace:
#0 ../lib/igt_core.c:1988 __igt_fail_assert()
#1 ../lib/amdgpu/amd_pci_unplug.c:305
amdgpu_hotunplug_test.constprop.0.isra.0()

--------- ^^^ -------------------------------------------- ^^^^

Did you write test inside library? Is it called from other tests?
[Zhang, Jesse(Jie)] hi Kamil, I just wrote some negative tests inside library. For example, version mismatch. It should print "SKIP" for this test, and it should not fail. Regards
Jesse

Regards,
Kamil

Quoted 65 lines

#2 [amdgpu_hotunplug_simple+0x29]
#3 ../tests/amdgpu/amd_pci_unplug.c:44 __igt_unique____real_main34() #4 ../tests/amdgpu/amd_pci_unplug.c:34 main()
#5 ../sysdeps/nptl/libc_start_call_main.h:58 __libc_start_call_main() #6 ../csu/libc-start.c:128 __libc_start_main@@GLIBC_2.34() #7 [_start+0x25]
Subtest amdgpu_hotunplug_simple failed.

V2:
- replace igt_skip_on with igt_skip_f(Kamil)

Cc Vitaly Prosyak <[email protected]>
Cc Luben Tuikov <[email protected]>
Cc Alex Deucher <[email protected]>
Cc Christian Koenig <[email protected]>
Cc Tim Huang <[email protected]>
Cc Kamil Konieczny <[email protected]>
---
 lib/amdgpu/amd_pci_unplug.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
lib/amdgpu/amd_pci_unplug.c +0 -0
index b7af95dec..8346aeb98 100644
@@ -101,8 +101,7 @@ amdgpu_hotunplug_setup_test(bool render_mode,

const struct amd_pci_unplug_setup

      if (setup->open_device && setup->open_device2 && unplug->num_devices < 2) {
              /*Not enough board for the test*/
lib/amdgpu/amd_pci_unplug.c +8 -6
-             printf("SKIP ... more than 1 GPU is required for this test\n");
-             goto release;
+             igt_skip_on_f(ret, "SKIP ... more than 1 GPU is required for this
+test\n");
      }
 
      tmp_str = amdgpu_get_device_from_fd(unplug->drm_amdgpu_fds[0]);
@@ -117,7 +116,9 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
              goto release;
 
      if (minor_version < setup->minor_version_req)
-             goto release;
+             igt_skip_on_f(minor_version < setup->minor_version_req,
+                     "It has minor_version: %d but it is required: %d for this test\n",
+                     minor_version, setup->minor_version_req);
 
      /* skip hotplug test on APU (Accelerated Processing Unit CPU + iGPU) */
      r = amdgpu_query_gpu_info(unplug->device_handle, &gpu_info); @@
-138,7 +139,9 @@ amdgpu_hotunplug_setup_test(bool render_mode, const struct amd_pci_unplug_setup
              if (r != 0)
                      goto release;
              if (minor_version < setup->minor_version_req)
-                     goto release;
+                     igt_skip_on_f(minor_version < setup->minor_version_req,
+                             "It has minor_version: %d but it is required: %d for this test\n",
+                             minor_version, setup->minor_version_req);
 
              r = amdgpu_query_gpu_info(unplug->device_handle2, &gpu_info);
              igt_assert_eq(r, 0);
--

2.25.1