Skip to contentSkip to conversation

tests/xe_waitfence: removed invalid_engine subtest

PATCH In review Bommu Krishnaiah 3 participants 9 messages Jan 22, 2024

lore
Share & tools
lore
#0 lore raw

v4 cover tests/xe_waitfence: removed invalid_engine subtest

tests/xe_waitfence: remove invalid_engine subtest from xe_waitfence

engine and instance members are removed from drm_xe_wait_user_fence, hence invalid_engine subtest is invalid and removing it. kernel implementation:

        https://patchwork.freedesktop.org/series/127365/

failure link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/1067

tests/xe_waitfence: Removed drm_xe_sync data in exec_queue_reset_wait

drm_xe_sync flags are declared wrongly and drm_xe_sync data is not used in this test, hence removing drm_xe_sync which is unused.

failure link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/1081

tests/xe_waitfence: Removed duplicate code in waitfence

Removed duplicate code in xe_waitfence@waitfence.

Bommu Krishnaiah (3):
tests/xe_waitfence: remove invalid_engine subtest from xe_waitfence tests/xe_waitfence: Removed drm_xe_sync data in exec_queue_reset_wait tests/xe_waitfence: Removed duplicate code in waitfence

 lib/xe/xe_ioctl.c          | 35 -------------------------------
 lib/xe/xe_ioctl.h          |  2 --
 tests/intel/xe_waitfence.c | 42 ++------------------------------------
 3 files changed, 2 insertions(+), 77 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH v4 1/3 tests/xe_waitfence: remove invalid_engine subtest from xe_waitfence

engine and instance members are removed from drm_xe_wait_user_fence, hence invalid_engine subtest is invalid and removing it.

kernel implementation:

	https://patchwork.freedesktop.org/series/127365/
---
 tests/intel/xe_waitfence.c | 30 ------------------------------
 1 file changed, 30 deletions(-)
tests/intel/xe_waitfence.c +0 -30
index 7ba20764c..dfdb97fb5 100644
@@ -151,9 +151,6 @@ 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: exec_queue-reset-wait
  * Description: Don’t wait till timeout on user fence when exec_queue reset is detected and return return proper error
  */
@@ -206,30 +203,6 @@ invalid_ops(int fd)
 	do_ioctl_err(fd, DRM_IOCTL_XE_WAIT_USER_FENCE, &wait, EINVAL);
 }
 
-static void
-invalid_engine(int fd)
-{
-	uint32_t bo;
-
-	struct drm_xe_wait_user_fence wait = {
-		.addr = to_user_pointer(&wait_fence),
-		.op = DRM_XE_UFENCE_WAIT_OP_EQ,
-		.flags = 0,
-		.value = 1,
-		.mask = DRM_XE_UFENCE_WAIT_MASK_U64,
-		.timeout = -1,
-		.exec_queue_id = 0,
-	};
-
-	uint32_t vm = xe_vm_create(fd, 0, 0);
-
-	bo = xe_bo_create(fd, vm, 0x40000, vram_if_possible(fd, 0), 0);
-
-	do_bind(fd, vm, bo, 0, 0x200000, 0x40000, 1);
-
-	do_ioctl_err(fd, DRM_IOCTL_XE_WAIT_USER_FENCE, &wait, EFAULT);
-}
-
 static void
 exec_queue_reset_wait(int fd)
 {
@@ -329,9 +302,6 @@ igt_main
 	igt_subtest("invalid-ops")
 		invalid_ops(fd);
 
-	igt_subtest("invalid-engine")
-		invalid_engine(fd);
-
 	igt_subtest("exec_queue-reset-wait")
 		exec_queue_reset_wait(fd);
 
Signature · 1 line
2.25.1
Reviewed-by on v4 1/3
#2 lore raw

Re: [PATCH v4 1/3] tests/xe_waitfence: remove invalid_engine subtest from xe_waitfence

Quoted 8 lines · Bommu Krishnaiah

engine and instance members are removed from drm_xe_wait_user_fence, hence invalid_engine subtest is invalid and removing it.

kernel implementation:

	https://patchwork.freedesktop.org/series/127365/
Quoted 62 lines
---
 tests/intel/xe_waitfence.c | 30 ------------------------------
 1 file changed, 30 deletions(-)
tests/intel/xe_waitfence.c +0 -30
index 7ba20764c..dfdb97fb5 100644
@@ -151,9 +151,6 @@ 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: exec_queue-reset-wait
  * Description: Don’t wait till timeout on user fence when exec_queue reset is detected and return return proper error
  */
@@ -206,30 +203,6 @@ invalid_ops(int fd)
 	do_ioctl_err(fd, DRM_IOCTL_XE_WAIT_USER_FENCE, &wait, EINVAL);
 }
 
-static void
-invalid_engine(int fd)
-{
-	uint32_t bo;
-
-	struct drm_xe_wait_user_fence wait = {
-		.addr = to_user_pointer(&wait_fence),
-		.op = DRM_XE_UFENCE_WAIT_OP_EQ,
-		.flags = 0,
-		.value = 1,
-		.mask = DRM_XE_UFENCE_WAIT_MASK_U64,
-		.timeout = -1,
-		.exec_queue_id = 0,
-	};
-
-	uint32_t vm = xe_vm_create(fd, 0, 0);
-
-	bo = xe_bo_create(fd, vm, 0x40000, vram_if_possible(fd, 0), 0);
-
-	do_bind(fd, vm, bo, 0, 0x200000, 0x40000, 1);
-
-	do_ioctl_err(fd, DRM_IOCTL_XE_WAIT_USER_FENCE, &wait, EFAULT);
-}
-
 static void
 exec_queue_reset_wait(int fd)
 {
@@ -329,9 +302,6 @@ igt_main
 	igt_subtest("invalid-ops")
 		invalid_ops(fd);
 
-	igt_subtest("invalid-engine")
-		invalid_engine(fd);
-
 	igt_subtest("exec_queue-reset-wait")
 		exec_queue_reset_wait(fd);
 
Signature · 1 line
2.25.1
#3 lore raw

PATCH v4 2/3 tests/xe_waitfence: Removed drm_xe_sync data in exec_queue_reset_wait

In reply to Bommu Krishnaiah

drm_xe_sync flags are declared wrongly and drm_xe_sync data is not used in this test, hence removing drm_xe_sync which is unused.

---
 tests/intel/xe_waitfence.c | 8 --------
 1 file changed, 8 deletions(-)
tests/intel/xe_waitfence.c +0 -8
index dfdb97fb5..e6354b3ff 100644
@@ -221,16 +221,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);
Signature · 1 line
2.25.1
Reviewed-by on v4 2/3
#4 lore raw

Re: [PATCH v4 2/3] tests/xe_waitfence: Removed drm_xe_sync data in exec_queue_reset_wait

Quoted 5 lines · Bommu Krishnaiah

drm_xe_sync flags are declared wrongly and drm_xe_sync data is not used in this test, hence removing drm_xe_sync which is unused.

Quoted 28 lines
---
 tests/intel/xe_waitfence.c | 8 --------
 1 file changed, 8 deletions(-)
tests/intel/xe_waitfence.c +0 -8
index dfdb97fb5..e6354b3ff 100644
@@ -221,16 +221,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);
Signature · 1 line
2.25.1
#5 lore raw

PATCH v4 3/3 tests/xe_waitfence: Removed duplicate code in waitfence

In reply to Bommu Krishnaiah

Removed duplicate code in xe_waitfence@waitfence

---
 lib/xe/xe_ioctl.c          | 35 -----------------------------------
 lib/xe/xe_ioctl.h          |  2 --
 tests/intel/xe_waitfence.c |  4 ++--
 3 files changed, 2 insertions(+), 39 deletions(-)
lib/xe/xe_ioctl.c +0 -35
index 39605a019..49c5d359e 100644
@@ -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
index 8a92073b0..03932561d 100644
@@ -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 +2 -2
index e6354b3ff..6ed9d56f8 100644
@@ -36,7 +36,7 @@ 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,
+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 +117,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
Signature · 1 line
2.25.1
Reviewed-by on v4 3/3
#6 lore raw

Re: [PATCH v4 3/3] tests/xe_waitfence: Removed duplicate code in waitfence

Quoted 74 lines · Bommu Krishnaiah

Removed duplicate code in xe_waitfence@waitfence

---
 lib/xe/xe_ioctl.c          | 35 -----------------------------------
 lib/xe/xe_ioctl.h          |  2 --
 tests/intel/xe_waitfence.c |  4 ++--
 3 files changed, 2 insertions(+), 39 deletions(-)
lib/xe/xe_ioctl.c +0 -35
index 39605a019..49c5d359e 100644
@@ -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
index 8a92073b0..03932561d 100644
@@ -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 +0 -0
index e6354b3ff..6ed9d56f8 100644

