[PATCH i-g-t v4] tests/intel/xe_exec_fault_mode: Don't return early

[Andrzej Hajda]

On 29.08.2024 20:00, Nirmoy Das wrote:
> Tests that are causing pagefaults should wait for exec to queue
> ban/finish otherwise pending engine resets because of on-going
> pagefaults would cause failure in subsequent tests to fail.
>
> Not all execs will generate page faults and in such case reading ban
> property is not enough but the signal should either -EIO or 0.
> so read that instead.
>
> v2: specify timeout reason and iterate over exec_queues(Andrzej)
> v3: increase timeout
> v4: check for signal status to be -EIO/0.
>
> Cc: Andrzej Hajda<andrzej.hajda at intel.com>
> Cc: Kamil Konieczny<kamil.konieczny at linux.intel.com>
> Cc: Matthew Brost<matthew.brost at intel.com>
> Cc: Tejas Upadhyay<tejas.upadhyay at intel.com>
> Link:https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/1630
> Signed-off-by: Nirmoy Das<nirmoy.das at intel.com>
> ---
>   tests/intel/xe_exec_fault_mode.c | 11 +++++++++++
>   1 file changed, 11 insertions(+)
>
> diff --git a/tests/intel/xe_exec_fault_mode.c b/tests/intel/xe_exec_fault_mode.c
> index 1f1f1e50b..fa050d0dc 100644
> --- a/tests/intel/xe_exec_fault_mode.c
> +++ b/tests/intel/xe_exec_fault_mode.c
> @@ -329,6 +329,17 @@ test_exec(int fd, struct drm_xe_engine_class_instance *eci,
>   				igt_assert_eq(data[i].data, 0xc0ffee);
>   	}
>   
> +	if ((flags & INVALID_FAULT)) {
> +		for (i = 0; i < n_execs; i++) {
> +			int ret;
> +			int64_t timeout = NSEC_PER_SEC;
> +
> +			ret = __xe_wait_ufence(fd, &data[i].exec_sync, USER_FENCE_VALUE,
> +					       exec_queues[i % n_exec_queues], &timeout);
> +			igt_assert(ret == -EIO || ret ==0);

"ret ==0" - missing space.

Btw in theory we have n_execs * 1second  (128sec???) total wait time.

> +		}
> +	}
> +

If I placed change correctly in the code it could be replaced by chain:

if ((flags & INVALID_FAULT)) {

     // your change
} else if !(flags & INVALID_VA) { ... } Up to you. Reviewed-by: Andrzej 
Hajda <andrzej.hajda at intel.com> Regards Andrzej
>   	for (i = 0; i < n_exec_queues; i++) {
>   		xe_exec_queue_destroy(fd, exec_queues[i]);
>   		if (bind_exec_queues[i])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/igt-dev/attachments/20240903/04942527/attachment.htm>