Re: [PATCH i-g-t 2/3] tests/intel/xe_exec_reset: Add checks for hanging queue wait_ufence return

[Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>]

On Thu, Apr 09, 2026 at 08:37:00PM +0000, Stuart Summers wrote:
>There is a 3 second wait user fence timeout for the compute mode
>variants of this test. Instead of just skipping the wait altogether,
>let's make sure this does in fact return -ETIME as expected there.
>
>Also add the i == 0 cases for legacy and compute path for the actual
>data checks to stay consistent and to be a little more explicit
>about what we're checking there.
>
>This also let's us add a little more detail to the cases in some
>planned changes around hanging multi queue secondary queues.
>
>Signed-off-by: Stuart Summers <stuart.summers@intel.com>
>---
> lib/xe/xe_legacy.c          |  8 ++++++--
> tests/intel/xe_exec_reset.c | 15 +++++++++++----
> 2 files changed, 17 insertions(+), 6 deletions(-)
>
>diff --git a/lib/xe/xe_legacy.c b/lib/xe/xe_legacy.c
>index 6aeddc578..3371a91ac 100644
>--- a/lib/xe/xe_legacy.c
>+++ b/lib/xe/xe_legacy.c
>@@ -230,9 +230,13 @@ xe_legacy_test_mode(int fd, struct drm_xe_engine_class_instance *eci,
> 	igt_assert(syncobj_wait(fd, &sync[0].handle, 1, INT64_MAX, 0, NULL));
>
> 	if (!use_capture_mode && !(flags & (GT_RESET | CANCEL | COMPRESSION))) {
>-		for (i = flags & LONG_SPIN ? n_exec_queues : 1;
>-		     i < n_execs + extra_execs; i++)
>+		for (i = flags & LONG_SPIN ? n_exec_queues : 0;
>+		     i < n_execs + extra_execs; i++) {
>+			if (!i)
>+				continue;
>+
> 			igt_assert_eq(data[i].data, 0xc0ffee);
>+		}
> 	}
>
> 	syncobj_destroy(fd, sync[0].handle);
>diff --git a/tests/intel/xe_exec_reset.c b/tests/intel/xe_exec_reset.c
>index 95191139d..6b71d9144 100644
>--- a/tests/intel/xe_exec_reset.c
>+++ b/tests/intel/xe_exec_reset.c
>@@ -461,17 +461,20 @@ test_compute_mode(int fd, struct drm_xe_engine_class_instance *eci,
> 		return;
> 	}
>
>-	for (i = 1; i < n_execs; i++) {
>+	for (i = 0; i < n_execs; i++) {
> 		int64_t timeout = 3 * NSEC_PER_SEC;
> 		int err;
>
> 		err = __xe_wait_ufence(fd, &data[i].exec_sync, USER_FENCE_VALUE,
> 				       exec_queues[i % n_exec_queues], &timeout);
>-		if (flags & GT_RESET || flags & CAT_ERROR)
>+		if (!i) {
>+			igt_assert(err == -ETIME || err == -EIO);
>+		} else if (flags & GT_RESET || flags & CAT_ERROR) {
> 			/* exec races with reset: may return -EIO or complete */
> 			igt_assert(err == -EIO || !err);
>-		else
>+		} else {
> 			igt_assert_eq(err, 0);
>+		}
> 	}
>
> 	sync[0].addr = to_user_pointer(&data[0].vm_sync);
>@@ -479,8 +482,12 @@ test_compute_mode(int fd, struct drm_xe_engine_class_instance *eci,
> 	xe_wait_ufence(fd, &data[0].vm_sync, USER_FENCE_VALUE, 0, 3 * NSEC_PER_SEC);
>
> 	if (!(flags & (GT_RESET | CANCEL))) {
>-		for (i = 1; i < n_execs; i++)
>+		for (i = 0; i < n_execs; i++) {
>+			if (!i)
>+				continue;
>+
> 			igt_assert_eq(data[i].data, 0xc0ffee);
>+		}
> 	}
>
> 	for (i = 0; i < n_exec_queues; i++)

LGTM
Reviewed-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>

>-- 
>2.43.0
>