tests/intel/xe_waitfence.c static void do_bind(int fd, uint32_t vm, uint32_t bo, uint64_t offset, · line 41

Quoted 7 lines
tests/intel/xe_waitfence.c +1 -1
@@ -36,7 +36,7 @@ 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,
+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)

No need for the 'xe_' prefix addition in a local static function.

with that changed,

Quoted 13 lines
tests/intel/xe_waitfence.c +1 -1
 {
@@ -117,7 +117,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
Signature · 1 line
2.25.1
#7 lore raw

✓ CI.xeBAT: success for tests/xe_waitfence: removed invalid_engine subtest (rev4)

In reply to Bommu Krishnaiah
== Series Details ==

== Series Details ==

Series: tests/xe_waitfence: removed invalid_engine subtest (rev4)
URL : https://patchwork.freedesktop.org/series/127926/
State : success

== Summary ==

CI Bug Log - changes from XEIGT_7683_BAT -> XEIGTPW_10567_BAT
====================================================

Summary
-------

**SUCCESS**

No regressions found.

Participating hosts (4 -> 4)
------------------------------

No changes in participating hosts

Changes
-------

No changes found

Build changes
-------------

* IGT: IGT_7683 -> IGTPW_10567
* Linux: xe-644-238e8655c184b7cf16731690b59da560641a07ad -> xe-656-b239ffd479309ebbf0bd530ef632c8ef3ee78d7a

IGTPW_10567: 10567
IGT_7683: 7683
xe-644-238e8655c184b7cf16731690b59da560641a07ad: 238e8655c184b7cf16731690b59da560641a07ad xe-656-b239ffd479309ebbf0bd530ef632c8ef3ee78d7a: b239ffd479309ebbf0bd530ef632c8ef3ee78d7a

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10567/index.html

#8 lore raw

✗ Fi.CI.BAT: failure for tests/xe_waitfence: removed invalid_engine subtest (rev4)

In reply to Bommu Krishnaiah
== Series Details ==

== Series Details ==

Series: tests/xe_waitfence: removed invalid_engine subtest (rev4)
URL : https://patchwork.freedesktop.org/series/127926/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_14149 -> IGTPW_10567
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with IGTPW_10567 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes
introduced in IGTPW_10567, please notify your bug team ([email protected]) to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10567/index.html

Participating hosts (38 -> 35)
------------------------------

Additional (1): fi-pnv-d510
Missing (4): bat-mtlp-8 bat-rpls-2 bat-atsm-1 fi-snb-2520m

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in IGTPW_10567:

### IGT changes ###

#### Possible regressions ####

* igt@i915_selftest@live@reset:
- bat-adlm-1: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14149/bat-adlm-1/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10567/bat-adlm-1/igt@i915_selftest@[email protected]

Known issues
------------

Here are the changes found in IGTPW_10567 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@core_hotunplug@unbind-rebind:
- bat-adlp-6: [PASS][3] -> [DMESG-WARN][4] ([i915#1982])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14149/bat-adlp-6/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10567/bat-adlp-6/igt@[email protected]

* igt@gem_exec_suspend@basic-s0@lmem0:
- bat-dg2-8: [PASS][5] -> [INCOMPLETE][6] ([i915#9275])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14149/bat-dg2-8/igt@gem_exec_suspend@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10567/bat-dg2-8/igt@gem_exec_suspend@[email protected]

* igt@gem_exec_suspend@basic-s0@smem:
- bat-dg2-9: [PASS][7] -> [INCOMPLETE][8] ([i915#9275])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14149/bat-dg2-9/igt@gem_exec_suspend@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10567/bat-dg2-9/igt@gem_exec_suspend@[email protected]

* igt@gem_lmem_swapping@basic:
- fi-pnv-d510: NOTRUN -> [SKIP][9] ([fdo#109271]) +31 other tests skip
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10567/fi-pnv-d510/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#5591]: https://gitlab.freedesktop.org/drm/intel/issues/5591
[i915#9275]: https://gitlab.freedesktop.org/drm/intel/issues/9275

Build changes
-------------

* CI: CI-20190529 -> None
* IGT: IGT_7683 -> IGTPW_10567

CI-20190529: 20190529
CI_DRM_14149: b239ffd479309ebbf0bd530ef632c8ef3ee78d7a @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_10567: 10567
IGT_7683: 7683

Testlist changes
----------------

-igt@xe_waitfence@invalid-engine

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10567/index.html