Lib: Move __gem_context_create to common ioctl wrapper library.
PATCH 1/1 Lib: Move __gem_context_create to common ioctl wrapper library.
This patch adds a context creation ioctl wrapper that returns the error for the caller to consume. Multiple tests that implemented this already, have been changed to use the new library function.
--- benchmarks/gem_exec_ctx.c | 16 ++++------------ benchmarks/gem_exec_trace.c | 9 +-------- lib/ioctl_wrappers.c | 33 +++++++++++++++++++++++---------- lib/ioctl_wrappers.h | 1 + tests/gem_ctx_create.c | 13 ++++++------- tests/gem_ctx_switch.c | 13 ------------- tests/gem_eio.c | 13 +------------ tests/gem_exec_await.c | 14 ++------------ tests/gem_exec_nop.c | 13 ------------- tests/gem_exec_parallel.c | 15 +++------------ tests/gem_exec_reuse.c | 13 ------------- tests/gem_exec_whisper.c | 13 ------------- 12 files changed, 41 insertions(+), 125 deletions(-)
benchmarks/gem_exec_ctx.c +4 -12
@@ -64,16 +64,6 @@ static uint32_t batch(int fd)return handle; } -static uint32_t __gem_context_create (int fd) -{ -struct drm_i915_gem_context_create create; - -memset (&create,0 ,sizeof (create)); -drmIoctl (fd,DRM_IOCTL_I915_GEM_CONTEXT_CREATE , &create); - -return create.ctx_id; -} - static int loop(unsigned ring, int reps, enum mode mode,
@@ -84,6 +74,7 @@ static int loop(unsigned ring,struct drm_i915_gem_exec_object2 obj;double *shared;int fds[2 ], fd; +uint32_t ctx_id =0 ; shared =mmap (0 ,4096 ,PROT_WRITE ,MAP_SHARED |MAP_ANON ,-1 ,0 );
@@ -101,7 +92,8 @@ static int loop(unsigned ring, execbuf.flags |=LOCAL_I915_EXEC_HANDLE_LUT ; execbuf.flags |=LOCAL_I915_EXEC_NO_RELOC ;if (mode !=DEFAULT ) { - execbuf.rsvd1 =__gem_context_create (fd); +__gem_context_create (fd, &ctx_id); + execbuf.rsvd1 = ctx_id;if (execbuf.rsvd1 ==0 )return 77 ; }
@@ -125,7 +117,7 @@ static int loop(unsigned ring,uint32_t ctx =0 ;if (mode !=DEFAULT && mode !=NOP ) { - execbuf.rsvd1 =__gem_context_create (fd); + execbuf.rsvd1 =gem_context_create (fd); ctx =gem_context_create (fd); }
benchmarks/gem_exec_trace.c +1 -8
@@ -105,13 +105,6 @@ static double elapsed(const struct timespec *start, const struct timespec *end)return 1e3 *(end->tv_sec - start->tv_sec) +1e-6 *(end->tv_nsec - start->tv_nsec); } -static uint32_t __gem_context_create (int fd) -{ -struct drm_i915_gem_context_create arg = {}; -drmIoctl (fd,DRM_IOCTL_I915_GEM_CONTEXT_CREATE , &arg); -return arg.ctx_id; -} -static double replay (const char *filename,long nop,long range) {struct timespec t_start, t_end;
@@ -216,7 +209,7 @@ static double replay(const char *filename, long nop, long range) num_ctx = new_ctx; } - ctx[t->handle] =__gem_context_create (fd); + ctx[t->handle] =gem_context_create (fd);break ; }case DEL_CTX :
lib/ioctl_wrappers.c +23 -10
@@ -894,6 +894,21 @@ int gem_madvise(int fd, uint32_t handle, int state)return madv.retained; } +int __gem_context_create (int fd,uint32_t *ctx_id) +{ +struct drm_i915_gem_context_create create; +int err =0 ; + +memset (&create,0 ,sizeof (create)); +if (igt_ioctl (fd,DRM_IOCTL_I915_GEM_CONTEXT_CREATE , &create) ==0 ) + *ctx_id = create.ctx_id; +else + err = -errno; + + errno =0 ; +return err; +} +/** * gem_context_create: * @fd: open i915 drm file descriptor
@@ -906,18 +921,16 @@ int gem_madvise(int fd, uint32_t handle, int state)*/ uint32_t gem_context_create (int fd) { -struct drm_i915_gem_context_create create; +uint32_t ctx_id; +int ret; -memset (&create,0 ,sizeof (create)); -if (igt_ioctl (fd,DRM_IOCTL_I915_GEM_CONTEXT_CREATE , &create)) { -int err = -errno; -igt_skip_on (err == -ENODEV || errno == -EINVAL ); -igt_assert_eq (err,0 ); - } -igt_assert (create.ctx_id !=0 ); - errno =0 ; + ret =__gem_context_create (fd, &ctx_id); + +igt_skip_on (ret == -ENODEV || errno == -EINVAL ); +igt_assert_eq (ret,0 ); +igt_assert (ctx_id !=0 ); -return create.ctx_id; +return ctx_id; }int __gem_context_destroy (int fd,uint32_t ctx_id)
lib/ioctl_wrappers.h +1 -0
@@ -119,6 +119,7 @@ int gem_munmap(void *ptr, uint64_t size);int gem_madvise (int fd,uint32_t handle,int state); +int __gem_context_create (int fd,uint32_t *ctx_id);uint32_t gem_context_create (int fd);void gem_context_destroy (int fd,uint32_t ctx_id);int __gem_context_destroy (int fd,uint32_t ctx_id);
tests/gem_ctx_create.c +6 -7
@@ -45,7 +45,7 @@ static unsigned all_nengine;static unsigned ppgtt_engines[16 ];static unsigned ppgtt_nengine; -static int __gem_context_create (int fd,struct drm_i915_gem_context_create *arg) +static int __gem_context_create2 (int fd,struct drm_i915_gem_context_create *arg) {int ret =0 ;if (drmIoctl (fd,DRM_IOCTL_I915_GEM_CONTEXT_CREATE , arg))
@@ -233,7 +233,7 @@ static uint64_t total_avail_mem(unsigned mode)static void maximum (int fd,int ncpus,unsigned mode) { -struct drm_i915_gem_context_create create; +uint32_t ctx_id;const uint32_t bbe =MI_BATCH_BUFFER_END ;struct drm_i915_gem_execbuffer2 execbuf;struct drm_i915_gem_exec_object2 obj[2 ];
@@ -242,7 +242,6 @@ static void maximum(int fd, int ncpus, unsigned mode)uint32_t *contexts =NULL ;unsigned long count =0 ; -memset (&create,0 ,sizeof (create)); do { int err;
@@ -255,14 +254,14 @@ static void maximum(int fd, int ncpus, unsigned mode) err = -ENOMEM ;if (avail_mem > (count +1 ) * ctx_size) - err =__gem_context_create (fd, &create); + err =__gem_context_create (fd, &ctx_id);if (err) {igt_info ("Created %lu contexts, before failing with '%s' [%d]\n" , count,strerror (-err), -err);break ; } - contexts[count++] = create.ctx_id; + contexts[count++] = ctx_id; }while (1 );igt_require (count);
@@ -347,7 +346,7 @@ igt_mainmemset (&create,0 ,sizeof (create)); create.ctx_id =rand (); create.pad =0 ; -igt_assert_eq (__gem_context_create (fd, &create),0 ); +igt_assert_eq (__gem_context_create2 (fd, &create),0 );igt_assert (create.ctx_id !=0 );gem_context_destroy (fd, create.ctx_id); }
@@ -356,7 +355,7 @@ igt_mainmemset (&create,0 ,sizeof (create)); create.ctx_id =rand (); create.pad =1 ; -igt_assert_eq (__gem_context_create (fd, &create), -EINVAL ); +igt_assert_eq (__gem_context_create2 (fd, &create), -EINVAL ); }igt_subtest ("maximum-mem" )
tests/gem_ctx_switch.c +0 -13
@@ -45,19 +45,6 @@#define INTERRUPTIBLE 1 -static int __gem_context_create (int fd,uint32_t *ctx_id) -{ -struct drm_i915_gem_context_create arg; -int ret =0 ; - -memset (&arg,0 ,sizeof (arg)); -if (drmIoctl (fd,DRM_IOCTL_I915_GEM_CONTEXT_CREATE , &arg)) - ret = -errno; - - *ctx_id = arg.ctx_id; -return ret; -} -static double elapsed (const struct timespec *start,const struct timespec *end) { return ((end->tv_sec - start->tv_sec) +
tests/gem_eio.c +1 -12
@@ -207,17 +207,6 @@ static void test_inflight(int fd) } } -static uint32_t __gem_context_create (int fd) -{ -struct drm_i915_gem_context_create create; - -memset (&create,0 ,sizeof (create)); -if (ioctl (fd,DRM_IOCTL_I915_GEM_CONTEXT_CREATE , &create)) -return 0 ; - -return create.ctx_id; -} -static void test_inflight_contexts (int fd) {struct drm_i915_gem_execbuffer2 execbuf;
@@ -229,7 +218,7 @@ static void test_inflight_contexts(int fd)igt_require (gem_has_exec_fence (fd)); - ctx[0 ] =__gem_context_create (fd); + ctx[0 ] =gem_context_create (fd);igt_require (ctx[0 ]);for (unsigned int n =1 ; n <ARRAY_SIZE (ctx); n++) ctx[n] =gem_context_create (fd);
tests/gem_exec_await.c +2 -12
@@ -55,15 +55,6 @@ static bool ignore_engine(int fd, unsigned engine)return false; } -static uint32_t __gem_context_create (int fd) -{ -struct drm_i915_gem_context_create arg; - -memset (&arg,0 ,sizeof (arg)); -drmIoctl (fd,DRM_IOCTL_I915_GEM_CONTEXT_CREATE , &arg); -return arg.ctx_id; -} -static void xchg_obj (void *array,unsigned i,unsigned j) {struct drm_i915_gem_exec_object2 *obj = array;
@@ -130,8 +121,7 @@ static void wide(int fd, int ring_size, int timeout, unsigned int flags) LOCAL_I915_EXEC_HANDLE_LUT);if (flags &CONTEXTS ) { - exec[e].execbuf.rsvd1 =__gem_context_create (fd); -igt_require (exec[e].execbuf.rsvd1); + exec[e].execbuf.rsvd1 =gem_context_create (fd); } exec[e].exec[0 ].handle =gem_create (fd,4096 );
@@ -174,7 +164,7 @@ static void wide(int fd, int ring_size, int timeout, unsigned int flags)if (flags &CONTEXTS ) {gem_context_destroy (fd, exec[e].execbuf.rsvd1); - exec[e].execbuf.rsvd1 =__gem_context_create (fd); + exec[e].execbuf.rsvd1 =gem_context_create (fd); } exec[e].reloc.presumed_offset = exec[e].exec[1 ].offset;
tests/gem_exec_nop.c +0 -13
@@ -365,19 +365,6 @@ static void xchg(void *array, unsigned i, unsigned j) u[j] = tmp; } -static int __gem_context_create (int fd,uint32_t *ctx_id) -{ -struct drm_i915_gem_context_create arg; -int ret =0 ; - -memset (&arg,0 ,sizeof (arg)); -if (drmIoctl (fd,DRM_IOCTL_I915_GEM_CONTEXT_CREATE , &arg)) - ret = -errno; - - *ctx_id = arg.ctx_id; -return ret; -} -static void sequential (int fd,uint32_t handle,unsigned flags,int timeout) {const int ncpus = flags &FORKED ?sysconf (_SC_NPROCESSORS_ONLN) :1 ;
tests/gem_exec_parallel.c +3 -12
@@ -55,20 +55,11 @@ static void check_bo(int fd, uint32_t handle, int pass)munmap (map,4096 ); } -static uint32_t __gem_context_create (int fd) -{ -struct drm_i915_gem_context_create arg; - -memset (&arg,0 ,sizeof (arg)); -if (drmIoctl (fd,DRM_IOCTL_I915_GEM_CONTEXT_CREATE , &arg) ==0 ) -gem_context_destroy (fd, arg.ctx_id); - -return arg.ctx_id; -} -static void gem_require_context (int fd) { -igt_require (__gem_context_create (fd)); +uint32_t ctx_id =0 ; +__gem_context_create (fd, &ctx_id); +igt_require (ctx_id); }static bool ignore_engine (int fd,unsigned engine)
tests/gem_exec_reuse.c +0 -13
@@ -56,19 +56,6 @@ static void noop(struct noop *n,gem_execbuf (n->fd, &execbuf); } -static int __gem_context_create (int fd,uint32_t *ctx_id) -{ -struct drm_i915_gem_context_create arg; -int ret =0 ; - -memset (&arg,0 ,sizeof (arg)); -if (drmIoctl (fd,DRM_IOCTL_I915_GEM_CONTEXT_CREATE , &arg)) - ret = -errno; - - *ctx_id = arg.ctx_id; -return ret; -} -static int fls (uint64_t x) {int t;
tests/gem_exec_whisper.c +0 -13
@@ -79,19 +79,6 @@ static void verify_reloc(int fd, uint32_t handle, } } -static int __gem_context_create (int fd,uint32_t *ctx_id) -{ -struct drm_i915_gem_context_create arg; -int ret =0 ; - -memset (&arg,0 ,sizeof (arg)); -if (drmIoctl (fd,DRM_IOCTL_I915_GEM_CONTEXT_CREATE , &arg)) - ret = -errno; - - *ctx_id = arg.ctx_id; -return ret; -} -static bool ignore_engine (int fd,unsigned engine) {if (engine ==0 )
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Lib: Move __gem_context_create to common ioctl wrapper library.
== Series Details ==
== Series Details ==
Series: Lib: Move __gem_context_create to common ioctl wrapper library.
URL : https://patchwork.freedesktop.org/series/31775/
State : success
== Summary ==
IGT patchset tested on top of latest successful build 136100c2f00b590bc9485100cce012282c1217cf igt/syncobj_wait: Don't close the timeline early in wait_snapshot
with latest DRM-Tip kernel build CI_DRM_32206a96415ec560 drm-tip: 2017y-10m-11d-19h-08m-29s UTC integration manifest
No testlist changes.
Test gem_close_race:
Subgroup basic-threads:
dmesg-warn -> PASS (fi-snb-2520m)
Test gem_ringfill:
Subgroup basic-default-hang:
incomplete -> DMESG-WARN (fi-blb-e6850) fdo#101600
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
incomplete -> PASS (fi-kbl-7567u)fdo#101600 https://bugs.freedesktop.org/show_bug.cgi?id=101600
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:457s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:471s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:393s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:583s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:288s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:532s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:529s fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:537s fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:526s fi-cfl-s total:289 pass:253 dwarn:4 dfail:0 fail:0 skip:32 time:563s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:432s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:274s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:602s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:441s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:466s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:502s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:473s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:502s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:582s fi-kbl-7567u total:289 pass:265 dwarn:4 dfail:0 fail:0 skip:20 time:486s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:591s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:661s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:469s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:660s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:542s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:517s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:476s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:590s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:434s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_332/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Lib: Move __gem_context_create to common ioctl wrapper library.
In reply to Antonio Argenziano== Series Details ==
== Series Details ==
Series: Lib: Move __gem_context_create to common ioctl wrapper library.
URL : https://patchwork.freedesktop.org/series/31775/
State : success
== Summary ==
Test kms_flip:
Subgroup flip-vs-rmfb:
dmesg-warn -> PASS (shard-hsw) fdo#102614
Subgroup plain-flip-ts-check:
pass -> FAIL (shard-hsw) fdo#100368fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
shard-hsw total:2552 pass:1440 dwarn:0 dfail:0 fail:9 skip:1103 time:9618s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_332/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Antonio Argenziano (2017-10-12 00:07:34)
Quoted 27 lines
lib/ioctl_wrappers.c +17
-2+int __gem_context_create (int fd,uint32_t *ctx_id) +{ +struct drm_i915_gem_context_create create; +int err =0 ; + +memset (&create,0 ,sizeof (create)); +if (igt_ioctl (fd,DRM_IOCTL_I915_GEM_CONTEXT_CREATE , &create) ==0 ) + *ctx_id = create.ctx_id; +else + err = -errno; + + errno =0 ; +return err; +} +/** * gem_context_create: * @fd: open i915 drm file descriptor @@ -906,18 +921,16 @@ int gem_madvise(int fd, uint32_t handle, int state)*/ uint32_t gem_context_create (int fd) { -struct drm_i915_gem_context_create create; +uint32_t ctx_id; +int ret; -memset (&create,0 ,sizeof (create));
lib/ioctl_wrappers.c int gem_madvise(int fd, uint32_t handle, int state) · line 929
Quoted 10 lines
lib/ioctl_wrappers.c +3
-7-if (igt_ioctl (fd,DRM_IOCTL_I915_GEM_CONTEXT_CREATE , &create)) { -int err = -errno; -igt_skip_on (err == -ENODEV || errno == -EINVAL ); -igt_assert_eq (err,0 ); - } -igt_assert (create.ctx_id !=0 ); - errno =0 ; + ret =__gem_context_create (fd, &ctx_id); + +igt_skip_on (ret == -ENODEV || errno == -EINVAL );
So close and yet so far.
lib/ioctl_wrappers.c int gem_madvise(int fd, uint32_t handle, int state) · line 934
Quoted 6 lines
lib/ioctl_wrappers.c +3
-1+igt_assert_eq (ret,0 ); +igt_assert (ctx_id !=0 ); -return create.ctx_id; +return ctx_id; }
Whilst you are here, can you remove that igt_skip_on() entirely and add gem_require_contexts() so that we don't have the spam hiding important details in tests.
Please also think twice before adding it outside of tests/ as the igt_() infrastructure is snafu there.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx