Skip to contentSkip to conversation

Refactor sriov_basic test and blocklisting

PATCH Superseded Marcin Bernatowicz 3 participants 5 messages Jul 11, 2024

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover Refactor sriov_basic test and blocklisting

This patch series improves SR-IOV testing within the intel-ci environment. The first patch blocklists sriov_basic tests identified as overly stressful or time-consuming to be executed with all dynamic subtests at once. However, these dynamic subtests can still be executed via testlists (refer to the BAT example below).
The second patch extracts a specific subtest to simplify blocklist management.

Included in the blocklist to prevent simultaneous execution of all dynamic subtests:
igt@sriov_basic@enable-vfs-autoprobe-on igt@sriov_basic@enable-vfs-bind-unbind-each igt@sriov_basic@bind-unbind-vf

Tests retained for execution:

BAT:
igt@sriov_basic@enable-vfs-autoprobe-off@numvfs-all igt@sriov_basic@enable-vfs-autoprobe-on@numvfs-1

FULL:
igt@sriov_basic@enable-vfs-autoprobe-off igt@sriov_basic@enable-vfs-bind-unbind-each-numvfs-all

v2: - updated blocklist, corrected line lengths
- improved description (Jonathan)

Cc Adam Miszczak <[email protected]>
Cc Lukasz Laguna <[email protected]>
Cc Jakub Kolakowski <[email protected]>
Cc Michal Wajdeczko <[email protected]>

Marcin Bernatowicz (2):
tests/intel-ci/xe.blocklist: Blocklist SR-IOV stress tests tests/sriov_basic: Extract enable-vfs-bind-unbind-each-numvfs-all
subtest

 tests/intel-ci/xe.blocklist.txt |  7 +++++++
 tests/sriov_basic.c             | 16 ++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
Signature · 1 line
2.31.1
#1 lore raw

PATCH v2 1/2 tests/intel-ci/xe.blocklist: Blocklist SR-IOV stress tests

Blocklist certain sriov_basic tests identified as overly stressful or time-consuming to be executed with all dynamic subtests at once. However, these dynamic subtests can still be executed via testlists (refer to the BAT example below).

Included in the blocklist to prevent simultaneous execution of all dynamic subtests:
igt@sriov_basic@enable-vfs-autoprobe-on igt@sriov_basic@enable-vfs-bind-unbind-each igt@sriov_basic@bind-unbind-vf

Tests retained for execution:

BAT:
igt@sriov_basic@enable-vfs-autoprobe-off@numvfs-all igt@sriov_basic@enable-vfs-autoprobe-on@numvfs-1

FULL:
igt@sriov_basic@enable-vfs-autoprobe-off igt@sriov_basic@enable-vfs-bind-unbind-each-numvfs-all

Cc Adam Miszczak <[email protected]>
Cc Lukasz Laguna <[email protected]>
Cc Jakub Kolakowski <[email protected]>
Cc Michal Wajdeczko <[email protected]>
---
 tests/intel-ci/xe.blocklist.txt | 7 +++++++
 1 file changed, 7 insertions(+)
tests/intel-ci/xe.blocklist.txt +7 -0
index 828baf324..f9ef612c4 100644
@@ -83,3 +83,10 @@ igt@kms_prime@.*
 ##################################################################
 igt@kms_cursor_legacy@modeset-atomic-cursor-hotspot
 ##################################################################
+# SR-IOV tests too stressful or time-consuming
+# to execute all dynamic subtests at once.
+##################################################################
+igt@sriov_basic@enable-vfs-autoprobe-on$
+igt@sriov_basic@enable-vfs-bind-unbind-each$
+igt@sriov_basic@bind-unbind-vf$
+##################################################################
Signature · 1 line
2.31.1
#2 lore raw

PATCH v2 2/2 tests/sriov_basic: Extract enable-vfs-bind-unbind-each-numvfs-all subtest

In reply to Marcin Bernatowicz

Extract the 'enable-vfs-bind-unbind-each-numvfs-all' subtest to simplify blocklist management. Currently, there is no straightforward method to block dynamic subsubtests, and running all of them becomes too time-consuming.

Cc Adam Miszczak <[email protected]>
Cc Lukasz Laguna <[email protected]>
Cc Jakub Kolakowski <[email protected]>
Cc Michal Wajdeczko <[email protected]>
---
 tests/sriov_basic.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
