Skip to contentSkip to conversation

tests/xe/xe_prime_self_import: Adjust buffer object sizes to min alignment

PATCH In review Thomas Hellström 3 participants 4 messages Oct 18, 2023 – Oct 24, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/xe/xe_prime_self_import: Adjust buffer object sizes to min alignment

Creating a buffer object in VRAM may require the size to be properly aligned. Ensure the buffer object sizes are using the minimum required alignment.

Cc Zbigniew Kempczyński <[email protected]>
Cc Maarten Lankhorst <[email protected]>
---
 tests/intel/xe_prime_self_import.c | 40 +++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)
tests/intel/xe_prime_self_import.c +20 -20
index 994fd99f5..536230f9f 100644
@@ -56,11 +56,10 @@
 IGT_TEST_DESCRIPTION("Check whether prime import/export works on the same"
 		     " device... but with different fds.");
 
-#define BO_SIZE (16*1024)
-
 static char counter;
 static int g_time_out = 5;
 static pthread_barrier_t g_barrier;
+static size_t bo_size;
 
 static void
 check_bo(int fd1, uint32_t handle1, int fd2, uint32_t handle2)
@@ -69,25 +68,25 @@ check_bo(int fd1, uint32_t handle1, int fd2, uint32_t handle2)
 	int i;
 
 
-	ptr1 = xe_bo_map(fd1, handle1, BO_SIZE);
-	ptr2 = xe_bo_map(fd2, handle2, BO_SIZE);
+	ptr1 = xe_bo_map(fd1, handle1, bo_size);
+	ptr2 = xe_bo_map(fd2, handle2, bo_size);
 
 	/* TODO: Export fence for both and wait on them */
 	usleep(1000);
 
 	/* check whether it's still our old object first. */
-	for (i = 0; i < BO_SIZE; i++) {
+	for (i = 0; i < bo_size; i++) {
 		igt_assert(ptr1[i] == counter);
 		igt_assert(ptr2[i] == counter);
 	}
 
 	counter++;
 
-	memset(ptr1, counter, BO_SIZE);
-	igt_assert(memcmp(ptr1, ptr2, BO_SIZE) == 0);
+	memset(ptr1, counter, bo_size);
+	igt_assert(memcmp(ptr1, ptr2, bo_size) == 0);
 
-	munmap(ptr1, BO_SIZE);
-	munmap(ptr2, BO_SIZE);
+	munmap(ptr1, bo_size);
+	munmap(ptr2, bo_size);
 }
 
 /**
@@ -106,7 +105,7 @@ static void test_with_fd_dup(void)
 	fd1 = drm_open_driver(DRIVER_XE);
 	fd2 = drm_open_driver(DRIVER_XE);
 
-	handle = xe_bo_create_flags(fd1, 0, BO_SIZE, visible_vram_if_possible(fd1, 0));
+	handle = xe_bo_create_flags(fd1, 0, bo_size, visible_vram_if_possible(fd1, 0));
 
 	dma_buf_fd1 = prime_handle_to_fd(fd1, handle);
 	gem_close(fd1, handle);
@@ -139,8 +138,8 @@ static void test_with_two_bos(void)
 	fd1 = drm_open_driver(DRIVER_XE);
 	fd2 = drm_open_driver(DRIVER_XE);
 
-	handle1 = xe_bo_create_flags(fd1, 0, BO_SIZE, visible_vram_if_possible(fd1, 0));
-	handle2 = xe_bo_create_flags(fd1, 0, BO_SIZE, visible_vram_if_possible(fd1, 0));
+	handle1 = xe_bo_create_flags(fd1, 0, bo_size, visible_vram_if_possible(fd1, 0));
+	handle2 = xe_bo_create_flags(fd1, 0, bo_size, visible_vram_if_possible(fd1, 0));
 
 	dma_buf_fd = prime_handle_to_fd(fd1, handle1);
 	handle_import = prime_fd_to_handle(fd2, dma_buf_fd);
@@ -175,7 +174,7 @@ static void test_with_one_bo_two_files(void)
 	fd1 = drm_open_driver(DRIVER_XE);
 	fd2 = drm_open_driver(DRIVER_XE);
 
-	handle_orig = xe_bo_create_flags(fd1, 0, BO_SIZE,
+	handle_orig = xe_bo_create_flags(fd1, 0, bo_size,
 					 visible_vram_if_possible(fd1, 0));
 	dma_buf_fd1 = prime_handle_to_fd(fd1, handle_orig);
 
@@ -208,7 +207,7 @@ static void test_with_one_bo(void)
 	fd1 = drm_open_driver(DRIVER_XE);
 	fd2 = drm_open_driver(DRIVER_XE);
 
-	handle = xe_bo_create_flags(fd1, 0, BO_SIZE, visible_vram_if_possible(fd1, 0));
+	handle = xe_bo_create_flags(fd1, 0, bo_size, visible_vram_if_possible(fd1, 0));
 
 	dma_buf_fd = prime_handle_to_fd(fd1, handle);
 	handle_import1 = prime_fd_to_handle(fd2, dma_buf_fd);
@@ -294,7 +293,7 @@ static void *thread_fn_reimport_vs_close(void *p)
 
 	fds[0] = drm_open_driver(DRIVER_XE);
 
-	handle = xe_bo_create_flags(fds[0], 0, BO_SIZE,
+	handle = xe_bo_create_flags(fds[0], 0, bo_size,
 				    visible_vram_if_possible(fds[0], 0));
 
 	fds[1] = prime_handle_to_fd(fds[0], handle);
@@ -337,7 +336,7 @@ static void *thread_fn_export_vs_close(void *p)
 
 	igt_until_timeout(g_time_out) {
 		/* We want to race gem close against prime export on handle one.*/
