Re: [PATCH i-g-t 1/1] tests/intel/xe_fault_injection: Make inject-fault-probe-function* tests VF-aware

[Adam Miszczak <adam.miszczak@linux.intel.com>]

On 4/24/2025 11:58 AM, Marcin Bernatowicz wrote:
> Not all probe functions are invoked and cause a failure when fault
> injection is performed in a Virtual Function (VF) context. Some of
> these functions are only relevant for Physical Function (PF).
>
> Mark such functions with a `pf_only` flag and update the fault injection
> test logic to handle VF environments appropriately. When a PF-only
> function is tested on a VF device, expect the probe to succeed and
> validate accordingly.
>
> This ensures that tests do not produce false failures when run on VFs.
>
> v2: Resolve merge conflicts.
>
> Cc: Francois Dugast <francois.dugast@intel.com>
> Cc: Jakub Kolakowski <jakub1.kolakowski@intel.com>
> Cc: Lukasz Laguna <lukasz.laguna@intel.com>
> Cc: Satyanarayana K V P <satyanarayana.k.v.p@intel.com>
> Signed-off-by: Marcin Bernatowicz <marcin.bernatowicz@linux.intel.com>
> ---
>   tests/intel/xe_fault_injection.c | 22 ++++++++++++++++------
>   1 file changed, 16 insertions(+), 6 deletions(-)
>
> diff --git a/tests/intel/xe_fault_injection.c b/tests/intel/xe_fault_injection.c
> index 98a414bd3..11b21301a 100644
> --- a/tests/intel/xe_fault_injection.c
> +++ b/tests/intel/xe_fault_injection.c
> @@ -16,6 +16,7 @@
>   #include "igt.h"
>   #include "igt_device.h"
>   #include "igt_kmod.h"
> +#include "igt_sriov_device.h"
>   #include "igt_sysfs.h"
>   #include "lib/igt_syncobj.h"
>   #include "lib/intel_pat.h"
> @@ -480,18 +481,20 @@ igt_main_args("I:", NULL, help_str, opt_handler, NULL)
>   	struct fault_injection_params fault_params;
>   	static uint32_t devid;
>   	char pci_slot[NAME_MAX];
> +	bool is_vf_device;
>   	const struct section {
>   		const char *name;
>   		unsigned int flags;
> +		bool pf_only;
>   	} probe_fail_functions[] = {
>   		{ "wait_for_lmem_ready" },
>   		{ "xe_add_hw_engine_class_defaults" },
>   		{ "xe_device_create" },
>   		{ "xe_device_probe_early" },
>   		{ "xe_ggtt_init_early" },
> -		{ "xe_guc_ads_init" },
> +		{ "xe_guc_ads_init", 0, true },
>   		{ "xe_guc_ct_init" },
> -		{ "xe_guc_log_init" },
> +		{ "xe_guc_log_init", 0, true },
>   		{ "xe_guc_relay_init" },
>   		{ "xe_mmio_probe_early" },
>   		{ "xe_pcode_probe_early" },
> @@ -500,7 +503,7 @@ igt_main_args("I:", NULL, help_str, opt_handler, NULL)
>   		{ "xe_tile_init_early" },
>   		{ "xe_uc_fw_init" },
>   		{ "xe_wa_init" },
> -		{ "xe_wopcm_init" },
> +		{ "xe_wopcm_init", 0, true },
>   		{ }
>   	};
>   	const struct section vm_create_fail_functions[] = {
> @@ -550,6 +553,7 @@ igt_main_args("I:", NULL, help_str, opt_handler, NULL)
>   		igt_device_get_pci_slot_name(fd, pci_slot);
>   		setup_injection_fault(&default_fault_params);
>   		igt_install_exit_handler(cleanup_injection_fault);
> +		is_vf_device = intel_is_vf_device(fd);
>   	}
>   
>   	for (const struct section *s = vm_create_fail_functions; s->name; s++)
> @@ -581,9 +585,15 @@ igt_main_args("I:", NULL, help_str, opt_handler, NULL)
>   	}
>   
>   	for (const struct section *s = probe_fail_functions; s->name; s++)
> -		igt_subtest_f("inject-fault-probe-function-%s", s->name)
> -			igt_assert_eq(INJECT_ERRNO, inject_fault_probe(fd,
> -						pci_slot, s->name));
> +		igt_subtest_f("inject-fault-probe-function-%s", s->name) {
> +			bool should_pass = s->pf_only && is_vf_device;
> +			int err;
> +
> +			err = inject_fault_probe(fd, pci_slot, s->name);
> +
> +			igt_assert_eq(should_pass ? 0 : INJECT_ERRNO, err);
> +			igt_kmod_unbind("xe", pci_slot);
> +		}
>   
>   	for (const struct section *s = guc_fail_functions; s->name; s++)
>   		igt_subtest_f("probe-fail-guc-%s", s->name) {

LGTM,
Reviewed-by: Adam Miszczak <adam.miszczak@linux.intel.com>