[PATCH v2 i-g-t 0/2] Refactor sriov_basic test and blocklisting

[PATCH v2 i-g-t 0/2] Refactor sriov_basic test and blocklisting

[Marcin Bernatowicz]

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 <adam.miszczak@linux.intel.com>
Cc: Lukasz Laguna <lukasz.laguna@intel.com>
Cc: Jakub Kolakowski <jakub1.kolakowski@intel.com>
Cc: Michal Wajdeczko <Michal.Wajdeczko@intel.com>

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(-)

-- 
2.31.1

[PATCH v2 i-g-t 1/2] tests/intel-ci/xe.blocklist: Blocklist SR-IOV stress tests

[Marcin Bernatowicz]

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 <adam.miszczak@linux.intel.com>
Cc: Lukasz Laguna <lukasz.laguna@intel.com>
Cc: Jakub Kolakowski <jakub1.kolakowski@intel.com>
Cc: Michal Wajdeczko <Michal.Wajdeczko@intel.com>
Signed-off-by: Marcin Bernatowicz <marcin.bernatowicz@linux.intel.com>
---
 tests/intel-ci/xe.blocklist.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/intel-ci/xe.blocklist.txt b/tests/intel-ci/xe.blocklist.txt
index 828baf324..f9ef612c4 100644
--- a/tests/intel-ci/xe.blocklist.txt
+++ b/tests/intel-ci/xe.blocklist.txt
@@ -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$
+##################################################################
-- 
2.31.1

[PATCH v2 i-g-t 2/2] tests/sriov_basic: Extract enable-vfs-bind-unbind-each-numvfs-all subtest

[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 <adam.miszczak@linux.intel.com>
Cc: Lukasz Laguna <lukasz.laguna@intel.com>
Cc: Jakub Kolakowski <jakub1.kolakowski@intel.com>
Cc: Michal Wajdeczko <Michal.Wajdeczko@intel.com>
Signed-off-by: Marcin Bernatowicz <marcin.bernatowicz@linux.intel.com>
---
 tests/sriov_basic.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/sriov_basic.c b/tests/sriov_basic.c
index 95a462709..eff93ef7a 100644
--- a/tests/sriov_basic.c
+++ b/tests/sriov_basic.c
@@ -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);
 		}
 	}
 
-- 
2.31.1

RE: [PATCH v2 i-g-t 0/2] Refactor sriov_basic test and blocklisting

[Cavitt, Jonathan]

-----Original Message-----
From: Marcin Bernatowicz <marcin.bernatowicz@linux.intel.com> 
Sent: Thursday, July 11, 2024 6:59 AM
To: igt-dev@lists.freedesktop.org
Cc: Cavitt, Jonathan <jonathan.cavitt@intel.com>; Marcin Bernatowicz <marcin.bernatowicz@linux.intel.com>; Adam Miszczak <adam.miszczak@linux.intel.com>; Laguna, Lukasz <lukasz.laguna@intel.com>; Kolakowski, Jakub1 <jakub1.kolakowski@intel.com>; Wajdeczko, Michal <Michal.Wajdeczko@intel.com>
Subject: [PATCH v2 i-g-t 0/2] 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 <adam.miszczak@linux.intel.com>
> Cc: Lukasz Laguna <lukasz.laguna@intel.com>
> Cc: Jakub Kolakowski <jakub1.kolakowski@intel.com>
> Cc: Michal Wajdeczko <Michal.Wajdeczko@intel.com>

Reviewed-by still stands for both patches.
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
-Jonathan Cavitt
> 
> 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(-)
> 
> -- 
> 2.31.1
> 
> 

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

[Patchwork]

== 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".