lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls
PATCH 1/2 lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls
The general direction at this time is to phase out pread/write ioctls and not support them in future products. This means IGT must be modified to handle the absence of pread/write ioctls. This patch does this as follows:
* __gem_read, gem_read, __gem_write and gem_write calls which are wrappers around the pread/pwrite ioctls have been renamed to __gem_pread, gem_pread, __gem_pwrite and gem_pwrite. These will now only be used where the pread/pwrite ioctls must absolutely be used, such as tests which test these ioctls or must otherwise only use the pread/pwrite ioctl's.
* The new gem_read and gem_write function calls are now treated as general purpose calls to read/write to a gem object. They now try doing the read/write using the pread/pwrite ioctls first but when these ioctls are unavailable they fall back to doing the read/write using a combination of mmap and memcpy.
--- lib/ioctl_wrappers.c | 165 +++++++++++++++++++++++++++++++-- lib/ioctl_wrappers.h | 9 +- tests/i915/gem_madvise.c | 3 +- tests/i915/gem_userptr_blits.c | 4 +- tests/i915/gen9_exec_parse.c | 6 +- tests/prime_vgem.c | 14 +-- 6 files changed, 181 insertions(+), 20 deletions(-)
lib/ioctl_wrappers.c +158 -7
@@ -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,29 @@ 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) +/** +* gem_has_pwrite +* @fd: open i915 drm file descriptor +* +* Feature test macro to query whether pwrite ioctl is supported +*/ +bool gem_has_pwrite (int fd) +{ +uint32_t handle =gem_create (fd,4096 ); +int buf, ret; + + ret =__gem_pwrite (fd, handle,0 , &buf,sizeof (buf)); +gem_close (fd, handle); + +return ret !=EOPNOTSUPP ; +} + +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;
@@ -373,7 +391,7 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t lenreturn err; }/** -* gem_read: +* gem_pread: * @fd: open i915 drm file descriptor * @handle: gem buffer object handle * @offset: offset within the buffer of the subrange
@@ -383,9 +401,142 @@ int __gem_read(int fd, uint32_t handle, uint64_t offset, void *buf, uint64_t len* 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 ); +} + +/** +* gem_has_pread +* @fd: open i915 drm file descriptor +* +* Feature test macro to query whether pread ioctl is supported +*/ +bool gem_has_pread (int fd) +{ +uint32_t handle =gem_create (fd,4096 ); +int buf, ret; + + ret =__gem_pread (fd, handle,0 , &buf,sizeof (buf)); +gem_close (fd, handle); + +return ret !=EOPNOTSUPP ; +} + +/** +* gem_require_pread_pwrite +* @fd: open i915 drm file descriptor +* +* Feature test macro to query whether pread/pwrite ioctls are supported +* and skip if they are not +*/ +void gem_require_pread_pwrite (int fd) +{ +igt_require (gem_has_pread (fd) &&gem_has_pwrite (fd)); +} + +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 +* +* General purpose method to write to a gem object. Uses the pwrite ioctl +* when it is available, else it uses mmap + memcpy for the write. +*/ +void gem_write (int fd,uint32_t handle,uint64_t offset,const void *buf,uint64_t length) +{ +int ret =__gem_pwrite (fd, handle, offset, buf, length); + +igt_assert (ret ==0 || ret ==EOPNOTSUPP ); + +if (ret ==EOPNOTSUPP ) +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 +* @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 +* +* General purpose method to read from a gem object. Uses the pread ioctl +* when it is available, else it uses mmap + memcpy for the read. +*/ 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 ); +int ret =__gem_pread (fd, handle, offset, buf, length); + +igt_assert (ret ==0 || ret ==EOPNOTSUPP ); + +if (ret ==EOPNOTSUPP ) +mmap_read (fd, handle, offset, buf, length); }int __gem_set_domain (int fd,uint32_t handle,uint32_t read,uint32_t write)
lib/ioctl_wrappers.h +7 -2
@@ -67,9 +67,14 @@ 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); +bool gem_has_pwrite (int fd); +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); +bool gem_has_pread (int fd); +void gem_require_pread_pwrite (int fd);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);
tests/i915/gem_madvise.c +2 -1
@@ -154,10 +154,11 @@ dontneed_before_pwrite(void)uint32_t bbe =MI_BATCH_BUFFER_END ;uint32_t handle; +gem_require_pread_pwrite (fd); 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); }
tests/i915/gem_userptr_blits.c +3 -1
@@ -890,6 +890,7 @@ static int test_forbidden_ops(int fd)uint32_t handle;void *ptr; +gem_require_pread_pwrite (fd);igt_assert (posix_memalign (&ptr,PAGE_SIZE ,PAGE_SIZE ) ==0 );gem_userptr (fd, ptr,PAGE_SIZE ,0 , userptr_flags, &handle);
@@ -1416,6 +1417,7 @@ static void test_readonly_pwrite(int i915)*/ igt_require (igt_setup_clflush ()); +gem_require_pread_pwrite (i915); sz =16 <<12 ; pages =mmap (NULL , sz,PROT_WRITE ,MAP_ANON |MAP_PRIVATE ,-1 ,0 );
@@ -1429,7 +1431,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);
tests/i915/gen9_exec_parse.c +4 -2
@@ -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 {
@@ -1029,8 +1029,10 @@ igt_main -EINVAL); } - igt_subtest("batch-invalid-length") + igt_subtest("batch-invalid-length") { +gem_require_pread_pwrite (i915);test_invalid_length (i915, handle); + } igt_subtest("basic-rejected")test_rejected (i915, handle, false);
tests/prime_vgem.c +7 -7
@@ -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++)
Signature · 6 lines
2.27.0.112.g101b3204f3 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH 2/2 tests/i915: Convert remaining sites to gem_pread/gem_pwrite
Convert remaining sites to where pread/pwrite ioctl's must absolutely be used to gem_pread() and gem_pwrite() calls.
v2: Added some more files missed out in v1
--- tests/i915/gem_partial_pwrite_pread.c | 9 ++++---- tests/i915/gem_pread.c | 9 ++++---- tests/i915/gem_pread_after_blit.c | 1 + tests/i915/gem_pwrite.c | 23 +++++++++++---------- tests/i915/gem_pwrite_snooped.c | 3 ++- tests/i915/gem_set_tiling_vs_pwrite.c | 5 +++-- tests/i915/gem_tiled_partial_pwrite_pread.c | 1 + tests/i915/gem_tiled_pread_basic.c | 3 ++- tests/i915/gem_tiled_pread_pwrite.c | 5 +++-- 9 files changed, 34 insertions(+), 25 deletions(-)
tests/i915/gem_partial_pwrite_pread.c +5 -4
@@ -149,7 +149,7 @@ static void test_partial_reads(data_t *data)blt_bo_fill (data, staging_buf, scratch_buf, val);get_range (&start, &len); -gem_read (data->drm_fd, scratch_buf->handle, start, tmp, len); +gem_pread (data->drm_fd, scratch_buf->handle, start, tmp, len);for (j =0 ; j < len; j++) { igt_assert_f(tmp[j] == val,
@@ -176,7 +176,7 @@ static void test_partial_writes(data_t *data)memset (tmp, i +63 ,BO_SIZE );get_range (&start, &len); -gem_write (data->drm_fd, scratch_buf->handle, start, tmp, len); +gem_pwrite (data->drm_fd, scratch_buf->handle, start, tmp, len);copy_bo (scratch_buf, staging_buf); gtt_ptr =__try_gtt_map_first (data, staging_buf,0 );
@@ -216,7 +216,7 @@ static void test_partial_read_writes(data_t *data)/* partial read */ get_range (&start, &len); -gem_read (data->drm_fd, scratch_buf->handle, start, tmp, len); +gem_pread (data->drm_fd, scratch_buf->handle, start, tmp, len);for (j =0 ; j < len; j++) { igt_assert_f(tmp[j] == val, "mismatch in read at %i [%i + %i], got: %i, expected: %i\n",
@@ -232,7 +232,7 @@ static void test_partial_read_writes(data_t *data)memset (tmp, i +63 ,BO_SIZE );get_range (&start, &len); -gem_write (data->drm_fd, scratch_buf->handle, start, tmp, len); +gem_pwrite (data->drm_fd, scratch_buf->handle, start, tmp, len);copy_bo (scratch_buf, staging_buf); gtt_ptr =__try_gtt_map_first (data, staging_buf,0 );
@@ -284,6 +284,7 @@ igt_main data.drm_fd =drm_open_driver (DRIVER_INTEL );igt_require_gem (data.drm_fd);gem_require_blitter (data.drm_fd); +gem_require_pread_pwrite (data.drm_fd); data.devid =intel_get_drm_devid (data.drm_fd); data.bops =buf_ops_create (data.drm_fd);
tests/i915/gem_pread.c +5 -4
@@ -63,9 +63,9 @@ static void pread_self(int i915)uint32_t handle =gem_create (i915,MiB (4 ));void *ptr = (*fn)(i915, handle,0 ,MiB (4 ),PROT_WRITE ); -gem_read (i915, handle,0 , ptr +MiB (3 ),MiB (1 )); -gem_read (i915, handle,MiB (3 ), ptr,MiB (1 )); -gem_read (i915, handle,MiB (1 ), ptr +MiB (1 ),MiB (2 )); +gem_pread (i915, handle,0 , ptr +MiB (3 ),MiB (1 )); +gem_pread (i915, handle,MiB (3 ), ptr,MiB (1 )); +gem_pread (i915, handle,MiB (1 ), ptr +MiB (1 ),MiB (2 ));munmap (ptr,MiB (4 ));gem_close (i915, handle);
@@ -80,7 +80,7 @@ static void pread_self(int i915)static void do_gem_read (int fd,uint32_t handle,void *buf,int len,int loops) {while (loops--) -gem_read (fd, handle,0 , buf, len); +gem_pread (fd, handle,0 , buf, len); } static double elapsed(const struct timeval *start,
@@ -149,6 +149,7 @@ igt_main_args("s:", NULL, help_str, opt_handler, NULL) igt_fixture { fd =drm_open_driver (DRIVER_INTEL ); +gem_require_pread_pwrite (fd); dst =gem_create (fd, object_size); src =malloc (object_size);
tests/i915/gem_pread_after_blit.c +1 -0
@@ -212,6 +212,7 @@ igt_main igt_fixture { fd =drm_open_driver (DRIVER_INTEL );igt_require_gem (fd); +gem_require_pread_pwrite (fd); bufmgr =drm_intel_bufmgr_gem_init (fd,4096 );drm_intel_bufmgr_gem_enable_reuse (bufmgr);
tests/i915/gem_pwrite.c +12 -11
@@ -66,9 +66,9 @@ static void pwrite_self(int i915)uint32_t handle =gem_create (i915,MiB (4 ));void *ptr = (*fn)(i915, handle,0 ,MiB (4 ),PROT_READ ); -gem_write (i915, handle,0 , ptr +MiB (3 ),MiB (1 )); -gem_write (i915, handle,MiB (3 ), ptr,MiB (1 )); -gem_write (i915, handle,MiB (1 ), ptr +MiB (1 ),MiB (2 )); +gem_pwrite (i915, handle,0 , ptr +MiB (3 ),MiB (1 )); +gem_pwrite (i915, handle,MiB (3 ), ptr,MiB (1 )); +gem_pwrite (i915, handle,MiB (1 ), ptr +MiB (1 ),MiB (2 ));munmap (ptr,MiB (4 ));gem_close (i915, handle);
@@ -86,7 +86,7 @@ static void pwrite_self(int i915)static void do_gem_write (int fd,uint32_t handle,void *buf,int len,int loops) {while (loops--) -gem_write (fd, handle,0 , buf, len); +gem_pwrite (fd, handle,0 , buf, len); } static double elapsed(const struct timeval *start,
@@ -145,8 +145,8 @@ static void test_big_cpu(int fd, int scale, unsigned flags)int suboffset = (offset >>12 ) % (4096 -sizeof (offset));uint64_t tmp; -gem_write (fd, handle, offset + suboffset, &offset,sizeof (offset)); -gem_read (fd, handle, offset + suboffset, &tmp,sizeof (tmp)); +gem_pwrite (fd, handle, offset + suboffset, &offset,sizeof (offset)); +gem_pread (fd, handle, offset + suboffset, &tmp,sizeof (tmp));igt_assert_eq_u64 (offset, tmp); } }
@@ -157,8 +157,8 @@ static void test_big_cpu(int fd, int scale, unsigned flags)int suboffset =4096 - (offset % (4096 -sizeof (offset)));uint64_t tmp; -gem_write (fd, handle, (offset<<12 ) + suboffset, &offset,sizeof (offset)); -gem_read (fd, handle, (offset<<12 ) + suboffset, &tmp,sizeof (tmp)); +gem_pwrite (fd, handle, (offset<<12 ) + suboffset, &offset,sizeof (offset)); +gem_pread (fd, handle, (offset<<12 ) + suboffset, &tmp,sizeof (tmp));igt_assert_eq_u64 (offset, tmp); } }
@@ -169,8 +169,8 @@ static void test_big_cpu(int fd, int scale, unsigned flags)uint64_t tmp =rand () % (size >>12 );int suboffset = tmp % (4096 -sizeof (offset)); -gem_write (fd, handle, (tmp <<12 ) + suboffset, &offset,sizeof (offset)); -gem_read (fd, handle, (tmp <<12 ) + suboffset, &tmp,sizeof (tmp)); +gem_pwrite (fd, handle, (tmp <<12 ) + suboffset, &offset,sizeof (offset)); +gem_pread (fd, handle, (tmp <<12 ) + suboffset, &tmp,sizeof (tmp));igt_assert_eq_u64 (offset, tmp); } }
@@ -263,7 +263,7 @@ static void test_random(int fd)uint64_t a =hars_petruska_f54_1_random64 (&prng) % (size /sizeof (uint64_t ));uint64_t x =hars_petruska_f54_1_random64 (&prng); -gem_write (fd, handle, a *sizeof (x), &x,sizeof (x)); +gem_pwrite (fd, handle, a *sizeof (x), &x,sizeof (x));gem_set_domain (fd, handle,I915_GEM_DOMAIN_WC ,0 );igt_assert_eq_u64 (map[a], x);
@@ -317,6 +317,7 @@ igt_main_args("s:", NULL, help_str, opt_handler, NULL) igt_fixture { fd =drm_open_driver (DRIVER_INTEL ); +gem_require_pread_pwrite (fd); dst =gem_create (fd, object_size); src =malloc (object_size);
tests/i915/gem_pwrite_snooped.c +2 -1
@@ -115,7 +115,7 @@ static void test(int w, int h)gem_set_caching (fd, src->handle,I915_CACHING_CACHED ); -gem_write (fd, src->handle,0 , buf, object_size); +gem_pwrite (fd, src->handle,0 , buf, object_size);gem_set_caching (fd, src->handle,I915_CACHING_NONE );
@@ -132,6 +132,7 @@ igt_simple_main fd =drm_open_driver (DRIVER_INTEL );igt_require_gem (fd);gem_require_blitter (fd); +gem_require_pread_pwrite (fd); devid =intel_get_drm_devid (fd); bufmgr =drm_intel_bufmgr_gem_init (fd,4096 );
tests/i915/gem_set_tiling_vs_pwrite.c +3 -2
@@ -55,6 +55,7 @@ igt_simple_main fd =drm_open_driver (DRIVER_INTEL );igt_require (gem_available_fences (fd) >0 ); +gem_require_pread_pwrite (fd);for (int i =0 ; i <OBJECT_SIZE /4 ; i++) data[i] = i;
@@ -72,7 +73,7 @@ igt_simple_main }igt_info ("testing pwrite on tiled buffer\n" ); -gem_write (fd, handle,0 , data,OBJECT_SIZE ); +gem_pwrite (fd, handle,0 , data,OBJECT_SIZE );memset (data,0 ,OBJECT_SIZE );gem_read (fd, handle,0 , data,OBJECT_SIZE );for (int i =0 ; i <OBJECT_SIZE /4 ; i++)
@@ -88,7 +89,7 @@ igt_simple_maingem_set_tiling (fd, handle,I915_TILING_NONE ,0 );igt_info ("testing pwrite on untiled, but still fenced buffer\n" ); -gem_write (fd, handle,0 , data,OBJECT_SIZE ); +gem_pwrite (fd, handle,0 , data,OBJECT_SIZE );memset (data,0 ,OBJECT_SIZE );gem_read (fd, handle,0 , data,OBJECT_SIZE );for (int i =0 ; i <OBJECT_SIZE /4 ; i++)
tests/i915/gem_tiled_partial_pwrite_pread.c +1 -0
@@ -270,6 +270,7 @@ igt_mainigt_require_gem (fd);gem_require_mappable_ggtt (fd);gem_require_blitter (fd); +gem_require_pread_pwrite (fd); bufmgr =drm_intel_bufmgr_gem_init (fd,4096 );//drm_intel_bufmgr_gem_enable_reuse(bufmgr);
tests/i915/gem_tiled_pread_basic.c +2 -1
@@ -127,6 +127,7 @@ igt_simple_mainigt_require (gem_available_fences (fd) >0 ); handle =create_bo (fd);igt_require (gem_get_tiling (fd, handle, &tiling, &swizzle)); +gem_require_pread_pwrite (fd); devid =intel_get_drm_devid (fd);
@@ -160,7 +161,7 @@ igt_simple_main len = size; } -gem_read (fd, handle, offset, linear, len); +gem_pread (fd, handle, offset, linear, len);/* Translate from offsets in the read buffer to the swizzled * address that it corresponds to. This is the opposite of
tests/i915/gem_tiled_pread_pwrite.c +3 -2
@@ -114,6 +114,7 @@ igt_simple_main fd =drm_open_driver (DRIVER_INTEL );igt_require (gem_available_fences (fd) >0 ); +gem_require_pread_pwrite (fd); count =gem_available_fences (fd) +1 ;intel_require_memory (2 * count,sizeof (linear),CHECK_RAM );
@@ -128,10 +129,10 @@ igt_simple_main handle =create_bo_and_fill (fd);igt_require (gem_get_tiling (fd, handle, &tiling, &swizzle)); -gem_read (fd, handle,0 , linear,sizeof (linear)); +gem_pread (fd, handle,0 , linear,sizeof (linear)); handle_target =create_bo (fd); -gem_write (fd, handle_target,0 , linear,sizeof (linear)); +gem_pwrite (fd, handle_target,0 , linear,sizeof (linear));/* Check the target bo's contents. */ data =gem_mmap__gtt (fd, handle_target,sizeof (linear),PROT_READ );
Signature · 6 lines
2.27.0.112.g101b3204f3 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls
In reply to Ashutosh Dixit== Series Details ==
== Series Details ==
Series: series starting with [i-g-t,1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls
URL : https://patchwork.freedesktop.org/series/81380/
State : success
== Summary ==
CI Bug Log - changes from IGT_5779 -> IGTPW_4955
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/index.html
Known issues
------------
Here are the changes found in IGTPW_4955 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-byt-j1900: [PASS][1] -> [DMESG-WARN][2] ([i915#1982])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/fi-byt-j1900/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/fi-byt-j1900/igt@[email protected]
- fi-bsw-kefka: [PASS][3] -> [DMESG-WARN][4] ([i915#1982])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/fi-bsw-kefka/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/fi-bsw-kefka/igt@[email protected]
* igt@i915_selftest@live@active:
- fi-kbl-r: [PASS][5] -> [DMESG-FAIL][6] ([i915#666])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/fi-kbl-r/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/fi-kbl-r/igt@i915_selftest@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-icl-u2: [PASS][7] -> [DMESG-WARN][8] ([i915#1982])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/fi-icl-u2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/fi-icl-u2/igt@[email protected]
#### Possible fixes ####
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-byt-j1900: [DMESG-WARN][9] ([i915#1982]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/fi-byt-j1900/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/fi-byt-j1900/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-before-cursor-atomic:
- fi-icl-u2: [DMESG-WARN][11] ([i915#1982]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/fi-icl-u2/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/fi-icl-u2/igt@[email protected]
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#666]: https://gitlab.freedesktop.org/drm/intel/issues/666
Participating hosts (36 -> 33)
------------------------------
Missing (3): fi-byt-clapper fi-byt-squawks fi-bsw-cyan
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5779 -> IGTPW_4955
CI-20190529: 20190529
CI_DRM_8965: f4cbf17fababf80c1c67c6f1687fb8bf7e00a263 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4955: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/index.html
IGT_5779: f52bf19b5f02d52fc3e201c6467ec3f511227fba @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/index.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Quoted 6 lines · Ashutosh Dixit
The general direction at this time is to phase out pread/write ioctls and not support them in future products. This means IGT must be modified to handle the absence of pread/write ioctls. This patch does this as follows:
Quoted 6 lines
*
__gem_read,gem_read,__gem_writeandgem_writecalls which are wrappers around the pread/pwrite ioctls have been renamed to__gem_pread,gem_pread,__gem_pwriteandgem_pwrite. These will now only be used where the pread/pwrite ioctls must absolutely be used, such as tests which test these ioctls or must otherwise only use the pread/pwrite ioctl's.
It seemed to me that these new functions (__gem_pread, gem_pread, __gem_pwrite and gem_pwrite) were not needed after all since the callers of these functions would anyway have to call gem_require_pread_pwrite() to skip when the pread/pwrite ioctls were unavailable. Therefore gem_require_pread_pwrite() itself indicates that only the pread/pwrite ioctls must be used. Therefore I have dropped __gem_pread, gem_pread, __gem_pwrite and gem_pwrite in v2. This results in further simplification and also the two previous patches have been squashed into a single patch in v2.
Quoted 5 lines
* The new
gem_readandgem_writefunction calls are now treated as general purpose calls to read/write to a gem object. They now try doing the read/write using the pread/pwrite ioctls first but when these ioctls are unavailable they fall back to doing the read/write using a combination of mmap and memcpy.
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls
In reply to Ashutosh Dixit== Series Details ==
== Series Details ==
Series: series starting with [i-g-t,1/2] lib/ioctl_wrappers: Keep IGT working without pread/pwrite ioctls
URL : https://patchwork.freedesktop.org/series/81380/
State : success
== Summary ==
CI Bug Log - changes from IGT_5779_full -> IGTPW_4955_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/index.html
Known issues
------------
Here are the changes found in IGTPW_4955_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@preservation-s3@vcs0:
- shard-kbl: [PASS][1] -> [DMESG-WARN][2] ([i915#180]) +3 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-kbl4/igt@gem_ctx_isolation@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-kbl4/igt@gem_ctx_isolation@[email protected]
* igt@gem_exec_reloc@basic-many-active@rcs0:
- shard-glk: [PASS][3] -> [FAIL][4] ([i915#2389])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-glk3/igt@gem_exec_reloc@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-glk2/igt@gem_exec_reloc@[email protected]
* igt@gem_exec_whisper@basic-contexts-priority:
- shard-glk: [PASS][5] -> [DMESG-WARN][6] ([i915#118] / [i915#95])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-glk2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-glk5/igt@[email protected]
* igt@i915_pm_dc@dc5-psr:
- shard-iclb: [PASS][7] -> [FAIL][8] ([i915#1899])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-iclb5/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-iclb5/igt@[email protected]
* igt@kms_color@pipe-c-degamma:
- shard-apl: [PASS][9] -> [FAIL][10] ([i915#1635] / [i915#71])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-apl2/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-apl1/igt@[email protected]
- shard-kbl: [PASS][11] -> [FAIL][12] ([i915#71])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-kbl7/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-kbl4/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-256x85-sliding:
- shard-kbl: [PASS][13] -> [FAIL][14] ([i915#54])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-kbl7/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-kbl1/igt@[email protected]
- shard-glk: [PASS][15] -> [FAIL][16] ([i915#54])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-glk2/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-glk1/igt@[email protected]
- shard-apl: [PASS][17] -> [FAIL][18] ([i915#1635] / [i915#54])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-apl4/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-apl7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-stridechange:
- shard-glk: [PASS][19] -> [DMESG-WARN][20] ([i915#1982])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-glk6/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-glk3/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-shrfb-draw-pwrite:
- shard-tglb: [PASS][21] -> [DMESG-WARN][22] ([i915#1982]) +5 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-tglb5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-shrfb-draw-pwrite.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-tglb7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-shrfb-draw-pwrite.html
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][23] -> [SKIP][24] ([fdo#109441])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-iclb4/igt@kms_psr@psr2_cursor_mmap_cpu.html
#### Possible fixes ####
* {igt@feature_discovery@psr2}:
- shard-iclb: [SKIP][25] ([i915#658]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-iclb4/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-iclb2/igt@[email protected]
* igt@gem_exec_reloc@basic-many-active@vecs0:
- shard-glk: [FAIL][27] ([i915#2389]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-glk3/igt@gem_exec_reloc@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-glk2/igt@gem_exec_reloc@[email protected]
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-hsw: [WARN][29] ([i915#1519]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-hsw8/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-hsw6/igt@[email protected]
* igt@i915_suspend@forcewake:
- shard-kbl: [DMESG-WARN][31] ([i915#180]) -> [PASS][32] +2 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-kbl4/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-kbl4/igt@[email protected]
* igt@kms_cursor_edge_walk@pipe-b-256x256-left-edge:
- shard-glk: [DMESG-WARN][33] ([i915#1982]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-glk4/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-glk5/igt@[email protected]
- shard-apl: [DMESG-WARN][35] ([i915#1635] / [i915#1982]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-apl6/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-apl3/igt@[email protected]
* igt@kms_flip@flip-vs-wf_vblank-interruptible@a-dp1:
- shard-kbl: [DMESG-WARN][37] ([i915#1982]) -> [PASS][38] +3 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-kbl4/igt@kms_flip@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-kbl1/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-blt:
- shard-glk: [FAIL][39] ([i915#49]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-glk2/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-glk6/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-slowdraw:
- shard-tglb: [DMESG-WARN][41] ([i915#1982]) -> [PASS][42] +3 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-tglb2/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-tglb7/igt@[email protected]
* igt@kms_plane_scaling@pipe-c-scaler-with-clipping-clamping:
- shard-iclb: [DMESG-WARN][43] ([i915#1982]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-iclb3/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-iclb6/igt@[email protected]
* igt@kms_psr2_su@page_flip:
- shard-tglb: [SKIP][45] ([i915#1911]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-tglb3/igt@kms_psr2_su@page_flip.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-tglb2/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][47] ([fdo#109441]) -> [PASS][48] +4 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-iclb7/igt@kms_psr@psr2_primary_mmap_cpu.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
#### Warnings ####
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [DMESG-WARN][49] ([i915#1226]) -> [SKIP][50] ([fdo#109349])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-iclb2/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-iclb6/igt@[email protected]
* igt@kms_psr2_su@page_flip:
- shard-iclb: [SKIP][51] ([i915#1911]) -> [SKIP][52] ([fdo#109642] / [fdo#111068])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5779/shard-iclb2/igt@kms_psr2_su@page_flip.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/shard-iclb7/igt@kms_psr2_su@page_flip.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1226]: https://gitlab.freedesktop.org/drm/intel/issues/1226
[i915#1519]: https://gitlab.freedesktop.org/drm/intel/issues/1519
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1899]: https://gitlab.freedesktop.org/drm/intel/issues/1899
[i915#1911]: https://gitlab.freedesktop.org/drm/intel/issues/1911
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#71]: https://gitlab.freedesktop.org/drm/intel/issues/71
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (8 -> 8)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5779 -> IGTPW_4955
CI-20190529: 20190529
CI_DRM_8965: f4cbf17fababf80c1c67c6f1687fb8bf7e00a263 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4955: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/index.html
IGT_5779: f52bf19b5f02d52fc3e201c6467ec3f511227fba @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4955/index.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev