Re: [PATCH v3 1/5] tests/intel/xe_exec_reset: Add job cancel tests

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

On 9/23/2025 11:13 PM, Matthew Brost wrote:
> This test has pulled out when the ability to set the job timeout via
> IOCTL was removed from the uAPI while upstreaming Xe. Add this coverage
> back in but only run on a single hardware engine given by default jobs
> take 5 seconds to timeout.
> 
> Signed-off-by: Matthew Brost <matthew.brost@intel.com>
> ---
>   lib/xe/xe_legacy.c          |  3 ++-
>   tests/intel/xe_exec_reset.c | 23 ++++++++++++++++++++++-
>   2 files changed, 24 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/xe/xe_legacy.c b/lib/xe/xe_legacy.c
> index 6570cf1e6e..669ecff7aa 100644
> --- a/lib/xe/xe_legacy.c
> +++ b/lib/xe/xe_legacy.c
> @@ -12,6 +12,7 @@
>   
>   /* Batch buffer element count, in number of dwords(u32) */
>   #define BATCH_DW_COUNT			16
> +#define PREEMPT				(0x1 << 6)
>   #define CAT_ERROR			(0x1 << 5)
>   #define CLOSE_EXEC_QUEUES		(0x1 << 2)
>   #define CLOSE_FD			(0x1 << 1)
> @@ -56,7 +57,7 @@ xe_legacy_test_mode(int fd, struct drm_xe_engine_class_instance *eci,
>   		u64 pad;
>   		u32 data;
>   	} *data;
> -	struct xe_spin_opts spin_opts = { .preempt = false };
> +	struct xe_spin_opts spin_opts = { .preempt = flags & PREEMPT };
>   	int i, b;
>   
>   	igt_assert_lte(n_exec_queues, MAX_N_EXECQUEUES);
> diff --git a/tests/intel/xe_exec_reset.c b/tests/intel/xe_exec_reset.c
> index 7ae53c6790..72b85d3e7b 100644
> --- a/tests/intel/xe_exec_reset.c
> +++ b/tests/intel/xe_exec_reset.c
> @@ -116,6 +116,7 @@ static void test_spin(int fd, struct drm_xe_engine_class_instance *eci,
>   #define VIRTUAL				(0x1 << 3)
>   #define PARALLEL			(0x1 << 4)
>   #define CAT_ERROR			(0x1 << 5)
> +#define PREEMPT				(0x1 << 6)
>   
>   /**
>    * SUBTEST: %s-cat-error
> @@ -295,6 +296,12 @@ test_balancer(int fd, int gt, int class, int n_exec_queues, int n_execs,
>    * SUBTEST: cat-error
>    * Description: Test cat error
>    *
> + * SUBTEST: cancel
> + * Description: Test job cancel
> + *
> + * SUBTEST: cancel-preempt
> + * Description: Test job cancel with a preemptable job
> + *
>    * SUBTEST: gt-reset
>    * Description: Test GT reset
>    *
> @@ -350,7 +357,7 @@ test_compute_mode(int fd, struct drm_xe_engine_class_instance *eci,
>   		uint64_t exec_sync;
>   		uint32_t data;
>   	} *data;
> -	struct xe_spin_opts spin_opts = { .preempt = false };
> +	struct xe_spin_opts spin_opts = { .preempt = flags & PREEMPT };
>   	int i, b;
>   
>   	igt_assert_lte(n_exec_queues, MAX_N_EXECQUEUES);
> @@ -659,6 +666,20 @@ igt_main
>   			xe_legacy_test_mode(fd, hwe, 2, 2, CAT_ERROR,
>   					    LEGACY_MODE_ADDR, false);
>   
> +	igt_subtest("cancel")
> +		xe_for_each_engine(fd, hwe) {
> +			xe_legacy_test_mode(fd, hwe, 1, 1, 0,
> +					    LEGACY_MODE_ADDR, false);
> +			break;
> +		}
> +
> +	igt_subtest("cancel-preempt")
> +		xe_for_each_engine(fd, hwe) {
> +			xe_legacy_test_mode(fd, hwe, 1, 1, PREEMPT,
> +					    LEGACY_MODE_ADDR, false);
> +			break;
> +		}
> +
>   	igt_subtest("gt-reset")
>   		xe_for_each_engine(fd, hwe)
>   			xe_legacy_test_mode(fd, hwe, 2, 2, GT_RESET,
LGTM,
Reviewed-by: Marcin Bernatowicz <marcin.bernatowicz@linux.intel.com>