-		handle = xe_bo_create_flags(fd, 0, 4096,
+		handle = xe_bo_create_flags(fd, 0, bo_size,
 					    visible_vram_if_possible(fd, 0));
 		if (handle != 1)
 			gem_close(fd, handle);
@@ -463,7 +462,7 @@ static void test_llseek_bad(void)
 
 	fd = drm_open_driver(DRIVER_XE);
 
-	handle = xe_bo_create_flags(fd, 0, BO_SIZE,
+	handle = xe_bo_create_flags(fd, 0, bo_size,
 				    visible_vram_if_possible(fd, 0));
 	dma_buf_fd = prime_handle_to_fd(fd, handle);
 
@@ -473,9 +472,9 @@ static void test_llseek_bad(void)
 
 	igt_assert(lseek(dma_buf_fd, -1, SEEK_END) == -1 && errno == EINVAL);
 	igt_assert(lseek(dma_buf_fd, 1, SEEK_SET) == -1 && errno == EINVAL);
-	igt_assert(lseek(dma_buf_fd, BO_SIZE, SEEK_SET) == -1 && errno == EINVAL);
-	igt_assert(lseek(dma_buf_fd, BO_SIZE + 1, SEEK_SET) == -1 && errno == EINVAL);
-	igt_assert(lseek(dma_buf_fd, BO_SIZE - 1, SEEK_SET) == -1 && errno == EINVAL);
+	igt_assert(lseek(dma_buf_fd, bo_size, SEEK_SET) == -1 && errno == EINVAL);
+	igt_assert(lseek(dma_buf_fd, bo_size + 1, SEEK_SET) == -1 && errno == EINVAL);
+	igt_assert(lseek(dma_buf_fd, bo_size - 1, SEEK_SET) == -1 && errno == EINVAL);
 
 	close(dma_buf_fd);
 
@@ -502,6 +501,7 @@ igt_main
 
 	igt_fixture {
 		fd = drm_open_driver(DRIVER_XE);
+		bo_size = xe_get_default_alignment(fd);
 	}
 
 	for (i = 0; i < ARRAY_SIZE(tests); i++) {
Signature · 1 line
2.41.0
#1 lore raw

[igt-dev] ✗ Fi.CI.BAT: failure for tests/xe/xe_prime_self_import: Adjust buffer object sizes to min alignment

== Series Details ==

== Series Details ==

Series: tests/xe/xe_prime_self_import: Adjust buffer object sizes to min alignment
URL : https://patchwork.freedesktop.org/series/125284/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_13769 -> IGTPW_10023
====================================================

Summary
-------

**FAILURE**

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

If you think the reported changes have nothing to do with the changes
introduced in IGTPW_10023, 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_10023/index.html

Participating hosts (31 -> 34)
------------------------------

Additional (3): fi-cfl-8109u bat-atsm-1 bat-jsl-1

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

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

### IGT changes ###

#### Possible regressions ####

* igt@i915_module_load@load:
- bat-adln-1: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13769/bat-adln-1/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-adln-1/igt@[email protected]

* igt@vgem_basic@unload:
- fi-apl-guc: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13769/fi-apl-guc/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/fi-apl-guc/igt@[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@debugfs_test@basic-hwmon:
- bat-jsl-3: NOTRUN -> [SKIP][5] ([i915#9318])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-jsl-3/igt@[email protected]
- bat-jsl-1: NOTRUN -> [SKIP][6] ([i915#9318])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-jsl-1/igt@[email protected]

* igt@gem_huc_copy@huc-copy:
- fi-cfl-8109u: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#2190])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/fi-cfl-8109u/igt@[email protected]
- bat-jsl-1: NOTRUN -> [SKIP][8] ([i915#2190])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-jsl-1/igt@[email protected]
- bat-jsl-3: NOTRUN -> [SKIP][9] ([i915#2190])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-jsl-3/igt@[email protected]

* igt@gem_lmem_swapping@basic:
- bat-jsl-3: NOTRUN -> [SKIP][10] ([i915#4613]) +3 other tests skip
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-jsl-3/igt@[email protected]

* igt@gem_lmem_swapping@verify-random:
- fi-cfl-8109u: NOTRUN -> [SKIP][11] ([fdo#109271] / [i915#4613]) +3 other tests skip
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/fi-cfl-8109u/igt@[email protected]
- bat-jsl-1: NOTRUN -> [SKIP][12] ([i915#4613]) +3 other tests skip
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-jsl-1/igt@[email protected]

* igt@gem_mmap@basic:
- bat-atsm-1: NOTRUN -> [SKIP][13] ([i915#4083])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]

* igt@gem_tiled_fence_blits@basic:
- bat-atsm-1: NOTRUN -> [SKIP][14] ([i915#4077]) +2 other tests skip
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]

* igt@gem_tiled_pread_basic:
- bat-atsm-1: NOTRUN -> [SKIP][15] ([i915#4079]) +1 other test skip
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@gem_tiled_pread_basic.html

* igt@i915_pm_rps@basic-api:
- bat-atsm-1: NOTRUN -> [SKIP][16] ([i915#6621])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]

* igt@kms_addfb_basic@size-max:
- bat-atsm-1: NOTRUN -> [SKIP][17] ([i915#6077]) +36 other tests skip
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]

* igt@kms_addfb_basic@tile-pitch-mismatch:
- bat-atsm-1: NOTRUN -> [SKIP][18] ([i915#5608] / [i915#6077])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-atsm-1: NOTRUN -> [SKIP][19] ([i915#5608] / [i915#6078]) +1 other test skip
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]
- bat-jsl-3: NOTRUN -> [SKIP][20] ([i915#4103]) +1 other test skip
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-jsl-3/igt@[email protected]
- fi-cfl-8109u: NOTRUN -> [SKIP][21] ([fdo#109271]) +10 other tests skip
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/fi-cfl-8109u/igt@[email protected]
- bat-jsl-1: NOTRUN -> [SKIP][22] ([i915#4103]) +1 other test skip
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-jsl-1/igt@[email protected]

* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- bat-atsm-1: NOTRUN -> [SKIP][23] ([i915#6078]) +8 other tests skip
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]

* igt@kms_cursor_legacy@basic-flip-before-cursor-legacy:
- bat-adlp-11: [PASS][24] -> [DMESG-WARN][25] ([i915#6868])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13769/bat-adlp-11/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-adlp-11/igt@[email protected]

* igt@kms_dsc@dsc-basic:
- bat-jsl-1: NOTRUN -> [SKIP][26] ([i915#3555]) +1 other test skip
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-jsl-1/igt@[email protected]

* igt@kms_flip@basic-plain-flip:
- bat-atsm-1: NOTRUN -> [SKIP][27] ([i915#6166]) +3 other tests skip
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]

* igt@kms_force_connector_basic@force-load-detect:
- bat-jsl-3: NOTRUN -> [SKIP][28] ([fdo#109285])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-jsl-3/igt@[email protected]
- bat-jsl-1: NOTRUN -> [SKIP][29] ([fdo#109285])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-jsl-1/igt@[email protected]

* igt@kms_force_connector_basic@prune-stale-modes:
- bat-atsm-1: NOTRUN -> [SKIP][30] ([i915#6093]) +4 other tests skip
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-xr24:
- bat-atsm-1: NOTRUN -> [SKIP][31] ([i915#1836]) +6 other tests skip
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]

* igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-c-dp-5:
- bat-adlp-11: [PASS][32] -> [ABORT][33] ([i915#8668] / [i915#9451])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13769/bat-adlp-11/igt@kms_pipe_crc_basic@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-adlp-11/igt@kms_pipe_crc_basic@[email protected]

* igt@kms_prop_blob@basic:
- bat-atsm-1: NOTRUN -> [SKIP][34] ([i915#7357])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]

* igt@kms_psr@sprite_plane_onoff:
- bat-atsm-1: NOTRUN -> [SKIP][35] ([i915#1072]) +3 other tests skip
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@kms_psr@sprite_plane_onoff.html

* igt@kms_setmode@basic-clone-single-crtc:
- bat-atsm-1: NOTRUN -> [SKIP][36] ([i915#6094])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]
- bat-jsl-3: NOTRUN -> [SKIP][37] ([i915#3555]) +1 other test skip
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-jsl-3/igt@[email protected]

* igt@prime_vgem@basic-fence-flip:
- bat-atsm-1: NOTRUN -> [SKIP][38] ([fdo#109295] / [i915#6078])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]

* igt@prime_vgem@basic-fence-mmap:
- bat-atsm-1: NOTRUN -> [SKIP][39] ([fdo#109295] / [i915#4077]) +1 other test skip
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]

* igt@prime_vgem@basic-write:
- bat-atsm-1: NOTRUN -> [SKIP][40] ([fdo#109295]) +2 other tests skip
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-atsm-1/igt@[email protected]

#### Possible fixes ####

* igt@i915_module_load@load:
- bat-jsl-3: [INCOMPLETE][41] -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13769/bat-jsl-3/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-jsl-3/igt@[email protected]

* igt@i915_selftest@live@mman:
- fi-elk-e7500: [INCOMPLETE][43] -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13769/fi-elk-e7500/igt@i915_selftest@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/fi-elk-e7500/igt@i915_selftest@[email protected]

* igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-d-dp-5:
- bat-adlp-11: [ABORT][45] ([i915#8668]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13769/bat-adlp-11/igt@kms_pipe_crc_basic@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/bat-adlp-11/igt@kms_pipe_crc_basic@[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
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1836]: https://gitlab.freedesktop.org/drm/intel/issues/1836
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#5608]: https://gitlab.freedesktop.org/drm/intel/issues/5608
[i915#6077]: https://gitlab.freedesktop.org/drm/intel/issues/6077
[i915#6078]: https://gitlab.freedesktop.org/drm/intel/issues/6078
[i915#6093]: https://gitlab.freedesktop.org/drm/intel/issues/6093
[i915#6094]: https://gitlab.freedesktop.org/drm/intel/issues/6094
[i915#6166]: https://gitlab.freedesktop.org/drm/intel/issues/6166
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6868]: https://gitlab.freedesktop.org/drm/intel/issues/6868
[i915#7357]: https://gitlab.freedesktop.org/drm/intel/issues/7357
[i915#8668]: https://gitlab.freedesktop.org/drm/intel/issues/8668
[i915#9318]: https://gitlab.freedesktop.org/drm/intel/issues/9318
[i915#9451]: https://gitlab.freedesktop.org/drm/intel/issues/9451

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

* CI: CI-20190529 -> None
* IGT: IGT_7543 -> IGTPW_10023

CI-20190529: 20190529
CI_DRM_13769: 30f23d5bc2534f1707286bbf60be32d234fb54c3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_10023: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/index.html
IGT_7543: 688f12831f876590e084e9b13b4d5ab85fe13d51 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git

== Logs ==

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

#2 lore raw

[igt-dev] ✓ CI.xeBAT: success for tests/xe/xe_prime_self_import: Adjust buffer object sizes to min alignment

In reply to Thomas Hellström
== Series Details ==

== Series Details ==

Series: tests/xe/xe_prime_self_import: Adjust buffer object sizes to min alignment
URL : https://patchwork.freedesktop.org/series/125284/
State : success

== Summary ==

CI Bug Log - changes from XEIGT_7543_BAT -> XEIGTPW_10023_BAT
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

No changes in participating hosts

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

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

### IGT changes ###

#### Issues hit ####

* igt@kms_addfb_basic@basic-y-tiled-legacy:
- bat-adlp-7: NOTRUN -> [FAIL][1] ([Intel XE#609]) +2 other tests fail
[1]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-adlp-7/igt@[email protected]

* igt@kms_addfb_basic@invalid-set-prop-any:
- bat-atsm-2: NOTRUN -> [SKIP][2] ([i915#6077]) +33 other tests skip
[2]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-atsm-2/igt@[email protected]

* igt@kms_cursor_legacy@basic-flip-before-cursor-legacy:
- bat-atsm-2: NOTRUN -> [SKIP][3] ([Intel XE#782]) +5 other tests skip
[3]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-atsm-2/igt@[email protected]

* igt@kms_dsc@dsc-basic:
- bat-atsm-2: NOTRUN -> [SKIP][4] ([Intel XE#784])
[4]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-atsm-2/igt@[email protected]
- bat-adlp-7: NOTRUN -> [SKIP][5] ([Intel XE#423])
[5]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-adlp-7/igt@[email protected]

* igt@kms_flip@basic-flip-vs-modeset:
- bat-atsm-2: NOTRUN -> [SKIP][6] ([Intel XE#541]) +3 other tests skip
[6]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-atsm-2/igt@[email protected]

* igt@kms_flip@basic-flip-vs-wf_vblank@d-edp1:
- bat-adlp-7: NOTRUN -> [FAIL][7] ([Intel XE#480]) +1 other test fail
[7]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-adlp-7/igt@kms_flip@[email protected]

* igt@kms_force_connector_basic@force-connector-state:
- bat-atsm-2: NOTRUN -> [SKIP][8] ([Intel XE#540]) +3 other tests skip
[8]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-atsm-2/igt@[email protected]

* igt@kms_frontbuffer_tracking@basic:
- bat-adlp-7: NOTRUN -> [DMESG-FAIL][9] ([Intel XE#282])
[9]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-adlp-7/igt@[email protected]
- bat-atsm-2: NOTRUN -> [SKIP][10] ([Intel XE#783])
[10]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-atsm-2/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-xr24:
- bat-atsm-2: NOTRUN -> [SKIP][11] ([i915#1836]) +6 other tests skip
[11]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-atsm-2/igt@[email protected]

* igt@kms_prop_blob@basic:
- bat-atsm-2: NOTRUN -> [SKIP][12] ([Intel XE#780])
[12]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-atsm-2/igt@[email protected]

* igt@kms_psr@cursor_plane_move:
- bat-atsm-2: NOTRUN -> [SKIP][13] ([Intel XE#535]) +2 other tests skip
[13]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-atsm-2/igt@kms_psr@cursor_plane_move.html

* igt@xe_compute@compute-square:
- bat-atsm-2: NOTRUN -> [SKIP][14] ([Intel XE#672])
[14]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-atsm-2/igt@[email protected]

* igt@xe_evict@evict-beng-small-external:
- bat-adlp-7: NOTRUN -> [SKIP][15] ([Intel XE#261] / [Intel XE#688]) +15 other tests skip
[15]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-adlp-7/igt@[email protected]

* igt@xe_exec_fault_mode@twice-userptr:
- bat-adlp-7: NOTRUN -> [SKIP][16] ([Intel XE#288]) +17 other tests skip
[16]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-adlp-7/igt@[email protected]

* igt@xe_exec_fault_mode@twice-userptr-invalidate-imm:
- bat-atsm-2: NOTRUN -> [SKIP][17] ([Intel XE#288]) +17 other tests skip
[17]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-atsm-2/igt@[email protected]

* igt@xe_huc_copy@huc_copy:
- bat-atsm-2: NOTRUN -> [SKIP][18] ([Intel XE#255])
[18]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-atsm-2/igt@xe_huc_copy@huc_copy.html

* igt@xe_live_ktest@migrate:
- bat-adlp-7: NOTRUN -> [INCOMPLETE][19] ([Intel XE#753])
[19]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-adlp-7/igt@[email protected]

* igt@xe_mmap@vram:
- bat-adlp-7: NOTRUN -> [SKIP][20] ([Intel XE#263])
[20]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-adlp-7/igt@[email protected]

#### Possible fixes ####

* igt@xe_module_load@load:
- bat-atsm-2: [INCOMPLETE][21] ([Intel XE#714]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7543/bat-atsm-2/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-atsm-2/igt@[email protected]

#### Warnings ####

* igt@xe_exec_fault_mode@twice-invalid-fault:
- bat-pvc-2: [INCOMPLETE][23] ([Intel XE#613]) -> [INCOMPLETE][24] ([Intel XE#613] / [Intel XE#814])
[23]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7543/bat-pvc-2/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10023/bat-pvc-2/igt@[email protected]

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

[Intel XE#255]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/255
[Intel XE#261]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/261
[Intel XE#263]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/263
[Intel XE#282]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/282
[Intel XE#288]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/288
[Intel XE#423]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/423
[Intel XE#480]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/480
[Intel XE#535]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/535
[Intel XE#540]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/540
[Intel XE#541]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/541
[Intel XE#609]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/609
[Intel XE#613]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/613
[Intel XE#672]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/672
[Intel XE#688]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/688
[Intel XE#714]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/714
[Intel XE#753]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/753
[Intel XE#780]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/780
[Intel XE#782]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/782
[Intel XE#783]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/783
[Intel XE#784]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/784
[Intel XE#814]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/814
[i915#1836]: https://gitlab.freedesktop.org/drm/intel/issues/1836
[i915#6077]: https://gitlab.freedesktop.org/drm/intel/issues/6077

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

* IGT: IGT_7543 -> IGTPW_10023
* Linux: xe-439-cbcd3e95647ff14d508d1a42dce785693446c7f2 -> xe-441-4d039d7be23937e2b498ed783aa5b0d8801b377b

IGTPW_10023: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_10023/index.html
IGT_7543: 688f12831f876590e084e9b13b4d5ab85fe13d51 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
xe-439-cbcd3e95647ff14d508d1a42dce785693446c7f2: cbcd3e95647ff14d508d1a42dce785693446c7f2 xe-441-4d039d7be23937e2b498ed783aa5b0d8801b377b: 4d039d7be23937e2b498ed783aa5b0d8801b377b

== Logs ==

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

Reviewed-by on v1 1/1
#3 lore raw
In reply to Thomas Hellström
Quoted 7 lines · Thomas Hellström

Creating a buffer object in VRAM may require the size to be properly aligned. Ensure the buffer object sizes are using the minimum required alignment.

Cc Zbigniew Kempczyński <[email protected]>
Cc Maarten Lankhorst <[email protected]>
Quoted 143 lines
---
 tests/intel/xe_prime_self_import.c | 40 +++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)
tests/intel/xe_prime_self_import.c +20 -20
index 994fd99f5..536230f9f 100644
@@ -56,11 +56,10 @@
 IGT_TEST_DESCRIPTION("Check whether prime import/export works on the same"
 		     " device... but with different fds.");
 
-#define BO_SIZE (16*1024)
-
 static char counter;
 static int g_time_out = 5;
 static pthread_barrier_t g_barrier;
+static size_t bo_size;
 
 static void
 check_bo(int fd1, uint32_t handle1, int fd2, uint32_t handle2)
@@ -69,25 +68,25 @@ check_bo(int fd1, uint32_t handle1, int fd2, uint32_t handle2)
 	int i;
 
 
-	ptr1 = xe_bo_map(fd1, handle1, BO_SIZE);
-	ptr2 = xe_bo_map(fd2, handle2, BO_SIZE);
+	ptr1 = xe_bo_map(fd1, handle1, bo_size);
+	ptr2 = xe_bo_map(fd2, handle2, bo_size);
 
 	/* TODO: Export fence for both and wait on them */
 	usleep(1000);
 
 	/* check whether it's still our old object first. */
-	for (i = 0; i < BO_SIZE; i++) {
+	for (i = 0; i < bo_size; i++) {
 		igt_assert(ptr1[i] == counter);
 		igt_assert(ptr2[i] == counter);
 	}
 
 	counter++;
 
-	memset(ptr1, counter, BO_SIZE);
-	igt_assert(memcmp(ptr1, ptr2, BO_SIZE) == 0);
+	memset(ptr1, counter, bo_size);
+	igt_assert(memcmp(ptr1, ptr2, bo_size) == 0);
 
-	munmap(ptr1, BO_SIZE);
-	munmap(ptr2, BO_SIZE);
+	munmap(ptr1, bo_size);
+	munmap(ptr2, bo_size);
 }
 
 /**
@@ -106,7 +105,7 @@ static void test_with_fd_dup(void)
 	fd1 = drm_open_driver(DRIVER_XE);
 	fd2 = drm_open_driver(DRIVER_XE);
 
-	handle = xe_bo_create_flags(fd1, 0, BO_SIZE, visible_vram_if_possible(fd1, 0));
+	handle = xe_bo_create_flags(fd1, 0, bo_size, visible_vram_if_possible(fd1, 0));
 
 	dma_buf_fd1 = prime_handle_to_fd(fd1, handle);
 	gem_close(fd1, handle);
@@ -139,8 +138,8 @@ static void test_with_two_bos(void)
 	fd1 = drm_open_driver(DRIVER_XE);
 	fd2 = drm_open_driver(DRIVER_XE);
 
-	handle1 = xe_bo_create_flags(fd1, 0, BO_SIZE, visible_vram_if_possible(fd1, 0));
-	handle2 = xe_bo_create_flags(fd1, 0, BO_SIZE, visible_vram_if_possible(fd1, 0));
+	handle1 = xe_bo_create_flags(fd1, 0, bo_size, visible_vram_if_possible(fd1, 0));
+	handle2 = xe_bo_create_flags(fd1, 0, bo_size, visible_vram_if_possible(fd1, 0));
 
 	dma_buf_fd = prime_handle_to_fd(fd1, handle1);
 	handle_import = prime_fd_to_handle(fd2, dma_buf_fd);
@@ -175,7 +174,7 @@ static void test_with_one_bo_two_files(void)
 	fd1 = drm_open_driver(DRIVER_XE);
 	fd2 = drm_open_driver(DRIVER_XE);
 
-	handle_orig = xe_bo_create_flags(fd1, 0, BO_SIZE,
+	handle_orig = xe_bo_create_flags(fd1, 0, bo_size,
 					 visible_vram_if_possible(fd1, 0));
 	dma_buf_fd1 = prime_handle_to_fd(fd1, handle_orig);
 
@@ -208,7 +207,7 @@ static void test_with_one_bo(void)
 	fd1 = drm_open_driver(DRIVER_XE);
 	fd2 = drm_open_driver(DRIVER_XE);
 
-	handle = xe_bo_create_flags(fd1, 0, BO_SIZE, visible_vram_if_possible(fd1, 0));
+	handle = xe_bo_create_flags(fd1, 0, bo_size, visible_vram_if_possible(fd1, 0));
 
 	dma_buf_fd = prime_handle_to_fd(fd1, handle);
 	handle_import1 = prime_fd_to_handle(fd2, dma_buf_fd);
@@ -294,7 +293,7 @@ static void *thread_fn_reimport_vs_close(void *p)
 
 	fds[0] = drm_open_driver(DRIVER_XE);
 
-	handle = xe_bo_create_flags(fds[0], 0, BO_SIZE,
+	handle = xe_bo_create_flags(fds[0], 0, bo_size,
 				    visible_vram_if_possible(fds[0], 0));
 
 	fds[1] = prime_handle_to_fd(fds[0], handle);
@@ -337,7 +336,7 @@ static void *thread_fn_export_vs_close(void *p)
 
 	igt_until_timeout(g_time_out) {
 		/* We want to race gem close against prime export on handle one.*/
-		handle = xe_bo_create_flags(fd, 0, 4096,
+		handle = xe_bo_create_flags(fd, 0, bo_size,
 					    visible_vram_if_possible(fd, 0));
 		if (handle != 1)
 			gem_close(fd, handle);
@@ -463,7 +462,7 @@ static void test_llseek_bad(void)
 
 	fd = drm_open_driver(DRIVER_XE);
 
-	handle = xe_bo_create_flags(fd, 0, BO_SIZE,
+	handle = xe_bo_create_flags(fd, 0, bo_size,
 				    visible_vram_if_possible(fd, 0));
 	dma_buf_fd = prime_handle_to_fd(fd, handle);
 
@@ -473,9 +472,9 @@ static void test_llseek_bad(void)
 
 	igt_assert(lseek(dma_buf_fd, -1, SEEK_END) == -1 && errno == EINVAL);
 	igt_assert(lseek(dma_buf_fd, 1, SEEK_SET) == -1 && errno == EINVAL);
-	igt_assert(lseek(dma_buf_fd, BO_SIZE, SEEK_SET) == -1 && errno == EINVAL);
-	igt_assert(lseek(dma_buf_fd, BO_SIZE + 1, SEEK_SET) == -1 && errno == EINVAL);
-	igt_assert(lseek(dma_buf_fd, BO_SIZE - 1, SEEK_SET) == -1 && errno == EINVAL);
+	igt_assert(lseek(dma_buf_fd, bo_size, SEEK_SET) == -1 && errno == EINVAL);
+	igt_assert(lseek(dma_buf_fd, bo_size + 1, SEEK_SET) == -1 && errno == EINVAL);
+	igt_assert(lseek(dma_buf_fd, bo_size - 1, SEEK_SET) == -1 && errno == EINVAL);
 
 	close(dma_buf_fd);
 
@@ -502,6 +501,7 @@ igt_main
 
 	igt_fixture {
 		fd = drm_open_driver(DRIVER_XE);
+		bo_size = xe_get_default_alignment(fd);
 	}
 
 	for (i = 0; i < ARRAY_SIZE(tests); i++) {
Signature · 1 line
2.41.0