[PATCH v2 i-g-t 5/6] tests/xe: Arm SR-IOV exit cleanup with callback

[Marcin Bernatowicz <marcin.bernatowicz@linux.intel.com>]

Install SR-IOV exit handler in xe_pmu, xe_sriov_admin, and
xe_sriov_scheduling.

Use xe_sriov_admin_exit_cleanup_restore_defaults() as exit callback to
restore Xe SR-IOV admin scheduling defaults. Clear handler after explicit
teardown succeeds.

Signed-off-by: Marcin Bernatowicz <marcin.bernatowicz@linux.intel.com>
Cc: Adam Miszczak <adam.miszczak@linux.intel.com>
Cc: Jakub Kolakowski <jakub1.kolakowski@intel.com>
Cc: Lukasz Laguna <lukasz.laguna@intel.com>
Reviewed-by: Lukasz Laguna <lukasz.laguna@intel.com>
---
 tests/intel/xe_pmu.c              | 4 ++++
 tests/intel/xe_sriov_admin.c      | 4 ++++
 tests/intel/xe_sriov_scheduling.c | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/tests/intel/xe_pmu.c b/tests/intel/xe_pmu.c
index fb4b871e7..bb6d21b9f 100644
--- a/tests/intel/xe_pmu.c
+++ b/tests/intel/xe_pmu.c
@@ -994,6 +994,9 @@ static unsigned int enable_and_provision_vfs(int fd)
 	igt_require(xe_sriov_admin_is_present(fd));
 	igt_require(igt_sriov_get_enabled_vfs(fd) == 0);
 	xe_sriov_require_default_scheduling_attributes(fd);
+	igt_sriov_install_exit_handler(fd,
+				       xe_sriov_admin_exit_cleanup_restore_defaults,
+				       NULL);
 	autoprobe = igt_sriov_is_driver_autoprobe_enabled(fd);
 
 	/* Enable VF's */
@@ -1035,6 +1038,7 @@ static void unprovision_and_disable_vfs(int fd)
 
 	igt_abort_on_f(autoprobe != igt_sriov_is_driver_autoprobe_enabled(fd),
 		       "Failed to restore sriov_drivers_autoprobe value\n");
+	igt_sriov_clear_exit_handler();
 }
 
 static void stash_gt_freq(int fd, uint32_t **stash_min, uint32_t **stash_max)
diff --git a/tests/intel/xe_sriov_admin.c b/tests/intel/xe_sriov_admin.c
index 5c7f5d621..8b400a01f 100644
--- a/tests/intel/xe_sriov_admin.c
+++ b/tests/intel/xe_sriov_admin.c
@@ -346,6 +346,9 @@ int igt_main()
 		igt_require(igt_sriov_is_pf(pf_fd));
 		igt_require(igt_sriov_get_enabled_vfs(pf_fd) == 0);
 		igt_require(xe_sriov_admin_is_present(pf_fd));
+		igt_sriov_install_exit_handler(pf_fd,
+					       xe_sriov_admin_exit_cleanup_restore_defaults,
+					       NULL);
 		total_vfs = igt_sriov_get_total_vfs(pf_fd);
 	}
 
@@ -429,6 +432,7 @@ int igt_main()
 		igt_abort_on_f(igt_sriov_get_enabled_vfs(pf_fd) > 0,
 			       "Failed to disable VF(s)");
 		igt_abort_on_f(ret, "Failed to restore default profile values\n");
+		igt_sriov_clear_exit_handler();
 		drm_close_driver(pf_fd);
 	}
 }
diff --git a/tests/intel/xe_sriov_scheduling.c b/tests/intel/xe_sriov_scheduling.c
index de697dbf5..47cc5d9b0 100644
--- a/tests/intel/xe_sriov_scheduling.c
+++ b/tests/intel/xe_sriov_scheduling.c
@@ -1469,6 +1469,9 @@ int igt_main_args("", long_opts, help_str, subm_opts_handler, NULL)
 		igt_require(igt_sriov_is_pf(pf_fd));
 		igt_require(igt_sriov_get_enabled_vfs(pf_fd) == 0);
 		igt_require(xe_sriov_admin_is_present(pf_fd));
+		igt_sriov_install_exit_handler(pf_fd,
+					       xe_sriov_admin_exit_cleanup_restore_defaults,
+					       NULL);
 		autoprobe = igt_sriov_is_driver_autoprobe_enabled(pf_fd);
 		xe_sriov_require_default_scheduling_attributes(pf_fd);
 		xe_perf_device(pf_fd, perf_device, sizeof(perf_device));
@@ -1635,6 +1638,7 @@ int igt_main_args("", long_opts, help_str, subm_opts_handler, NULL)
 			       "Failed to restore sriov_drivers_autoprobe value\n");
 		igt_abort_on_f(ret,
 			       "Failed to restore scheduling params\n");
+		igt_sriov_clear_exit_handler();
 		drm_close_driver(pf_fd);
 	}
 }
-- 
2.43.0