tests/xe_waitfence: removed invalid_engine subtest
PATCH v2 1/1 tests/xe_waitfence: removed invalid_engine subtest
Rename invalid_engine to invalid-exec_queue subtest and changed return value as per kernel implantation
Removed drm_xe_sync data in exec_queue_reset_wait since it was unused and removed unwanted code
Kernel commit:
drm/xe/uapi: add exec_queue_id member to drm_xe_wait_user_fence structure
--- lib/xe/xe_ioctl.c | 35 --------------------------------- lib/xe/xe_ioctl.h | 2 -- tests/intel/xe_waitfence.c | 40 ++++++++++++++++++++++---------------- 3 files changed, 23 insertions(+), 54 deletions(-)
lib/xe/xe_ioctl.c +0 -35
@@ -523,41 +523,6 @@ int64_t xe_wait_ufence(int fd, uint64_t *addr, uint64_t value,return timeout; } -/** -* xe_wait_ufence_abstime: -* @fd: xe device fd -* @addr: address of value to compare -* @value: expected value (equal) in @address -* @exec_queue: exec_queue id -* @timeout: absolute time when wait expire -* @flag: wait flag -* -* Function compares @value with memory pointed by @addr until they are equal. -* Asserts that ioctl returned without error. -* -* Returns elapsed time in nanoseconds if user fence was signalled. -*/ -int64_t xe_wait_ufence_abstime (int fd,uint64_t *addr,uint64_t value, -uint32_t exec_queue,int64_t timeout, -uint16_t flag) -{ -struct drm_xe_wait_user_fence wait = { - .addr =to_user_pointer (addr), - .op =DRM_XE_UFENCE_WAIT_OP_EQ , - .flags = flag, - .value = value, - .mask =DRM_XE_UFENCE_WAIT_MASK_U64 , - .timeout = timeout, - .exec_queue_id = exec_queue, - }; -struct timespec ts; - -igt_assert_eq (igt_ioctl (fd,DRM_IOCTL_XE_WAIT_USER_FENCE , &wait),0 ); -igt_assert_eq (clock_gettime (CLOCK_MONOTONIC , &ts),0 ); - -return ts.tv_sec *1e9 + ts.tv_nsec; -} -void xe_force_gt_reset (int fd,int gt) {char reset_string[128 ];
lib/xe/xe_ioctl.h +0 -2
@@ -90,8 +90,6 @@ int __xe_wait_ufence(int fd, uint64_t *addr, uint64_t value, uint32_t exec_queue, int64_t *timeout);int64_t xe_wait_ufence (int fd,uint64_t *addr,uint64_t value,uint32_t exec_queue,int64_t timeout); -int64_t xe_wait_ufence_abstime (int fd,uint64_t *addr,uint64_t value,uint32_t - exec_queue,int64_t timeout,uint16_t flag);void xe_force_gt_reset (int fd,int gt);#endif /* XE_IOCTL_H */
tests/intel/xe_waitfence.c +23 -17
@@ -36,7 +36,21 @@ static void do_bind(int fd, uint32_t vm, uint32_t bo, uint64_t offset,xe_vm_bind_async (fd, vm,0 , bo, offset, addr, size, sync,1 ); } -static int64_t wait_with_eci_abstime (int fd,uint64_t *addr,uint64_t value, +/** +* xe_wait_ufence_abstime: +* @fd: xe device fd +* @addr: address of value to compare +* @value: expected value (equal) in @address +* @exec_queue: exec_queue id +* @timeout: absolute time when wait expire +* @flag: wait flag +* +* Function compares @value with memory pointed by @addr until they are equal. +* Asserts that ioctl returned without error. +* +* Returns elapsed time in nanoseconds if user fence was signalled. +*/ +static int64_t xe_wait_ufence_abstime (int fd,uint64_t *addr,uint64_t value,uint32_t exec_queue,int64_t timeout,uint16_t flag) {
@@ -117,7 +131,7 @@ waitfence(int fd, enum waittype wt)clock_gettime (CLOCK_MONOTONIC , &ts); current = ts.tv_sec *1e9 + ts.tv_nsec; timeout = current +MS_TO_NS (10 ); - signalled =wait_with_eci_abstime (fd, &wait_fence,7 , + signalled =xe_wait_ufence_abstime (fd, &wait_fence,7 , exec_queue, timeout,DRM_XE_UFENCE_WAIT_FLAG_ABSTIME ); igt_debug("wait type: ENGINE ABSTIME - timeout: %" PRId64
@@ -151,8 +165,8 @@ waitfence(int fd, enum waittype wt)* SUBTEST: invalid-ops * Description: Check query with invalid ops returns expected error code * -* SUBTEST: invalid-engine -* Description: Check query with invalid engine info returns expected error code +* SUBTEST: invalid-exec_queue +* Description: Check query with invalid exec_queue info returns expected error code * * SUBTEST: exec_queue-reset-wait * Description: Don’t wait till timeout on user fence when exec_queue reset is detected and return return proper error
@@ -207,7 +221,7 @@ invalid_ops(int fd) }static void -invalid_engine (int fd) +invalid_exec_queue (int fd) {uint32_t bo;
@@ -218,7 +232,7 @@ invalid_engine(int fd) .value = 1, .mask = DRM_XE_UFENCE_WAIT_MASK_U64, .timeout = -1, - .exec_queue_id = 0, + .exec_queue_id = -1, };uint32_t vm =xe_vm_create (fd,0 ,0 );
@@ -227,7 +241,7 @@ invalid_engine(int fd)do_bind (fd, vm, bo,0 ,0x200000 ,0x40000 ,1 ); -do_ioctl_err (fd,DRM_IOCTL_XE_WAIT_USER_FENCE , &wait,EFAULT ); +do_ioctl_err (fd,DRM_IOCTL_XE_WAIT_USER_FENCE , &wait,ENOENT ); } static void
@@ -248,16 +262,8 @@ exec_queue_reset_wait(int fd)uint32_t data; } *data; -#define USER_FENCE_VALUE 0xdeadbeefdeadbeefull -struct drm_xe_sync sync[1 ] = { - { .flags =DRM_XE_SYNC_TYPE_USER_FENCE |DRM_XE_SYNC_FLAG_SIGNAL , - .timeline_value =USER_FENCE_VALUE }, - }; -struct drm_xe_exec exec = { .num_batch_buffer =1 , - .num_syncs =1 , - .syncs =to_user_pointer (sync), };uint32_t vm =xe_vm_create (fd,0 ,0 );
@@ -329,8 +335,8 @@ igt_main igt_subtest("invalid-ops")invalid_ops (fd); - igt_subtest("invalid-engine") -invalid_engine (fd); + igt_subtest("invalid-exec_queue") +invalid_exec_queue (fd); igt_subtest("exec_queue-reset-wait")exec_queue_reset_wait (fd);
Signature · 1 line
2.25.1
Quoted 1 line · Bommu Krishnaiah
Rename
invalid_engineto invalid-exec_queue subtest and changed return value
this doesn't match the patch subject now.
Quoted 1 line
as per kernel implantation
implementation?!
Quoted 3 lines
Removed
drm_xe_syncdata inexec_queue_reset_waitsince it was unused and removed unwanted code
But I believe this patch should be split in many smaller patches so we can really understand easily what's going on.
Quoted 176 lines
Kernel commit:
drm/xe/uapi: addexec_queue_idmember todrm_xe_wait_user_fencestructureSigned-off-by Bommu Krishnaiah <[email protected]>Cc Rodrigo Vivi <[email protected]>--- lib/xe/xe_ioctl.c | 35 --------------------------------- lib/xe/xe_ioctl.h | 2 -- tests/intel/xe_waitfence.c | 40 ++++++++++++++++++++++---------------- 3 files changed, 23 insertions(+), 54 deletions(-)lib/xe/xe_ioctl.c +0
-35@@ -523,41 +523,6 @@ int64_t xe_wait_ufence(int fd, uint64_t *addr, uint64_t value,return timeout; } -/** -* xe_wait_ufence_abstime: -* @fd: xe device fd -* @addr: address of value to compare -* @value: expected value (equal) in @address -* @exec_queue: exec_queue id -* @timeout: absolute time when wait expire -* @flag: wait flag -* -* Function compares @value with memory pointed by @addr until they are equal. -* Asserts that ioctl returned without error. -* -* Returns elapsed time in nanoseconds if user fence was signalled. -*/ -int64_t xe_wait_ufence_abstime (int fd,uint64_t *addr,uint64_t value, -uint32_t exec_queue,int64_t timeout, -uint16_t flag) -{ -struct drm_xe_wait_user_fence wait = { - .addr =to_user_pointer (addr), - .op =DRM_XE_UFENCE_WAIT_OP_EQ , - .flags = flag, - .value = value, - .mask =DRM_XE_UFENCE_WAIT_MASK_U64 , - .timeout = timeout, - .exec_queue_id = exec_queue, - }; -struct timespec ts; - -igt_assert_eq (igt_ioctl (fd,DRM_IOCTL_XE_WAIT_USER_FENCE , &wait),0 ); -igt_assert_eq (clock_gettime (CLOCK_MONOTONIC , &ts),0 ); - -return ts.tv_sec *1e9 + ts.tv_nsec; -} -void xe_force_gt_reset (int fd,int gt) {char reset_string[128 ];lib/xe/xe_ioctl.h +0
-2@@ -90,8 +90,6 @@ int __xe_wait_ufence(int fd, uint64_t *addr, uint64_t value, uint32_t exec_queue, int64_t *timeout);int64_t xe_wait_ufence (int fd,uint64_t *addr,uint64_t value,uint32_t exec_queue,int64_t timeout); -int64_t xe_wait_ufence_abstime (int fd,uint64_t *addr,uint64_t value,uint32_t - exec_queue,int64_t timeout,uint16_t flag);void xe_force_gt_reset (int fd,int gt);#endif /* XE_IOCTL_H */ tests/intel/xe_waitfence.c +23
-17@@ -36,7 +36,21 @@ static void do_bind(int fd, uint32_t vm, uint32_t bo, uint64_t offset,xe_vm_bind_async (fd, vm,0 , bo, offset, addr, size, sync,1 ); } -static int64_t wait_with_eci_abstime (int fd,uint64_t *addr,uint64_t value, +/** +* xe_wait_ufence_abstime: +* @fd: xe device fd +* @addr: address of value to compare +* @value: expected value (equal) in @address +* @exec_queue: exec_queue id +* @timeout: absolute time when wait expire +* @flag: wait flag +* +* Function compares @value with memory pointed by @addr until they are equal. +* Asserts that ioctl returned without error. +* +* Returns elapsed time in nanoseconds if user fence was signalled. +*/ +static int64_t xe_wait_ufence_abstime (int fd,uint64_t *addr,uint64_t value,uint32_t exec_queue,int64_t timeout,uint16_t flag) {@@ -117,7 +131,7 @@ waitfence(int fd, enum waittype wt)clock_gettime (CLOCK_MONOTONIC , &ts); current = ts.tv_sec *1e9 + ts.tv_nsec; timeout = current +MS_TO_NS (10 ); - signalled =wait_with_eci_abstime (fd, &wait_fence,7 , + signalled =xe_wait_ufence_abstime (fd, &wait_fence,7 , exec_queue, timeout,DRM_XE_UFENCE_WAIT_FLAG_ABSTIME ); igt_debug("wait type: ENGINE ABSTIME - timeout: %" PRId64@@ -151,8 +165,8 @@ waitfence(int fd, enum waittype wt)* SUBTEST: invalid-ops * Description: Check query with invalid ops returns expected error code * -* SUBTEST: invalid-engine -* Description: Check query with invalid engine info returns expected error code +* SUBTEST: invalid-exec_queue +* Description: Check query with invalid exec_queue info returns expected error code * * SUBTEST: exec_queue-reset-wait * Description: Don’t wait till timeout on user fence when exec_queue reset is detected and return return proper error @@ -207,7 +221,7 @@ invalid_ops(int fd) }static void -invalid_engine (int fd) +invalid_exec_queue (int fd) {uint32_t bo;@@ -218,7 +232,7 @@ invalid_engine(int fd) .value = 1, .mask = DRM_XE_UFENCE_WAIT_MASK_U64, .timeout = -1, - .exec_queue_id = 0, + .exec_queue_id = -1, };uint32_t vm =xe_vm_create (fd,0 ,0 );@@ -227,7 +241,7 @@ invalid_engine(int fd)do_bind (fd, vm, bo,0 ,0x200000 ,0x40000 ,1 ); -do_ioctl_err (fd,DRM_IOCTL_XE_WAIT_USER_FENCE , &wait,EFAULT ); +do_ioctl_err (fd,DRM_IOCTL_XE_WAIT_USER_FENCE , &wait,ENOENT ); } static void@@ -248,16 +262,8 @@ exec_queue_reset_wait(int fd)uint32_t data; } *data; -#define USER_FENCE_VALUE 0xdeadbeefdeadbeefull -struct drm_xe_sync sync[1 ] = { - { .flags =DRM_XE_SYNC_TYPE_USER_FENCE |DRM_XE_SYNC_FLAG_SIGNAL , - .timeline_value =USER_FENCE_VALUE }, - }; -struct drm_xe_exec exec = { .num_batch_buffer =1 , - .num_syncs =1 , - .syncs =to_user_pointer (sync), };uint32_t vm =xe_vm_create (fd,0 ,0 );@@ -329,8 +335,8 @@ igt_main igt_subtest("invalid-ops")invalid_ops (fd); - igt_subtest("invalid-engine") -invalid_engine (fd); + igt_subtest("invalid-exec_queue") +invalid_exec_queue (fd); igt_subtest("exec_queue-reset-wait")exec_queue_reset_wait (fd);Signature · 1 line
2.25.1