* [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write
@ 2021-03-15 21:16 Ashutosh Dixit
2021-03-15 22:01 ` [igt-dev] ✓ Fi.CI.BAT: success for lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write (rev16) Patchwork
2021-03-15 22:54 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
0 siblings, 2 replies; 16+ messages in thread
From: Ashutosh Dixit @ 2021-03-15 21:16 UTC (permalink / raw)
To: igt-dev
FOR CI ONLY. PLEASE DON'T REVIEW.
Trial patch to replace PREAD/PWRITE ioctls with mmap + memcpy in gem_read/write.
v11: Simplified patch to use previous __gem_read/__gem_write
v12: Fix CI failures in gem_madvise and gen9_exec_parse
v13: Skip mmap for 0 length read/write's
v14: Rebase on latest master, remove redundant asserts/checks in mmap_read/write
v15: Fix CI failures in gem_exec_parallel@userptr
v16: rebase, gem_exec_parallel@userptr no longer does a gem_read
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 103 +++++++++++++++++++++++++++++++++++++--
lib/ioctl_wrappers.h | 4 +-
tests/i915/gem_madvise.c | 2 +-
tests/prime_vgem.c | 8 +--
4 files changed, 108 insertions(+), 9 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 45415621b7..82eeeb447a 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -56,6 +56,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -342,7 +343,7 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
}
/**
- * gem_write:
+ * gem_pwrite:
* @fd: open i915 drm file descriptor
* @handle: gem buffer object handle
* @offset: offset within the buffer of the subrange
@@ -352,7 +353,7 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
* This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
* of a gem buffer object.
*/
-void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
}
@@ -373,6 +374,102 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
err = -errno;
return err;
}
+/**
+ * gem_pread:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to read into
+ * @length: size of the subrange
+ *
+ * This wraps the PREAD ioctl, which is to download a linear data to a subrange
+ * of a gem buffer object.
+ */
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+}
+
+static bool is_cache_coherent(int fd, uint32_t handle)
+{
+ return gem_get_caching(fd, handle) != I915_CACHING_NONE;
+}
+
+static void mmap_write(int fd, uint32_t handle, uint64_t offset,
+ const void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (!length)
+ return;
+
+ if (is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
+ }
+
+ memcpy(map + offset, buf, length);
+ munmap(map, offset + length);
+}
+
+/**
+ * gem_write:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to write into the buffer
+ * @length: size of the subrange
+ *
+ * This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
+ * of a gem buffer object.
+ */
+void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+{
+ mmap_write(fd, handle, offset, buf, length);
+}
+
+static void mmap_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (!length)
+ return;
+
+ if (gem_has_llc(fd) || is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0,
+ offset + length, PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, 0);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_WC, 0);
+ }
+
+ memcpy(buf, map + offset, length);
+ munmap(map, offset + length);
+}
+
/**
* gem_read:
* @fd: open i915 drm file descriptor
@@ -386,7 +483,7 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
*/
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ mmap_read(fd, handle, offset, buf, length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h
index 69e198419c..13ff799aab 100644
--- a/lib/ioctl_wrappers.h
+++ b/lib/ioctl_wrappers.h
@@ -68,8 +68,10 @@ uint32_t gem_flink(int fd, uint32_t handle);
uint32_t gem_open(int fd, uint32_t name);
void gem_close(int fd, uint32_t handle);
int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
-void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
+void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
void gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
index 2cd0b5d7cc..ce78b76b9f 100644
--- a/tests/i915/gem_madvise.c
+++ b/tests/i915/gem_madvise.c
@@ -175,7 +175,7 @@ dontneed_before_exec(void)
memset(&exec, 0, sizeof(exec));
exec.handle = gem_create(fd, OBJECT_SIZE);
- gem_write(fd, exec.handle, 0, buf, sizeof(buf));
+ gem_pwrite(fd, exec.handle, 0, buf, sizeof(buf));
gem_madvise(fd, exec.handle, I915_MADV_DONTNEED);
execbuf.buffers_ptr = to_user_pointer(&exec);
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
index 07ff69a245..2d4d283141 100644
--- a/tests/prime_vgem.c
+++ b/tests/prime_vgem.c
@@ -59,7 +59,7 @@ static void test_read(int vgem, int i915)
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, i);
}
gem_close(i915, handle);
@@ -94,14 +94,14 @@ static void test_fence_read(int i915, int vgem)
close(slave[1]);
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, 0);
}
write(master[1], &child, sizeof(child));
read(slave[0], &child, sizeof(child));
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, i);
}
gem_close(i915, handle);
@@ -279,7 +279,7 @@ static void test_write(int vgem, int i915)
gem_close(vgem, scratch.handle);
for (i = 0; i < 1024; i++)
- gem_write(i915, handle, 4096*i, &i, sizeof(i));
+ gem_pwrite(i915, handle, 4096*i, &i, sizeof(i));
gem_close(i915, handle);
for (i = 0; i < 1024; i++)
--
2.29.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write (rev16)
2021-03-15 21:16 [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write Ashutosh Dixit
@ 2021-03-15 22:01 ` Patchwork
2021-03-15 22:54 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
1 sibling, 0 replies; 16+ messages in thread
From: Patchwork @ 2021-03-15 22:01 UTC (permalink / raw)
To: Ashutosh Dixit; +Cc: igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 5316 bytes --]
== Series Details ==
Series: lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write (rev16)
URL : https://patchwork.freedesktop.org/series/81152/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9857 -> IGTPW_5602
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_5602:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@i915_selftest@live@requests:
- {fi-tgl-dsi}: [PASS][1] -> [DMESG-WARN][2] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/fi-tgl-dsi/igt@i915_selftest@live@requests.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/fi-tgl-dsi/igt@i915_selftest@live@requests.html
Known issues
------------
Here are the changes found in IGTPW_5602 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@semaphore:
- fi-icl-y: NOTRUN -> [SKIP][3] ([fdo#109315]) +17 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/fi-icl-y/igt@amdgpu/amd_basic@semaphore.html
* igt@gem_huc_copy@huc-copy:
- fi-icl-y: NOTRUN -> [SKIP][4] ([i915#2190])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/fi-icl-y/igt@gem_huc_copy@huc-copy.html
* igt@kms_chamelium@dp-crc-fast:
- fi-icl-y: NOTRUN -> [SKIP][5] ([fdo#109284] / [fdo#111827]) +8 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/fi-icl-y/igt@kms_chamelium@dp-crc-fast.html
* igt@kms_force_connector_basic@force-load-detect:
- fi-icl-y: NOTRUN -> [SKIP][6] ([fdo#109285])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/fi-icl-y/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-icl-y: NOTRUN -> [SKIP][7] ([fdo#109278])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/fi-icl-y/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
* igt@kms_psr@primary_mmap_gtt:
- fi-icl-y: NOTRUN -> [SKIP][8] ([fdo#110189]) +3 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/fi-icl-y/igt@kms_psr@primary_mmap_gtt.html
#### Possible fixes ####
* igt@gem_tiled_fence_blits@basic:
- fi-kbl-8809g: [TIMEOUT][9] ([i915#3145]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/fi-kbl-8809g/igt@gem_tiled_fence_blits@basic.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/fi-kbl-8809g/igt@gem_tiled_fence_blits@basic.html
* igt@i915_selftest@live@client:
- fi-glk-dsi: [DMESG-FAIL][11] ([i915#3047]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/fi-glk-dsi/igt@i915_selftest@live@client.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/fi-glk-dsi/igt@i915_selftest@live@client.html
#### Warnings ####
* igt@i915_pm_rpm@module-reload:
- fi-glk-dsi: [DMESG-WARN][13] ([i915#3143]) -> [DMESG-WARN][14] ([i915#1982] / [i915#3143])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/fi-glk-dsi/igt@i915_pm_rpm@module-reload.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/fi-glk-dsi/igt@i915_pm_rpm@module-reload.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1222]: https://gitlab.freedesktop.org/drm/intel/issues/1222
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#3047]: https://gitlab.freedesktop.org/drm/intel/issues/3047
[i915#3143]: https://gitlab.freedesktop.org/drm/intel/issues/3143
[i915#3145]: https://gitlab.freedesktop.org/drm/intel/issues/3145
Participating hosts (44 -> 40)
------------------------------
Additional (1): fi-icl-y
Missing (5): fi-ilk-m540 fi-bsw-cyan fi-ctg-p8600 fi-dg1-1 fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_6032 -> IGTPW_5602
CI-20190529: 20190529
CI_DRM_9857: 0f9254e98a162e962fa4b9517645c4be44367e27 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_5602: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/index.html
IGT_6032: f3fd2cc23455929d0ef276e05e02416b86a6db91 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/index.html
[-- Attachment #1.2: Type: text/html, Size: 6092 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 16+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write (rev16)
2021-03-15 21:16 [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write Ashutosh Dixit
2021-03-15 22:01 ` [igt-dev] ✓ Fi.CI.BAT: success for lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write (rev16) Patchwork
@ 2021-03-15 22:54 ` Patchwork
1 sibling, 0 replies; 16+ messages in thread
From: Patchwork @ 2021-03-15 22:54 UTC (permalink / raw)
To: Ashutosh Dixit; +Cc: igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 30304 bytes --]
== Series Details ==
Series: lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write (rev16)
URL : https://patchwork.freedesktop.org/series/81152/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9857_full -> IGTPW_5602_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/index.html
Known issues
------------
Here are the changes found in IGTPW_5602_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@feature_discovery@display-4x:
- shard-tglb: NOTRUN -> [SKIP][1] ([i915#1839])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb8/igt@feature_discovery@display-4x.html
- shard-iclb: NOTRUN -> [SKIP][2] ([i915#1839])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb7/igt@feature_discovery@display-4x.html
* igt@gem_ctx_param@set-priority-not-supported:
- shard-tglb: NOTRUN -> [SKIP][3] ([fdo#109314])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb6/igt@gem_ctx_param@set-priority-not-supported.html
- shard-iclb: NOTRUN -> [SKIP][4] ([fdo#109314])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb4/igt@gem_ctx_param@set-priority-not-supported.html
* igt@gem_ctx_persistence@legacy-engines-queued:
- shard-snb: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#1099]) +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-snb7/igt@gem_ctx_persistence@legacy-engines-queued.html
* igt@gem_exec_balancer@hang:
- shard-iclb: [PASS][6] -> [INCOMPLETE][7] ([i915#1895] / [i915#3031])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-iclb6/igt@gem_exec_balancer@hang.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb2/igt@gem_exec_balancer@hang.html
* igt@gem_exec_fair@basic-deadline:
- shard-glk: NOTRUN -> [FAIL][8] ([i915#2846])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-glk5/igt@gem_exec_fair@basic-deadline.html
- shard-apl: NOTRUN -> [FAIL][9] ([i915#2846])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl3/igt@gem_exec_fair@basic-deadline.html
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [PASS][10] -> [FAIL][11] ([i915#2842]) +2 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-apl3/igt@gem_exec_fair@basic-none-solo@rcs0.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl1/igt@gem_exec_fair@basic-none-solo@rcs0.html
- shard-glk: [PASS][12] -> [FAIL][13] ([i915#2842])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-glk5/igt@gem_exec_fair@basic-none-solo@rcs0.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-glk8/igt@gem_exec_fair@basic-none-solo@rcs0.html
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-kbl: [PASS][14] -> [FAIL][15] ([i915#2842])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-kbl4/igt@gem_exec_fair@basic-pace-solo@rcs0.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl1/igt@gem_exec_fair@basic-pace-solo@rcs0.html
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-iclb: [PASS][16] -> [FAIL][17] ([i915#2842])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-iclb4/igt@gem_exec_fair@basic-pace@vcs1.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb4/igt@gem_exec_fair@basic-pace@vcs1.html
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-kbl: NOTRUN -> [FAIL][18] ([i915#2842])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl6/igt@gem_exec_fair@basic-pace@vecs0.html
* igt@gem_exec_reloc@basic-many-active@rcs0:
- shard-glk: [PASS][19] -> [FAIL][20] ([i915#2389])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-glk8/igt@gem_exec_reloc@basic-many-active@rcs0.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-glk1/igt@gem_exec_reloc@basic-many-active@rcs0.html
* igt@gem_exec_reloc@basic-wide-active@vcs1:
- shard-iclb: NOTRUN -> [FAIL][21] ([i915#2389])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb1/igt@gem_exec_reloc@basic-wide-active@vcs1.html
* igt@gem_exec_schedule@u-fairslice@rcs0:
- shard-tglb: [PASS][22] -> [DMESG-WARN][23] ([i915#2803])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-tglb5/igt@gem_exec_schedule@u-fairslice@rcs0.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb2/igt@gem_exec_schedule@u-fairslice@rcs0.html
* igt@gem_mmap_gtt@cpuset-big-copy:
- shard-iclb: [PASS][24] -> [FAIL][25] ([i915#307])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-iclb2/igt@gem_mmap_gtt@cpuset-big-copy.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb8/igt@gem_mmap_gtt@cpuset-big-copy.html
* igt@gem_mmap_gtt@cpuset-big-copy-xy:
- shard-iclb: [PASS][26] -> [FAIL][27] ([i915#2428])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-iclb4/igt@gem_mmap_gtt@cpuset-big-copy-xy.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb4/igt@gem_mmap_gtt@cpuset-big-copy-xy.html
* igt@gem_render_copy@linear-to-vebox-y-tiled:
- shard-iclb: NOTRUN -> [SKIP][28] ([i915#768]) +2 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb3/igt@gem_render_copy@linear-to-vebox-y-tiled.html
* igt@gem_userptr_blits@mmap-offset-invalidate-idle@gtt:
- shard-tglb: NOTRUN -> [SKIP][29] ([i915#1317]) +3 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb6/igt@gem_userptr_blits@mmap-offset-invalidate-idle@gtt.html
* igt@gem_userptr_blits@mmap-offset-invalidate-idle@uc:
- shard-iclb: NOTRUN -> [SKIP][30] ([i915#1317]) +3 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb4/igt@gem_userptr_blits@mmap-offset-invalidate-idle@uc.html
* igt@gem_userptr_blits@mmap-offset-invalidate-idle@wb:
- shard-glk: NOTRUN -> [SKIP][31] ([fdo#109271]) +82 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-glk2/igt@gem_userptr_blits@mmap-offset-invalidate-idle@wb.html
* igt@gem_userptr_blits@process-exit-mmap@wc:
- shard-tglb: NOTRUN -> [SKIP][32] ([i915#1699]) +3 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb2/igt@gem_userptr_blits@process-exit-mmap@wc.html
* igt@gem_userptr_blits@readonly-mmap-unsync@wb:
- shard-tglb: NOTRUN -> [SKIP][33] ([i915#1704]) +3 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb7/igt@gem_userptr_blits@readonly-mmap-unsync@wb.html
- shard-iclb: NOTRUN -> [SKIP][34] ([i915#1704]) +3 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb4/igt@gem_userptr_blits@readonly-mmap-unsync@wb.html
* igt@gen3_render_mixed_blits:
- shard-tglb: NOTRUN -> [SKIP][35] ([fdo#109289]) +3 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb7/igt@gen3_render_mixed_blits.html
* igt@gen7_exec_parse@bitmasks:
- shard-iclb: NOTRUN -> [SKIP][36] ([fdo#109289]) +2 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb4/igt@gen7_exec_parse@bitmasks.html
* igt@gen9_exec_parse@bb-start-cmd:
- shard-tglb: NOTRUN -> [SKIP][37] ([fdo#112306]) +2 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb6/igt@gen9_exec_parse@bb-start-cmd.html
* igt@gen9_exec_parse@secure-batches:
- shard-iclb: NOTRUN -> [SKIP][38] ([fdo#112306])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb5/igt@gen9_exec_parse@secure-batches.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [PASS][39] -> [FAIL][40] ([i915#454])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-iclb1/igt@i915_pm_dc@dc6-psr.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb4/igt@i915_pm_dc@dc6-psr.html
* igt@kms_big_fb@x-tiled-16bpp-rotate-90:
- shard-tglb: NOTRUN -> [SKIP][41] ([fdo#111614]) +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb1/igt@kms_big_fb@x-tiled-16bpp-rotate-90.html
* igt@kms_big_fb@y-tiled-64bpp-rotate-90:
- shard-iclb: NOTRUN -> [SKIP][42] ([fdo#110725] / [fdo#111614]) +2 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb1/igt@kms_big_fb@y-tiled-64bpp-rotate-90.html
* igt@kms_big_fb@yf-tiled-8bpp-rotate-180:
- shard-tglb: NOTRUN -> [SKIP][43] ([fdo#111615]) +2 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb6/igt@kms_big_fb@yf-tiled-8bpp-rotate-180.html
- shard-iclb: NOTRUN -> [SKIP][44] ([fdo#110723])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb4/igt@kms_big_fb@yf-tiled-8bpp-rotate-180.html
* igt@kms_ccs@pipe-a-ccs-on-another-bo:
- shard-snb: NOTRUN -> [SKIP][45] ([fdo#109271]) +375 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-snb7/igt@kms_ccs@pipe-a-ccs-on-another-bo.html
* igt@kms_ccs@pipe-d-ccs-on-another-bo:
- shard-iclb: NOTRUN -> [SKIP][46] ([fdo#109278]) +12 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb7/igt@kms_ccs@pipe-d-ccs-on-another-bo.html
* igt@kms_chamelium@hdmi-crc-nonplanar-formats:
- shard-glk: NOTRUN -> [SKIP][47] ([fdo#109271] / [fdo#111827]) +6 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-glk8/igt@kms_chamelium@hdmi-crc-nonplanar-formats.html
* igt@kms_chamelium@hdmi-hpd-storm:
- shard-kbl: NOTRUN -> [SKIP][48] ([fdo#109271] / [fdo#111827]) +23 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl4/igt@kms_chamelium@hdmi-hpd-storm.html
* igt@kms_chamelium@vga-frame-dump:
- shard-tglb: NOTRUN -> [SKIP][49] ([fdo#109284] / [fdo#111827]) +11 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb7/igt@kms_chamelium@vga-frame-dump.html
* igt@kms_chamelium@vga-hpd-without-ddc:
- shard-snb: NOTRUN -> [SKIP][50] ([fdo#109271] / [fdo#111827]) +24 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-snb2/igt@kms_chamelium@vga-hpd-without-ddc.html
* igt@kms_color@pipe-a-ctm-0-25:
- shard-tglb: NOTRUN -> [FAIL][51] ([i915#1149] / [i915#315]) +1 similar issue
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb1/igt@kms_color@pipe-a-ctm-0-25.html
* igt@kms_color@pipe-b-ctm-0-25:
- shard-iclb: NOTRUN -> [FAIL][52] ([i915#1149] / [i915#315]) +1 similar issue
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb3/igt@kms_color@pipe-b-ctm-0-25.html
* igt@kms_color@pipe-d-ctm-max:
- shard-iclb: NOTRUN -> [SKIP][53] ([fdo#109278] / [i915#1149]) +1 similar issue
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb7/igt@kms_color@pipe-d-ctm-max.html
* igt@kms_color@pipe-d-degamma:
- shard-tglb: NOTRUN -> [FAIL][54] ([i915#1149])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb1/igt@kms_color@pipe-d-degamma.html
* igt@kms_color_chamelium@pipe-a-ctm-limited-range:
- shard-apl: NOTRUN -> [SKIP][55] ([fdo#109271] / [fdo#111827]) +25 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl8/igt@kms_color_chamelium@pipe-a-ctm-limited-range.html
* igt@kms_color_chamelium@pipe-c-ctm-limited-range:
- shard-iclb: NOTRUN -> [SKIP][56] ([fdo#109284] / [fdo#111827]) +6 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb8/igt@kms_color_chamelium@pipe-c-ctm-limited-range.html
* igt@kms_content_protection@lic:
- shard-kbl: NOTRUN -> [TIMEOUT][57] ([i915#1319])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl2/igt@kms_content_protection@lic.html
* igt@kms_cursor_crc@pipe-b-cursor-512x170-offscreen:
- shard-iclb: NOTRUN -> [SKIP][58] ([fdo#109278] / [fdo#109279]) +2 similar issues
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb6/igt@kms_cursor_crc@pipe-b-cursor-512x170-offscreen.html
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-kbl: [PASS][59] -> [FAIL][60] ([i915#54])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-kbl1/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl4/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
* igt@kms_cursor_crc@pipe-d-cursor-512x512-offscreen:
- shard-tglb: NOTRUN -> [SKIP][61] ([fdo#109279]) +7 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb8/igt@kms_cursor_crc@pipe-d-cursor-512x512-offscreen.html
* igt@kms_cursor_crc@pipe-d-cursor-suspend:
- shard-kbl: NOTRUN -> [SKIP][62] ([fdo#109271]) +242 similar issues
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl4/igt@kms_cursor_crc@pipe-d-cursor-suspend.html
* igt@kms_cursor_legacy@cursora-vs-flipb-atomic-transitions-varying-size:
- shard-iclb: NOTRUN -> [SKIP][63] ([fdo#109274] / [fdo#109278]) +2 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb1/igt@kms_cursor_legacy@cursora-vs-flipb-atomic-transitions-varying-size.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic:
- shard-tglb: [PASS][64] -> [FAIL][65] ([i915#2346])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-tglb3/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb6/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html
* igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-legacy:
- shard-kbl: NOTRUN -> [DMESG-FAIL][66] ([IGT#6])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl3/igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-legacy.html
- shard-apl: NOTRUN -> [DMESG-FAIL][67] ([IGT#6])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl2/igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-legacy.html
* igt@kms_cursor_legacy@flip-vs-cursor-toggle:
- shard-tglb: NOTRUN -> [FAIL][68] ([i915#2346])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb5/igt@kms_cursor_legacy@flip-vs-cursor-toggle.html
* igt@kms_dp_dsc@basic-dsc-enable-dp:
- shard-tglb: NOTRUN -> [SKIP][69] ([fdo#109349])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb6/igt@kms_dp_dsc@basic-dsc-enable-dp.html
- shard-iclb: NOTRUN -> [SKIP][70] ([fdo#109349])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb4/igt@kms_dp_dsc@basic-dsc-enable-dp.html
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-apl: NOTRUN -> [INCOMPLETE][71] ([i915#180])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl7/igt@kms_fbcon_fbt@fbc-suspend.html
* igt@kms_flip@2x-absolute-wf_vblank:
- shard-iclb: NOTRUN -> [SKIP][72] ([fdo#109274]) +1 similar issue
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb2/igt@kms_flip@2x-absolute-wf_vblank.html
* igt@kms_flip@2x-blocking-absolute-wf_vblank-interruptible:
- shard-tglb: NOTRUN -> [SKIP][73] ([fdo#111825]) +45 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb1/igt@kms_flip@2x-blocking-absolute-wf_vblank-interruptible.html
* igt@kms_flip@flip-vs-absolute-wf_vblank@a-edp1:
- shard-tglb: NOTRUN -> [FAIL][74] ([i915#2122])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb6/igt@kms_flip@flip-vs-absolute-wf_vblank@a-edp1.html
* igt@kms_flip@flip-vs-expired-vblank@a-edp1:
- shard-tglb: NOTRUN -> [FAIL][75] ([i915#2598])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb6/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html
* igt@kms_flip@flip-vs-expired-vblank@b-hdmi-a2:
- shard-glk: NOTRUN -> [FAIL][76] ([i915#79])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-glk9/igt@kms_flip@flip-vs-expired-vblank@b-hdmi-a2.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs:
- shard-apl: NOTRUN -> [SKIP][77] ([fdo#109271] / [i915#2672])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl6/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile:
- shard-apl: NOTRUN -> [SKIP][78] ([fdo#109271] / [i915#2642])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl3/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
- shard-kbl: [PASS][79] -> [FAIL][80] ([i915#49])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-kbl7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
- shard-apl: NOTRUN -> [FAIL][81] ([i915#49])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@fbc-2p-pri-indfb-multidraw:
- shard-iclb: NOTRUN -> [SKIP][82] ([fdo#109280]) +25 similar issues
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-2p-pri-indfb-multidraw.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-apl: NOTRUN -> [DMESG-WARN][83] ([i915#180])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl8/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_hdr@static-toggle-dpms:
- shard-tglb: NOTRUN -> [SKIP][84] ([i915#1187]) +2 similar issues
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb6/igt@kms_hdr@static-toggle-dpms.html
- shard-iclb: NOTRUN -> [SKIP][85] ([i915#1187]) +1 similar issue
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb4/igt@kms_hdr@static-toggle-dpms.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- shard-apl: NOTRUN -> [SKIP][86] ([fdo#109271] / [i915#533]) +1 similar issue
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl7/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
* igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb:
- shard-apl: NOTRUN -> [FAIL][87] ([i915#265])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl2/igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb.html
- shard-kbl: NOTRUN -> [FAIL][88] ([i915#265])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl3/igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb.html
* igt@kms_plane_alpha_blend@pipe-c-alpha-opaque-fb:
- shard-apl: NOTRUN -> [FAIL][89] ([fdo#108145] / [i915#265]) +1 similar issue
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl3/igt@kms_plane_alpha_blend@pipe-c-alpha-opaque-fb.html
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-glk: NOTRUN -> [FAIL][90] ([fdo#108145] / [i915#265])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-glk1/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max.html
- shard-kbl: NOTRUN -> [FAIL][91] ([fdo#108145] / [i915#265]) +1 similar issue
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl3/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-1:
- shard-kbl: NOTRUN -> [SKIP][92] ([fdo#109271] / [i915#658]) +4 similar issues
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl3/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-1.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-2:
- shard-apl: NOTRUN -> [SKIP][93] ([fdo#109271] / [i915#658]) +6 similar issues
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl8/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-2.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-4:
- shard-glk: NOTRUN -> [SKIP][94] ([fdo#109271] / [i915#658]) +2 similar issues
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-glk8/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-4.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4:
- shard-iclb: NOTRUN -> [SKIP][95] ([i915#658]) +2 similar issues
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb5/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4.html
* igt@kms_psr@psr2_cursor_plane_move:
- shard-iclb: [PASS][96] -> [SKIP][97] ([fdo#109441]) +1 similar issue
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb6/igt@kms_psr@psr2_cursor_plane_move.html
* igt@kms_psr@psr2_primary_blt:
- shard-iclb: NOTRUN -> [SKIP][98] ([fdo#109441])
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb6/igt@kms_psr@psr2_primary_blt.html
* igt@kms_setmode@basic:
- shard-snb: NOTRUN -> [FAIL][99] ([i915#31])
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-snb6/igt@kms_setmode@basic.html
* igt@kms_sysfs_edid_timing:
- shard-apl: NOTRUN -> [FAIL][100] ([IGT#2])
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl2/igt@kms_sysfs_edid_timing.html
* igt@kms_vblank@pipe-d-wait-idle:
- shard-kbl: NOTRUN -> [SKIP][101] ([fdo#109271] / [i915#533]) +4 similar issues
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl6/igt@kms_vblank@pipe-d-wait-idle.html
* igt@kms_vrr@flipline:
- shard-tglb: NOTRUN -> [SKIP][102] ([fdo#109502])
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb5/igt@kms_vrr@flipline.html
- shard-iclb: NOTRUN -> [SKIP][103] ([fdo#109502])
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb8/igt@kms_vrr@flipline.html
* igt@kms_writeback@writeback-fb-id:
- shard-kbl: NOTRUN -> [SKIP][104] ([fdo#109271] / [i915#2437]) +1 similar issue
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl3/igt@kms_writeback@writeback-fb-id.html
* igt@kms_writeback@writeback-invalid-parameters:
- shard-tglb: NOTRUN -> [SKIP][105] ([i915#2437])
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb7/igt@kms_writeback@writeback-invalid-parameters.html
- shard-glk: NOTRUN -> [SKIP][106] ([fdo#109271] / [i915#2437])
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-glk4/igt@kms_writeback@writeback-invalid-parameters.html
- shard-iclb: NOTRUN -> [SKIP][107] ([i915#2437])
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb3/igt@kms_writeback@writeback-invalid-parameters.html
* igt@nouveau_crc@ctx-flip-threshold-reset-after-capture:
- shard-iclb: NOTRUN -> [SKIP][108] ([i915#2530])
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb7/igt@nouveau_crc@ctx-flip-threshold-reset-after-capture.html
* igt@nouveau_crc@pipe-b-ctx-flip-skip-current-frame:
- shard-apl: NOTRUN -> [SKIP][109] ([fdo#109271]) +262 similar issues
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl3/igt@nouveau_crc@pipe-b-ctx-flip-skip-current-frame.html
* igt@nouveau_crc@pipe-d-source-rg:
- shard-tglb: NOTRUN -> [SKIP][110] ([i915#2530]) +2 similar issues
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb6/igt@nouveau_crc@pipe-d-source-rg.html
* igt@prime_nv_api@i915_nv_import_vs_close:
- shard-tglb: NOTRUN -> [SKIP][111] ([fdo#109291]) +3 similar issues
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb5/igt@prime_nv_api@i915_nv_import_vs_close.html
* igt@prime_nv_test@nv_i915_sharing:
- shard-iclb: NOTRUN -> [SKIP][112] ([fdo#109291]) +1 similar issue
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb6/igt@prime_nv_test@nv_i915_sharing.html
* igt@sysfs_clients@recycle:
- shard-iclb: [PASS][113] -> [FAIL][114] ([i915#3028])
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-iclb4/igt@sysfs_clients@recycle.html
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb4/igt@sysfs_clients@recycle.html
- shard-tglb: [PASS][115] -> [FAIL][116] ([i915#3028])
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-tglb7/igt@sysfs_clients@recycle.html
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb7/igt@sysfs_clients@recycle.html
* igt@sysfs_clients@sema-10@vcs0:
- shard-apl: NOTRUN -> [SKIP][117] ([fdo#109271] / [i915#3026]) +3 similar issues
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl1/igt@sysfs_clients@sema-10@vcs0.html
#### Possible fixes ####
* igt@api_intel_bb@render-ccs:
- shard-tglb: [INCOMPLETE][118] ([i915#2588]) -> [PASS][119]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-tglb1/igt@api_intel_bb@render-ccs.html
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb6/igt@api_intel_bb@render-ccs.html
* igt@gem_eio@in-flight-suspend:
- shard-apl: [DMESG-WARN][120] ([i915#180]) -> [PASS][121]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-apl6/igt@gem_eio@in-flight-suspend.html
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-apl3/igt@gem_eio@in-flight-suspend.html
* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [FAIL][122] ([i915#2842]) -> [PASS][123] +2 similar issues
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-kbl2/igt@gem_exec_fair@basic-none@vcs0.html
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl6/igt@gem_exec_fair@basic-none@vcs0.html
- shard-glk: [FAIL][124] ([i915#2842]) -> [PASS][125] +3 similar issues
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-glk8/igt@gem_exec_fair@basic-none@vcs0.html
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-glk7/igt@gem_exec_fair@basic-none@vcs0.html
* igt@gem_exec_fair@basic-pace@vcs0:
- shard-tglb: [FAIL][126] ([i915#2842]) -> [PASS][127]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-tglb1/igt@gem_exec_fair@basic-pace@vcs0.html
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb6/igt@gem_exec_fair@basic-pace@vcs0.html
* igt@gem_exec_schedule@u-fairslice@bcs0:
- shard-tglb: [DMESG-WARN][128] ([i915#2803]) -> [PASS][129]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-tglb5/igt@gem_exec_schedule@u-fairslice@bcs0.html
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-tglb2/igt@gem_exec_schedule@u-fairslice@bcs0.html
* igt@gem_mmap_gtt@cpuset-basic-small-copy-odd:
- shard-iclb: [FAIL][130] ([i915#307]) -> [PASS][131] +1 similar issue
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-iclb6/igt@gem_mmap_gtt@cpuset-basic-small-copy-odd.html
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb1/igt@gem_mmap_gtt@cpuset-basic-small-copy-odd.html
* igt@i915_suspend@fence-restore-untiled:
- shard-kbl: [INCOMPLETE][132] ([i915#155]) -> [PASS][133]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-kbl3/igt@i915_suspend@fence-restore-untiled.html
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl1/igt@i915_suspend@fence-restore-untiled.html
* igt@kms_atomic_transition@plane-all-transition-nonblocking@edp-1-pipe-b:
- shard-iclb: [FAIL][134] ([i915#3168]) -> [PASS][135]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-iclb2/igt@kms_atomic_transition@plane-all-transition-nonblocking@edp-1-pipe-b.html
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-iclb8/igt@kms_atomic_transition@plane-all-transition-nonblocking@edp-1-pipe-b.html
* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [DMESG-WARN][136] ([i915#180]) -> [PASS][137] +5 similar issues
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-kbl2/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl7/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html
* igt@kms_flip@plain-flip-fb-recreate@c-dp1:
- shard-kbl: [FAIL][138] ([i915#2122]) -> [PASS][139]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-kbl4/igt@kms_flip@plain-flip-fb-recreate@c-dp1.html
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/shard-kbl6/igt@kms_flip@plain-flip-fb-recreate@c-dp1.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][140] ([fdo#109441]) -> [PASS][141] +2 similar issues
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9857/shard-iclb1/igt@km
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5602/index.html
[-- Attachment #1.2: Type: text/html, Size: 33929 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 16+ messages in thread
* [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write
@ 2021-01-21 5:52 Ashutosh Dixit
0 siblings, 0 replies; 16+ messages in thread
From: Ashutosh Dixit @ 2021-01-21 5:52 UTC (permalink / raw)
To: igt-dev
FOR CI ONLY. PLEASE DON'T REVIEW.
Trial patch to replace PREAD/PWRITE ioctls with mmap + memcpy in gem_read/write.
v11: Simplified patch to use previous __gem_read/__gem_write
v12: Fix CI failures in gem_madvise and gen9_exec_parse
v13: Skip mmap for 0 length read/write's
v14: Rebase on latest master, remove redundant asserts/checks in mmap_read/write
v15: Fix CI failures in gem_exec_parallel@userptr
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 103 ++++++++++++++++++++++++++++++++-
lib/ioctl_wrappers.h | 4 +-
tests/i915/gem_exec_parallel.c | 10 +++-
tests/i915/gem_madvise.c | 2 +-
tests/prime_vgem.c | 8 +--
5 files changed, 115 insertions(+), 12 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 45415621b7..82eeeb447a 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -56,6 +56,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -342,7 +343,7 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
}
/**
- * gem_write:
+ * gem_pwrite:
* @fd: open i915 drm file descriptor
* @handle: gem buffer object handle
* @offset: offset within the buffer of the subrange
@@ -352,7 +353,7 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
* This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
* of a gem buffer object.
*/
-void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
}
@@ -373,6 +374,102 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
err = -errno;
return err;
}
+/**
+ * gem_pread:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to read into
+ * @length: size of the subrange
+ *
+ * This wraps the PREAD ioctl, which is to download a linear data to a subrange
+ * of a gem buffer object.
+ */
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+}
+
+static bool is_cache_coherent(int fd, uint32_t handle)
+{
+ return gem_get_caching(fd, handle) != I915_CACHING_NONE;
+}
+
+static void mmap_write(int fd, uint32_t handle, uint64_t offset,
+ const void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (!length)
+ return;
+
+ if (is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
+ }
+
+ memcpy(map + offset, buf, length);
+ munmap(map, offset + length);
+}
+
+/**
+ * gem_write:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to write into the buffer
+ * @length: size of the subrange
+ *
+ * This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
+ * of a gem buffer object.
+ */
+void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+{
+ mmap_write(fd, handle, offset, buf, length);
+}
+
+static void mmap_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (!length)
+ return;
+
+ if (gem_has_llc(fd) || is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0,
+ offset + length, PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, 0);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_WC, 0);
+ }
+
+ memcpy(buf, map + offset, length);
+ munmap(map, offset + length);
+}
+
/**
* gem_read:
* @fd: open i915 drm file descriptor
@@ -386,7 +483,7 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
*/
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ mmap_read(fd, handle, offset, buf, length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h
index 69e198419c..13ff799aab 100644
--- a/lib/ioctl_wrappers.h
+++ b/lib/ioctl_wrappers.h
@@ -68,8 +68,10 @@ uint32_t gem_flink(int fd, uint32_t handle);
uint32_t gem_open(int fd, uint32_t name);
void gem_close(int fd, uint32_t handle);
int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
-void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
+void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
void gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
diff --git a/tests/i915/gem_exec_parallel.c b/tests/i915/gem_exec_parallel.c
index d3dd06a654..b3b6217f7a 100644
--- a/tests/i915/gem_exec_parallel.c
+++ b/tests/i915/gem_exec_parallel.c
@@ -151,7 +151,8 @@ static void *thread(void *data)
return NULL;
}
-static void check_bo(int fd, uint32_t handle, int pass, struct thread *threads)
+static void check_bo(int fd, uint32_t flags, uint32_t handle, int pass,
+ struct thread *threads)
{
uint32_t x = hash32(handle * pass) % 1024;
uint32_t result;
@@ -161,7 +162,10 @@ static void check_bo(int fd, uint32_t handle, int pass, struct thread *threads)
igt_debug("Verifying result (pass=%d, handle=%d, thread %d)\n",
pass, handle, x);
- gem_read(fd, handle, x * sizeof(result), &result, sizeof(result));
+ if (flags & USERPTR)
+ gem_pread(fd, handle, x * sizeof(result), &result, sizeof(result));
+ else
+ gem_read(fd, handle, x * sizeof(result), &result, sizeof(result));
igt_assert_eq_u32(result, x);
}
@@ -258,7 +262,7 @@ static void all(int fd, struct intel_execution_engine2 *engine, unsigned flags)
pthread_join(threads[i].thread, NULL);
for (i = 0; i < NUMOBJ; i++) {
- check_bo(fd, handle[i], i, threads);
+ check_bo(fd, flags, handle[i], i, threads);
handle_close(fd, flags, handle[i], arg[i]);
}
diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
index 623c8b0913..56cc8a0de9 100644
--- a/tests/i915/gem_madvise.c
+++ b/tests/i915/gem_madvise.c
@@ -175,7 +175,7 @@ dontneed_before_exec(void)
memset(&exec, 0, sizeof(exec));
exec.handle = gem_create(fd, OBJECT_SIZE);
- gem_write(fd, exec.handle, 0, buf, sizeof(buf));
+ gem_pwrite(fd, exec.handle, 0, buf, sizeof(buf));
gem_madvise(fd, exec.handle, I915_MADV_DONTNEED);
execbuf.buffers_ptr = to_user_pointer(&exec);
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
index 07ff69a245..2d4d283141 100644
--- a/tests/prime_vgem.c
+++ b/tests/prime_vgem.c
@@ -59,7 +59,7 @@ static void test_read(int vgem, int i915)
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, i);
}
gem_close(i915, handle);
@@ -94,14 +94,14 @@ static void test_fence_read(int i915, int vgem)
close(slave[1]);
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, 0);
}
write(master[1], &child, sizeof(child));
read(slave[0], &child, sizeof(child));
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, i);
}
gem_close(i915, handle);
@@ -279,7 +279,7 @@ static void test_write(int vgem, int i915)
gem_close(vgem, scratch.handle);
for (i = 0; i < 1024; i++)
- gem_write(i915, handle, 4096*i, &i, sizeof(i));
+ gem_pwrite(i915, handle, 4096*i, &i, sizeof(i));
gem_close(i915, handle);
for (i = 0; i < 1024; i++)
--
2.29.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write
@ 2021-01-21 2:20 Ashutosh Dixit
0 siblings, 0 replies; 16+ messages in thread
From: Ashutosh Dixit @ 2021-01-21 2:20 UTC (permalink / raw)
To: igt-dev
FOR CI ONLY. PLEASE DON'T REVIEW.
Trial patch to replace PREAD/PWRITE ioctls with mmap + memcpy in gem_read/write.
v11: Simplified patch to use previous __gem_read/__gem_write
v12: Fix CI failures in gem_madvise and gen9_exec_parse
v13: Skip mmap for 0 length read/write's
v14: Rebase on latest master, remove redundant asserts/checks in mmap_read/write
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 103 +++++++++++++++++++++++++++++++++++++--
lib/ioctl_wrappers.h | 4 +-
tests/i915/gem_madvise.c | 2 +-
tests/prime_vgem.c | 8 +--
4 files changed, 108 insertions(+), 9 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 45415621b7..82eeeb447a 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -56,6 +56,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -342,7 +343,7 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
}
/**
- * gem_write:
+ * gem_pwrite:
* @fd: open i915 drm file descriptor
* @handle: gem buffer object handle
* @offset: offset within the buffer of the subrange
@@ -352,7 +353,7 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
* This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
* of a gem buffer object.
*/
-void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
}
@@ -373,6 +374,102 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
err = -errno;
return err;
}
+/**
+ * gem_pread:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to read into
+ * @length: size of the subrange
+ *
+ * This wraps the PREAD ioctl, which is to download a linear data to a subrange
+ * of a gem buffer object.
+ */
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+}
+
+static bool is_cache_coherent(int fd, uint32_t handle)
+{
+ return gem_get_caching(fd, handle) != I915_CACHING_NONE;
+}
+
+static void mmap_write(int fd, uint32_t handle, uint64_t offset,
+ const void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (!length)
+ return;
+
+ if (is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
+ }
+
+ memcpy(map + offset, buf, length);
+ munmap(map, offset + length);
+}
+
+/**
+ * gem_write:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to write into the buffer
+ * @length: size of the subrange
+ *
+ * This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
+ * of a gem buffer object.
+ */
+void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+{
+ mmap_write(fd, handle, offset, buf, length);
+}
+
+static void mmap_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (!length)
+ return;
+
+ if (gem_has_llc(fd) || is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0,
+ offset + length, PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, 0);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_WC, 0);
+ }
+
+ memcpy(buf, map + offset, length);
+ munmap(map, offset + length);
+}
+
/**
* gem_read:
* @fd: open i915 drm file descriptor
@@ -386,7 +483,7 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
*/
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ mmap_read(fd, handle, offset, buf, length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h
index 69e198419c..13ff799aab 100644
--- a/lib/ioctl_wrappers.h
+++ b/lib/ioctl_wrappers.h
@@ -68,8 +68,10 @@ uint32_t gem_flink(int fd, uint32_t handle);
uint32_t gem_open(int fd, uint32_t name);
void gem_close(int fd, uint32_t handle);
int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
-void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
+void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
void gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
index 623c8b0913..56cc8a0de9 100644
--- a/tests/i915/gem_madvise.c
+++ b/tests/i915/gem_madvise.c
@@ -175,7 +175,7 @@ dontneed_before_exec(void)
memset(&exec, 0, sizeof(exec));
exec.handle = gem_create(fd, OBJECT_SIZE);
- gem_write(fd, exec.handle, 0, buf, sizeof(buf));
+ gem_pwrite(fd, exec.handle, 0, buf, sizeof(buf));
gem_madvise(fd, exec.handle, I915_MADV_DONTNEED);
execbuf.buffers_ptr = to_user_pointer(&exec);
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
index 07ff69a245..2d4d283141 100644
--- a/tests/prime_vgem.c
+++ b/tests/prime_vgem.c
@@ -59,7 +59,7 @@ static void test_read(int vgem, int i915)
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, i);
}
gem_close(i915, handle);
@@ -94,14 +94,14 @@ static void test_fence_read(int i915, int vgem)
close(slave[1]);
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, 0);
}
write(master[1], &child, sizeof(child));
read(slave[0], &child, sizeof(child));
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, i);
}
gem_close(i915, handle);
@@ -279,7 +279,7 @@ static void test_write(int vgem, int i915)
gem_close(vgem, scratch.handle);
for (i = 0; i < 1024; i++)
- gem_write(i915, handle, 4096*i, &i, sizeof(i));
+ gem_pwrite(i915, handle, 4096*i, &i, sizeof(i));
gem_close(i915, handle);
for (i = 0; i < 1024; i++)
--
2.29.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write
@ 2020-09-06 23:36 Ashutosh Dixit
0 siblings, 0 replies; 16+ messages in thread
From: Ashutosh Dixit @ 2020-09-06 23:36 UTC (permalink / raw)
To: igt-dev
FOR CI ONLY. PLEASE DON'T REVIEW.
Trial patch to replace PREAD/PWRITE ioctls with mmap + memcpy in gem_read/write.
v11: Simplified patch to use previous __gem_read/__gem_write
v12: Fix CI failures in gem_madvise and gen9_exec_parse
v13: Skip mmap for 0 length read/write's
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 107 +++++++++++++++++++++++++++++++++++++--
lib/ioctl_wrappers.h | 4 +-
tests/i915/gem_madvise.c | 2 +-
tests/prime_vgem.c | 8 +--
4 files changed, 112 insertions(+), 9 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 3781286d8..4c660ca3a 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -55,6 +55,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -341,7 +342,7 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
}
/**
- * gem_write:
+ * gem_pwrite:
* @fd: open i915 drm file descriptor
* @handle: gem buffer object handle
* @offset: offset within the buffer of the subrange
@@ -351,7 +352,7 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
* This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
* of a gem buffer object.
*/
-void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
}
@@ -372,6 +373,106 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
err = -errno;
return err;
}
+/**
+ * gem_pread:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to read into
+ * @length: size of the subrange
+ *
+ * This wraps the PREAD ioctl, which is to download a linear data to a subrange
+ * of a gem buffer object.
+ */
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+}
+
+static bool is_cache_coherent(int fd, uint32_t handle)
+{
+ return gem_get_caching(fd, handle) != I915_CACHING_NONE;
+}
+
+static void mmap_write(int fd, uint32_t handle, uint64_t offset,
+ const void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (!length)
+ return;
+
+ if (is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
+ }
+
+ igt_assert(map);
+ memcpy(map + offset, buf, length);
+ munmap(map, offset + length);
+}
+
+/**
+ * gem_write:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to write into the buffer
+ * @length: size of the subrange
+ *
+ * This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
+ * of a gem buffer object.
+ */
+void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+{
+ mmap_write(fd, handle, offset, buf, length);
+}
+
+static void mmap_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (!length)
+ return;
+
+ if (gem_has_llc(fd) || is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0,
+ offset + length, PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, 0);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_WC, 0);
+ }
+
+ igt_assert(map);
+ memcpy(buf, map + offset, length);
+ munmap(map, offset + length);
+}
+
/**
* gem_read:
* @fd: open i915 drm file descriptor
@@ -385,7 +486,7 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
*/
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ mmap_read(fd, handle, offset, buf, length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h
index 870ac8b7b..143a397ea 100644
--- a/lib/ioctl_wrappers.h
+++ b/lib/ioctl_wrappers.h
@@ -68,8 +68,10 @@ uint32_t gem_flink(int fd, uint32_t handle);
uint32_t gem_open(int fd, uint32_t name);
void gem_close(int fd, uint32_t handle);
int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
-void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
+void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
void gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
index 54c9befff..f26d5a79c 100644
--- a/tests/i915/gem_madvise.c
+++ b/tests/i915/gem_madvise.c
@@ -174,7 +174,7 @@ dontneed_before_exec(void)
memset(&exec, 0, sizeof(exec));
exec.handle = gem_create(fd, OBJECT_SIZE);
- gem_write(fd, exec.handle, 0, buf, sizeof(buf));
+ gem_pwrite(fd, exec.handle, 0, buf, sizeof(buf));
gem_madvise(fd, exec.handle, I915_MADV_DONTNEED);
execbuf.buffers_ptr = to_user_pointer(&exec);
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
index 38e2026aa..3f3b5f602 100644
--- a/tests/prime_vgem.c
+++ b/tests/prime_vgem.c
@@ -59,7 +59,7 @@ static void test_read(int vgem, int i915)
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, i);
}
gem_close(i915, handle);
@@ -94,14 +94,14 @@ static void test_fence_read(int i915, int vgem)
close(slave[1]);
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, 0);
}
write(master[1], &child, sizeof(child));
read(slave[0], &child, sizeof(child));
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, i);
}
gem_close(i915, handle);
@@ -279,7 +279,7 @@ static void test_write(int vgem, int i915)
gem_close(vgem, scratch.handle);
for (i = 0; i < 1024; i++)
- gem_write(i915, handle, 4096*i, &i, sizeof(i));
+ gem_pwrite(i915, handle, 4096*i, &i, sizeof(i));
gem_close(i915, handle);
for (i = 0; i < 1024; i++)
--
2.27.0.112.g101b3204f3
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write
@ 2020-09-06 17:38 Ashutosh Dixit
0 siblings, 0 replies; 16+ messages in thread
From: Ashutosh Dixit @ 2020-09-06 17:38 UTC (permalink / raw)
To: igt-dev
FOR CI ONLY. PLEASE DON'T REVIEW.
Trial patch to replace PREAD/PWRITE ioctls with mmap + memcpy in gem_read/write.
v11: Simplified patch to use previous __gem_read/__gem_write
v12: Fix CI failures in gem_madvise and gen9_exec_parse
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 101 +++++++++++++++++++++++++++++++++--
lib/ioctl_wrappers.h | 4 +-
tests/i915/gem_madvise.c | 2 +-
tests/i915/gen9_exec_parse.c | 2 +-
tests/prime_vgem.c | 8 +--
5 files changed, 107 insertions(+), 10 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 3781286d8..65f4539f3 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -55,6 +55,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -341,7 +342,7 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
}
/**
- * gem_write:
+ * gem_pwrite:
* @fd: open i915 drm file descriptor
* @handle: gem buffer object handle
* @offset: offset within the buffer of the subrange
@@ -351,7 +352,7 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
* This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
* of a gem buffer object.
*/
-void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
}
@@ -372,6 +373,100 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
err = -errno;
return err;
}
+/**
+ * gem_pread:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to read into
+ * @length: size of the subrange
+ *
+ * This wraps the PREAD ioctl, which is to download a linear data to a subrange
+ * of a gem buffer object.
+ */
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+}
+
+static bool is_cache_coherent(int fd, uint32_t handle)
+{
+ return gem_get_caching(fd, handle) != I915_CACHING_NONE;
+}
+
+static void mmap_write(int fd, uint32_t handle, uint64_t offset,
+ const void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
+ }
+
+ igt_assert(map);
+ memcpy(map + offset, buf, length);
+ munmap(map, offset + length);
+}
+
+/**
+ * gem_write:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to write into the buffer
+ * @length: size of the subrange
+ *
+ * This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
+ * of a gem buffer object.
+ */
+void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+{
+ mmap_write(fd, handle, offset, buf, length);
+}
+
+static void mmap_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (gem_has_llc(fd) || is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0,
+ offset + length, PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, 0);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_WC, 0);
+ }
+
+ igt_assert(map);
+ memcpy(buf, map + offset, length);
+ munmap(map, offset + length);
+}
+
/**
* gem_read:
* @fd: open i915 drm file descriptor
@@ -385,7 +480,7 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
*/
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ mmap_read(fd, handle, offset, buf, length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h
index 870ac8b7b..143a397ea 100644
--- a/lib/ioctl_wrappers.h
+++ b/lib/ioctl_wrappers.h
@@ -68,8 +68,10 @@ uint32_t gem_flink(int fd, uint32_t handle);
uint32_t gem_open(int fd, uint32_t name);
void gem_close(int fd, uint32_t handle);
int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
-void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
+void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
void gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
index 54c9befff..f26d5a79c 100644
--- a/tests/i915/gem_madvise.c
+++ b/tests/i915/gem_madvise.c
@@ -174,7 +174,7 @@ dontneed_before_exec(void)
memset(&exec, 0, sizeof(exec));
exec.handle = gem_create(fd, OBJECT_SIZE);
- gem_write(fd, exec.handle, 0, buf, sizeof(buf));
+ gem_pwrite(fd, exec.handle, 0, buf, sizeof(buf));
gem_madvise(fd, exec.handle, I915_MADV_DONTNEED);
execbuf.buffers_ptr = to_user_pointer(&exec);
diff --git a/tests/i915/gen9_exec_parse.c b/tests/i915/gen9_exec_parse.c
index 8cd82f568..b5bb3fb20 100644
--- a/tests/i915/gen9_exec_parse.c
+++ b/tests/i915/gen9_exec_parse.c
@@ -144,7 +144,7 @@ static int __exec_batch(int i915, int engine, uint32_t cmd_bo,
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 obj[1];
- gem_write(i915, cmd_bo, 0, cmds, size);
+ gem_pwrite(i915, cmd_bo, 0, cmds, size);
memset(obj, 0, sizeof(obj));
obj[0].handle = cmd_bo;
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
index 38e2026aa..3f3b5f602 100644
--- a/tests/prime_vgem.c
+++ b/tests/prime_vgem.c
@@ -59,7 +59,7 @@ static void test_read(int vgem, int i915)
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, i);
}
gem_close(i915, handle);
@@ -94,14 +94,14 @@ static void test_fence_read(int i915, int vgem)
close(slave[1]);
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, 0);
}
write(master[1], &child, sizeof(child));
read(slave[0], &child, sizeof(child));
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, i);
}
gem_close(i915, handle);
@@ -279,7 +279,7 @@ static void test_write(int vgem, int i915)
gem_close(vgem, scratch.handle);
for (i = 0; i < 1024; i++)
- gem_write(i915, handle, 4096*i, &i, sizeof(i));
+ gem_pwrite(i915, handle, 4096*i, &i, sizeof(i));
gem_close(i915, handle);
for (i = 0; i < 1024; i++)
--
2.27.0.112.g101b3204f3
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write
@ 2020-09-01 18:18 Ashutosh Dixit
0 siblings, 0 replies; 16+ messages in thread
From: Ashutosh Dixit @ 2020-09-01 18:18 UTC (permalink / raw)
To: igt-dev
FOR CI ONLY. PLEASE DON'T REVIEW.
Trial patch to replace PREAD/PWRITE ioctls with mmap + memcpy in gem_read/write.
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 107 +++++++++++++++++++++++++++++++--
lib/ioctl_wrappers.h | 6 +-
tests/i915/gem_madvise.c | 2 +-
tests/i915/gem_userptr_blits.c | 2 +-
tests/i915/gen9_exec_parse.c | 2 +-
tests/prime_vgem.c | 14 ++---
6 files changed, 115 insertions(+), 18 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 3781286d8..4d58c6e4f 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -55,6 +55,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -323,7 +324,7 @@ void gem_close(int fd, uint32_t handle)
do_ioctl(fd, DRM_IOCTL_GEM_CLOSE, &close_bo);
}
-int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+int __gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
struct drm_i915_gem_pwrite gem_pwrite;
int err;
@@ -341,7 +342,7 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
}
/**
- * gem_write:
+ * gem_pwrite:
* @fd: open i915 drm file descriptor
* @handle: gem buffer object handle
* @offset: offset within the buffer of the subrange
@@ -351,12 +352,12 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
* This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
* of a gem buffer object.
*/
-void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
- igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
+ igt_assert_eq(__gem_pwrite(fd, handle, offset, buf, length), 0);
}
-int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+int __gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
struct drm_i915_gem_pread gem_pread;
int err;
@@ -372,6 +373,100 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
err = -errno;
return err;
}
+/**
+ * gem_pread:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to read into
+ * @length: size of the subrange
+ *
+ * This wraps the PREAD ioctl, which is to download a linear data to a subrange
+ * of a gem buffer object.
+ */
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ igt_assert_eq(__gem_pread(fd, handle, offset, buf, length), 0);
+}
+
+static bool is_cache_coherent(int fd, uint32_t handle)
+{
+ return gem_get_caching(fd, handle) != I915_CACHING_NONE;
+}
+
+static void mmap_write(int fd, uint32_t handle, uint64_t offset,
+ const void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
+ }
+
+ igt_assert(map);
+ memcpy(map + offset, buf, length);
+ munmap(map, offset + length);
+}
+
+/**
+ * gem_write:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to write into the buffer
+ * @length: size of the subrange
+ *
+ * This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
+ * of a gem buffer object.
+ */
+void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+{
+ mmap_write(fd, handle, offset, buf, length);
+}
+
+static void mmap_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (gem_has_llc(fd) || is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0,
+ offset + length, PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, 0);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_WC, 0);
+ }
+
+ igt_assert(map);
+ memcpy(buf, map + offset, length);
+ munmap(map, offset + length);
+}
+
/**
* gem_read:
* @fd: open i915 drm file descriptor
@@ -385,7 +480,7 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
*/
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ mmap_read(fd, handle, offset, buf, length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h
index 870ac8b7b..5f83b0827 100644
--- a/lib/ioctl_wrappers.h
+++ b/lib/ioctl_wrappers.h
@@ -67,9 +67,11 @@ uint32_t gem_get_caching(int fd, uint32_t handle);
uint32_t gem_flink(int fd, uint32_t handle);
uint32_t gem_open(int fd, uint32_t name);
void gem_close(int fd, uint32_t handle);
-int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
+int __gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
+int __gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
-int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
void gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
index 54c9befff..c88e74c7c 100644
--- a/tests/i915/gem_madvise.c
+++ b/tests/i915/gem_madvise.c
@@ -157,7 +157,7 @@ dontneed_before_pwrite(void)
handle = gem_create(fd, OBJECT_SIZE);
gem_madvise(fd, handle, I915_MADV_DONTNEED);
- igt_assert_eq(__gem_write(fd, handle, 0, &bbe, sizeof(bbe)), -EFAULT);
+ igt_assert_eq(__gem_pwrite(fd, handle, 0, &bbe, sizeof(bbe)), -EFAULT);
close(fd);
}
diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c
index 268423dcd..9de8b76a9 100644
--- a/tests/i915/gem_userptr_blits.c
+++ b/tests/i915/gem_userptr_blits.c
@@ -1429,7 +1429,7 @@ static void test_readonly_pwrite(int i915)
char data[4096];
memset(data, page, sizeof(data));
- igt_assert_eq(__gem_write(i915, handle, page << 12, data, sizeof(data)), -EINVAL);
+ igt_assert_eq(__gem_pwrite(i915, handle, page << 12, data, sizeof(data)), -EINVAL);
}
gem_close(i915, handle);
diff --git a/tests/i915/gen9_exec_parse.c b/tests/i915/gen9_exec_parse.c
index 8cd82f568..15a843481 100644
--- a/tests/i915/gen9_exec_parse.c
+++ b/tests/i915/gen9_exec_parse.c
@@ -670,7 +670,7 @@ static void test_invalid_length(const int i915, const uint32_t handle)
lri_ok, 4096,
0);
- igt_assert_eq(__gem_write(i915, handle, 0, noops, 4097), -EINVAL);
+ igt_assert_eq(__gem_pwrite(i915, handle, 0, noops, 4097), -EINVAL);
}
struct reg {
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
index 38e2026aa..b56eb8091 100644
--- a/tests/prime_vgem.c
+++ b/tests/prime_vgem.c
@@ -48,7 +48,7 @@ static void test_read(int vgem, int i915)
handle = prime_fd_to_handle(i915, dmabuf);
close(dmabuf);
- igt_skip_on_f(__gem_read(i915, handle, 0, &i, sizeof(i)),
+ igt_skip_on_f(__gem_pread(i915, handle, 0, &i, sizeof(i)),
"PREAD from dma-buf not supported on this hardware\n");
ptr = vgem_mmap(vgem, &scratch, PROT_WRITE);
@@ -59,7 +59,7 @@ static void test_read(int vgem, int i915)
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, i);
}
gem_close(i915, handle);
@@ -86,7 +86,7 @@ static void test_fence_read(int i915, int vgem)
handle = prime_fd_to_handle(i915, dmabuf);
close(dmabuf);
- igt_skip_on_f(__gem_read(i915, handle, 0, &i, sizeof(i)),
+ igt_skip_on_f(__gem_pread(i915, handle, 0, &i, sizeof(i)),
"PREAD from dma-buf not supported on this hardware\n");
igt_fork(child, 1) {
@@ -94,14 +94,14 @@ static void test_fence_read(int i915, int vgem)
close(slave[1]);
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, 0);
}
write(master[1], &child, sizeof(child));
read(slave[0], &child, sizeof(child));
for (i = 0; i < 1024; i++) {
uint32_t tmp;
- gem_read(i915, handle, 4096*i, &tmp, sizeof(tmp));
+ gem_pread(i915, handle, 4096*i, &tmp, sizeof(tmp));
igt_assert_eq(tmp, i);
}
gem_close(i915, handle);
@@ -272,14 +272,14 @@ static void test_write(int vgem, int i915)
handle = prime_fd_to_handle(i915, dmabuf);
close(dmabuf);
- igt_skip_on_f(__gem_write(i915, handle, 0, &i, sizeof(i)),
+ igt_skip_on_f(__gem_pwrite(i915, handle, 0, &i, sizeof(i)),
"PWRITE to dma-buf not supported on this hardware\n");
ptr = vgem_mmap(vgem, &scratch, PROT_READ);
gem_close(vgem, scratch.handle);
for (i = 0; i < 1024; i++)
- gem_write(i915, handle, 4096*i, &i, sizeof(i));
+ gem_pwrite(i915, handle, 4096*i, &i, sizeof(i));
gem_close(i915, handle);
for (i = 0; i < 1024; i++)
--
2.27.0.112.g101b3204f3
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write
@ 2020-09-01 17:45 Ashutosh Dixit
0 siblings, 0 replies; 16+ messages in thread
From: Ashutosh Dixit @ 2020-09-01 17:45 UTC (permalink / raw)
To: igt-dev
FOR CI ONLY. PLEASE DON'T REVIEW.
Trial patch to replace PREAD/PWRITE ioctls with mmap + memcpy in gem_read/write.
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 107 +++++++++++++++++++++++++++++++--
lib/ioctl_wrappers.h | 6 +-
tests/i915/gem_madvise.c | 2 +-
tests/i915/gem_userptr_blits.c | 2 +-
tests/i915/gen9_exec_parse.c | 2 +-
tests/prime_vgem.c | 6 +-
6 files changed, 111 insertions(+), 14 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 3781286d8..4d58c6e4f 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -55,6 +55,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -323,7 +324,7 @@ void gem_close(int fd, uint32_t handle)
do_ioctl(fd, DRM_IOCTL_GEM_CLOSE, &close_bo);
}
-int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+int __gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
struct drm_i915_gem_pwrite gem_pwrite;
int err;
@@ -341,7 +342,7 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
}
/**
- * gem_write:
+ * gem_pwrite:
* @fd: open i915 drm file descriptor
* @handle: gem buffer object handle
* @offset: offset within the buffer of the subrange
@@ -351,12 +352,12 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
* This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
* of a gem buffer object.
*/
-void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
- igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
+ igt_assert_eq(__gem_pwrite(fd, handle, offset, buf, length), 0);
}
-int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+int __gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
struct drm_i915_gem_pread gem_pread;
int err;
@@ -372,6 +373,100 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
err = -errno;
return err;
}
+/**
+ * gem_pread:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to read into
+ * @length: size of the subrange
+ *
+ * This wraps the PREAD ioctl, which is to download a linear data to a subrange
+ * of a gem buffer object.
+ */
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ igt_assert_eq(__gem_pread(fd, handle, offset, buf, length), 0);
+}
+
+static bool is_cache_coherent(int fd, uint32_t handle)
+{
+ return gem_get_caching(fd, handle) != I915_CACHING_NONE;
+}
+
+static void mmap_write(int fd, uint32_t handle, uint64_t offset,
+ const void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
+ }
+
+ igt_assert(map);
+ memcpy(map + offset, buf, length);
+ munmap(map, offset + length);
+}
+
+/**
+ * gem_write:
+ * @fd: open i915 drm file descriptor
+ * @handle: gem buffer object handle
+ * @offset: offset within the buffer of the subrange
+ * @buf: pointer to the data to write into the buffer
+ * @length: size of the subrange
+ *
+ * This wraps the PWRITE ioctl, which is to upload a linear data to a subrange
+ * of a gem buffer object.
+ */
+void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
+{
+ mmap_write(fd, handle, offset, buf, length);
+}
+
+static void mmap_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
+{
+ void *map = NULL;
+
+ if (gem_has_llc(fd) || is_cache_coherent(fd, handle)) {
+ /* offset arg for mmap functions must be 0 */
+ map = __gem_mmap__cpu_coherent(fd, handle, 0,
+ offset + length, PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, 0);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_WC, 0);
+ }
+
+ igt_assert(map);
+ memcpy(buf, map + offset, length);
+ munmap(map, offset + length);
+}
+
/**
* gem_read:
* @fd: open i915 drm file descriptor
@@ -385,7 +480,7 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
*/
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ mmap_read(fd, handle, offset, buf, length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h
index 870ac8b7b..5f83b0827 100644
--- a/lib/ioctl_wrappers.h
+++ b/lib/ioctl_wrappers.h
@@ -67,9 +67,11 @@ uint32_t gem_get_caching(int fd, uint32_t handle);
uint32_t gem_flink(int fd, uint32_t handle);
uint32_t gem_open(int fd, uint32_t name);
void gem_close(int fd, uint32_t handle);
-int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
+int __gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
+void gem_pwrite(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
+int __gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
+void gem_pread(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length);
-int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length);
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
void gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write);
diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
index 54c9befff..c88e74c7c 100644
--- a/tests/i915/gem_madvise.c
+++ b/tests/i915/gem_madvise.c
@@ -157,7 +157,7 @@ dontneed_before_pwrite(void)
handle = gem_create(fd, OBJECT_SIZE);
gem_madvise(fd, handle, I915_MADV_DONTNEED);
- igt_assert_eq(__gem_write(fd, handle, 0, &bbe, sizeof(bbe)), -EFAULT);
+ igt_assert_eq(__gem_pwrite(fd, handle, 0, &bbe, sizeof(bbe)), -EFAULT);
close(fd);
}
diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c
index 268423dcd..9de8b76a9 100644
--- a/tests/i915/gem_userptr_blits.c
+++ b/tests/i915/gem_userptr_blits.c
@@ -1429,7 +1429,7 @@ static void test_readonly_pwrite(int i915)
char data[4096];
memset(data, page, sizeof(data));
- igt_assert_eq(__gem_write(i915, handle, page << 12, data, sizeof(data)), -EINVAL);
+ igt_assert_eq(__gem_pwrite(i915, handle, page << 12, data, sizeof(data)), -EINVAL);
}
gem_close(i915, handle);
diff --git a/tests/i915/gen9_exec_parse.c b/tests/i915/gen9_exec_parse.c
index 8cd82f568..15a843481 100644
--- a/tests/i915/gen9_exec_parse.c
+++ b/tests/i915/gen9_exec_parse.c
@@ -670,7 +670,7 @@ static void test_invalid_length(const int i915, const uint32_t handle)
lri_ok, 4096,
0);
- igt_assert_eq(__gem_write(i915, handle, 0, noops, 4097), -EINVAL);
+ igt_assert_eq(__gem_pwrite(i915, handle, 0, noops, 4097), -EINVAL);
}
struct reg {
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
index 38e2026aa..ee9d866db 100644
--- a/tests/prime_vgem.c
+++ b/tests/prime_vgem.c
@@ -48,7 +48,7 @@ static void test_read(int vgem, int i915)
handle = prime_fd_to_handle(i915, dmabuf);
close(dmabuf);
- igt_skip_on_f(__gem_read(i915, handle, 0, &i, sizeof(i)),
+ igt_skip_on_f(__gem_pread(i915, handle, 0, &i, sizeof(i)),
"PREAD from dma-buf not supported on this hardware\n");
ptr = vgem_mmap(vgem, &scratch, PROT_WRITE);
@@ -86,7 +86,7 @@ static void test_fence_read(int i915, int vgem)
handle = prime_fd_to_handle(i915, dmabuf);
close(dmabuf);
- igt_skip_on_f(__gem_read(i915, handle, 0, &i, sizeof(i)),
+ igt_skip_on_f(__gem_pread(i915, handle, 0, &i, sizeof(i)),
"PREAD from dma-buf not supported on this hardware\n");
igt_fork(child, 1) {
@@ -272,7 +272,7 @@ static void test_write(int vgem, int i915)
handle = prime_fd_to_handle(i915, dmabuf);
close(dmabuf);
- igt_skip_on_f(__gem_write(i915, handle, 0, &i, sizeof(i)),
+ igt_skip_on_f(__gem_pwrite(i915, handle, 0, &i, sizeof(i)),
"PWRITE to dma-buf not supported on this hardware\n");
ptr = vgem_mmap(vgem, &scratch, PROT_READ);
--
2.27.0.112.g101b3204f3
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write
@ 2020-09-01 2:52 Ashutosh Dixit
0 siblings, 0 replies; 16+ messages in thread
From: Ashutosh Dixit @ 2020-09-01 2:52 UTC (permalink / raw)
To: igt-dev
FOR CI ONLY. PLEASE DON'T REVIEW.
Trial patch to replace PREAD/PWRITE ioctls with mmap + memcpy in
gem_read/write.
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 65 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 63 insertions(+), 2 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 3781286d8..7c985fe41 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -55,6 +55,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -340,6 +341,11 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
return err;
}
+static bool is_cache_coherent(int fd, uint32_t handle)
+{
+ return gem_get_caching(fd, handle) != I915_CACHING_NONE;
+}
+
/**
* gem_write:
* @fd: open i915 drm file descriptor
@@ -353,7 +359,36 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
*/
void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
- igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
+ void *map = NULL;
+
+ if (is_cache_coherent(fd, handle)) {
+ map = __gem_mmap_offset__cpu(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (!map)
+ map = __gem_mmap__cpu(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_CPU,
+ I915_GEM_DOMAIN_CPU);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
+ }
+
+ igt_assert(map);
+ memcpy(map + offset, buf, length);
+ munmap(map, offset + length);
}
int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
@@ -385,7 +420,33 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
*/
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ void *map = NULL;
+
+ if (gem_has_llc(fd) || is_cache_coherent(fd, handle)) {
+ map = __gem_mmap_offset__cpu(fd, handle, 0,
+ offset + length, PROT_READ);
+ if (!map)
+ map = __gem_mmap__cpu(fd, handle, 0, offset + length,
+ PROT_READ);
+
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, 0);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_WC, 0);
+ }
+
+ igt_assert(map);
+ memcpy(buf, map + offset, length);
+ munmap(map, offset + length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
--
2.27.0.112.g101b3204f3
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write
@ 2020-09-01 1:58 Ashutosh Dixit
0 siblings, 0 replies; 16+ messages in thread
From: Ashutosh Dixit @ 2020-09-01 1:58 UTC (permalink / raw)
To: igt-dev
FOR CI ONLY. PLEASE DON'T REVIEW.
Trial patch to replace PREAD/PWRITE ioctls with mmap + memcpy in
gem_read/write.
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 46 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 44 insertions(+), 2 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 3781286d8..0b90f4c1a 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -55,6 +55,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -340,6 +341,11 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
return err;
}
+static bool is_cache_coherent(int fd, uint32_t handle)
+{
+ return gem_get_caching(fd, handle) != I915_CACHING_NONE;
+}
+
/**
* gem_write:
* @fd: open i915 drm file descriptor
@@ -353,7 +359,26 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
*/
void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
- igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
+ void *map = NULL;
+
+ if (is_cache_coherent(fd, handle)) {
+ map = __gem_mmap__cpu_coherent(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+ }
+
+ if (!map) {
+ map = __gem_mmap__device_coherent(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
+ }
+
+ memcpy(map + offset, buf, length);
+ munmap(map, offset + length);
}
int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
@@ -385,7 +410,24 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
*/
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ void *map = NULL;
+
+ if (gem_has_llc(fd) || is_cache_coherent(fd, handle)) {
+ map = __gem_mmap__cpu_coherent(fd, handle, 0,
+ offset + length, PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, 0);
+ }
+
+ if (!map) {
+ map = __gem_mmap__device_coherent(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_WC, 0);
+ }
+
+ memcpy(buf, map + offset, length);
+ munmap(map, offset + length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
--
2.27.0.112.g101b3204f3
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write
@ 2020-08-31 22:52 Ashutosh Dixit
0 siblings, 0 replies; 16+ messages in thread
From: Ashutosh Dixit @ 2020-08-31 22:52 UTC (permalink / raw)
To: igt-dev
FOR CI ONLY. PLEASE DON'T REVIEW.
Trial patch to replace PREAD/PWRITE ioctls with mmap + memcpy in
gem_read/write.
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 61 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 59 insertions(+), 2 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 3781286d8..b8e7118da 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -55,6 +55,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -340,6 +341,11 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
return err;
}
+static bool is_cache_coherent(int fd, uint32_t handle)
+{
+ return gem_get_caching(fd, handle) != I915_CACHING_NONE;
+}
+
/**
* gem_write:
* @fd: open i915 drm file descriptor
@@ -353,7 +359,34 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
*/
void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
- igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
+ void *map = NULL;
+
+ if (is_cache_coherent(fd, handle)) {
+ map = __gem_mmap_offset__cpu(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (!map)
+ map = __gem_mmap__cpu(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+
+ if (map)
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_CPU,
+ I915_GEM_DOMAIN_CPU);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ | PROT_WRITE);
+
+ gem_set_domain(fd, handle,
+ I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC);
+ }
+
+ memcpy(map + offset, buf, length);
+ munmap(map, offset + length);
}
int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
@@ -385,7 +418,31 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
*/
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ void *map = NULL;
+
+ if (gem_has_llc(fd) || is_cache_coherent(fd, handle)) {
+ map = __gem_mmap_offset__cpu(fd, handle, 0,
+ offset + length, PROT_READ);
+ if (!map)
+ map = __gem_mmap__cpu(fd, handle, 0, offset + length,
+ PROT_READ);
+
+ if (map)
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, 0);
+ }
+
+ if (!map) {
+ map = __gem_mmap_offset__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+ if (!map)
+ map = gem_mmap__wc(fd, handle, 0, offset + length,
+ PROT_READ);
+
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_WC, 0);
+ }
+
+ memcpy(buf, map + offset, length);
+ munmap(map, offset + length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
--
2.27.0.112.g101b3204f3
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write
@ 2020-08-31 20:24 Ashutosh Dixit
0 siblings, 0 replies; 16+ messages in thread
From: Ashutosh Dixit @ 2020-08-31 20:24 UTC (permalink / raw)
To: igt-dev
Trial patch to replace PREAD/PWRITE ioctls with mmap + memcpy in
gem_read/write. For CI only. Please don't review.
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 3781286d8..889dec3f0 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -55,6 +55,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -353,7 +354,12 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
*/
void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
- igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
+ /* offset arg of gem_mmap__device_coherent must be 0 */
+ void *ptr = gem_mmap__cpu_coherent(fd, handle, 0, offset + length, PROT_WRITE);
+
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+ memcpy(ptr + offset, buf, length);
+ munmap(ptr, offset + length);
}
int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
@@ -385,7 +391,12 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
*/
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ /* offset arg of gem_mmap__device_coherent must be 0 */
+ void *ptr = gem_mmap__cpu_coherent(fd, handle, 0, offset + length, PROT_READ);
+
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+ memcpy(buf, ptr + offset, length);
+ munmap(ptr, offset + length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
--
2.27.0.112.g101b3204f3
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write
@ 2020-08-29 5:09 Ashutosh Dixit
0 siblings, 0 replies; 16+ messages in thread
From: Ashutosh Dixit @ 2020-08-29 5:09 UTC (permalink / raw)
To: igt-dev
Trial patch to replace PREAD/PWRITE ioctls with mmap + memcpy in
gem_read/write. For CI only. Please don't review.
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 3781286d8..77752e8db 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -55,6 +55,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -353,7 +354,11 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
*/
void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
- igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
+ /* offset arg of gem_mmap__device_coherent must be 0 */
+ void *ptr = gem_mmap__device_coherent(fd, handle, 0, offset + length, PROT_WRITE);
+
+ memcpy(ptr + offset, buf, length);
+ munmap(ptr, offset + length);
}
int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
@@ -385,7 +390,11 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
*/
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ /* offset arg of gem_mmap__device_coherent must be 0 */
+ void *ptr = gem_mmap__device_coherent(fd, handle, 0, offset + length, PROT_READ);
+
+ memcpy(buf, ptr + offset, length);
+ munmap(ptr, offset + length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
--
2.26.2.108.g048abe1751
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write
@ 2020-08-29 3:32 Ashutosh Dixit
0 siblings, 0 replies; 16+ messages in thread
From: Ashutosh Dixit @ 2020-08-29 3:32 UTC (permalink / raw)
To: igt-dev
Trial patch to replace PREAD/PWRITE ioctls with mmap + memcpy in
gem_read/write. For CI only. Please don't review.
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 3781286d8..076bcafa5 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -55,6 +55,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -353,7 +354,11 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
*/
void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
- igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
+ /* offset arg of gem_mmap__device_coherent must be 0 */
+ void *ptr = gem_mmap__device_coherent(fd, handle, 0, offset + length, PROT_WRITE);
+
+ memcpy(ptr + offset, buf + offset, length);
+ munmap(ptr, offset + length);
}
int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
@@ -385,7 +390,11 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
*/
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ /* offset arg of gem_mmap__device_coherent must be 0 */
+ void *ptr = gem_mmap__device_coherent(fd, handle, 0, offset + length, PROT_READ);
+
+ memcpy(buf + offset, ptr + offset, length);
+ munmap(ptr, offset + length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
--
2.26.2.108.g048abe1751
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write
@ 2020-08-29 1:53 Ashutosh Dixit
0 siblings, 0 replies; 16+ messages in thread
From: Ashutosh Dixit @ 2020-08-29 1:53 UTC (permalink / raw)
To: igt-dev
Trial patch to replace PREAD/PWRITE ioctls with mmap + memcpy in
gem_read/write. For CI only. Please don't review.
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
lib/ioctl_wrappers.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 3781286d8..6955a0a09 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -55,6 +55,7 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
#include "config.h"
+#include "i915/gem_mman.h"
#ifdef HAVE_VALGRIND
#include <valgrind/valgrind.h>
@@ -353,7 +354,10 @@ int __gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint6
*/
void gem_write(int fd, uint32_t handle, uint64_t offset, const void *buf, uint64_t length)
{
- igt_assert_eq(__gem_write(fd, handle, offset, buf, length), 0);
+ void *ptr = gem_mmap__device_coherent(fd, handle, offset, length, PROT_WRITE);
+
+ memcpy(ptr, buf + offset, length);
+ munmap(ptr, length);
}
int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
@@ -385,7 +389,10 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len
*/
void gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t length)
{
- igt_assert_eq(__gem_read(fd, handle, offset, buf, length), 0);
+ void *ptr = gem_mmap__device_coherent(fd, handle, offset, length, PROT_READ);
+
+ memcpy(buf + offset, ptr, length);
+ munmap(ptr, length);
}
int __gem_set_domain(int fd, uint32_t handle, uint32_t read, uint32_t write)
--
2.26.2.108.g048abe1751
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2021-03-15 22:54 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-15 21:16 [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write Ashutosh Dixit
2021-03-15 22:01 ` [igt-dev] ✓ Fi.CI.BAT: success for lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write (rev16) Patchwork
2021-03-15 22:54 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2021-01-21 5:52 [igt-dev] [CI i-g-t] lib/ioctl_wrappers: Handle PREAD/PWRITE ioctls not supported in gem_read/write Ashutosh Dixit
2021-01-21 2:20 Ashutosh Dixit
2020-09-06 23:36 Ashutosh Dixit
2020-09-06 17:38 Ashutosh Dixit
2020-09-01 18:18 Ashutosh Dixit
2020-09-01 17:45 Ashutosh Dixit
2020-09-01 2:52 Ashutosh Dixit
2020-09-01 1:58 Ashutosh Dixit
2020-08-31 22:52 Ashutosh Dixit
2020-08-31 20:24 Ashutosh Dixit
2020-08-29 5:09 Ashutosh Dixit
2020-08-29 3:32 Ashutosh Dixit
2020-08-29 1:53 Ashutosh Dixit
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.