tests/sriov_basic.c +12 -4
index 95a462709..eff93ef7a 100644
@@ -62,7 +62,13 @@ static void enable_vfs_autoprobe_on(int pf_fd, unsigned int num_vfs)
 /**
  * SUBTEST: enable-vfs-bind-unbind-each
  * Description:
- *   Verify VFs enabling with binding and unbinding the driver one be one to each of them
+ *   Verify VFs enabling with binding and unbinding the driver one by one to each of them.
+ *   Version includes dynamic subtests that allow specifying the number of enabled VFs as numvfs-N.
+ *
+ * SUBTEST: enable-vfs-bind-unbind-each-numvfs-all
+ * Description:
+ *   Verify the enabling of all VFs and the sequential binding and unbinding of the driver
+ *   to each one.
  */
 static void enable_vfs_bind_unbind_each(int pf_fd, unsigned int num_vfs)
 {
@@ -176,10 +182,12 @@ igt_main
 				enable_vfs_bind_unbind_each(pf_fd, num_vfs);
 			}
 		}
+	}
+
+	igt_describe("Verify the enabling of all VFs and the sequential binding and unbinding of the driver to each one");
+	igt_subtest("enable-vfs-bind-unbind-each-numvfs-all") {
 		for_max_sriov_num_vfs(pf_fd, num_vfs) {
-			igt_dynamic_f("numvfs-all") {
-				enable_vfs_bind_unbind_each(pf_fd, num_vfs);
-			}
+			enable_vfs_bind_unbind_each(pf_fd, num_vfs);
 		}
 	}
 
Signature · 1 line
2.31.1
Reviewed-by on the v2 series
#3 lore raw
In reply to Marcin Bernatowicz

-----Original Message-----
From: Marcin Bernatowicz <[email protected]>
Sent: Thursday, July 11, 2024 6:59 AM
To: [email protected]
Cc: Cavitt, Jonathan <[email protected]>; Marcin Bernatowicz <[email protected]>; Adam Miszczak <[email protected]>; Laguna, Lukasz <[email protected]>; Kolakowski, Jakub1 <[email protected]>; Wajdeczko, Michal <[email protected]>
Subject: [PATCH v2 i-g-t 0/2] Refactor sriov_basic test and blocklisting

Quoted 25 lines

This patch series improves SR-IOV testing within the intel-ci environment. The first patch blocklists sriov_basic tests identified as overly stressful or time-consuming to be executed with all dynamic subtests at once. However, these dynamic subtests can still be executed via testlists (refer to the BAT example below).
The second patch extracts a specific subtest to simplify blocklist management.

Included in the blocklist to prevent simultaneous execution of all dynamic subtests:
igt@sriov_basic@enable-vfs-autoprobe-on igt@sriov_basic@enable-vfs-bind-unbind-each igt@sriov_basic@bind-unbind-vf

Tests retained for execution:

BAT:
igt@sriov_basic@enable-vfs-autoprobe-off@numvfs-all igt@sriov_basic@enable-vfs-autoprobe-on@numvfs-1

FULL:
igt@sriov_basic@enable-vfs-autoprobe-off igt@sriov_basic@enable-vfs-bind-unbind-each-numvfs-all

Quoted 7 lines

v2: - updated blocklist, corrected line lengths
- improved description (Jonathan)

Cc Adam Miszczak <[email protected]>
Cc Lukasz Laguna <[email protected]>
Cc Jakub Kolakowski <[email protected]>
Cc Michal Wajdeczko <[email protected]>

Reviewed-by still stands for both patches.

-Jonathan Cavitt

Quoted 14 lines

Marcin Bernatowicz (2):
tests/intel-ci/xe.blocklist: Blocklist SR-IOV stress tests tests/sriov_basic: Extract enable-vfs-bind-unbind-each-numvfs-all
subtest

 tests/intel-ci/xe.blocklist.txt |  7 +++++++
 tests/sriov_basic.c             | 16 ++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
Signature · 1 line
2.31.1
#4 lore raw

✗ Fi.CI.BUILD: failure for Refactor sriov_basic test and blocklisting (rev2)

In reply to Marcin Bernatowicz
== Series Details ==

== Series Details ==

Series: Refactor sriov_basic test and blocklisting (rev2)
URL : https://patchwork.freedesktop.org/series/135946/
State : failure

== Summary ==

Applying: tests/intel-ci/xe.blocklist: Blocklist SR-IOV stress tests Using index info to reconstruct a base tree...
M tests/intel-ci/xe.blocklist.txt
Falling back to patching base and 3-way merge...
Auto-merging tests/intel-ci/xe.blocklist.txt
CONFLICT (content): Merge conflict in tests/intel-ci/xe.blocklist.txt Patch failed at 0001 tests/intel-ci/xe.blocklist: Blocklist SR-IOV stress tests When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".