From: Tvrtko Ursulin <tursulin@ursulin.net> To: igt-dev@lists.freedesktop.org Cc: Intel-gfx@lists.freedesktop.org Subject: [PATCH i-g-t 1/2] tests/gem_ctx_bad_exec: Consolidate to gem_ctx_exec Date: Mon, 17 Sep 2018 16:46:18 +0100 [thread overview] Message-ID: <20180917154619.30261-1-tvrtko.ursulin@linux.intel.com> (raw) From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Move a really small test that invalid context is rejected under the gem_ctx_exec umbrella. v2: * And actually fix the test so it does what it claims. And add more variety in the invalid context id's it tests with. (Chris Wilson) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> --- tests/Makefile.sources | 1 - tests/gem_ctx_bad_exec.c | 60 ---------------------------------------- tests/gem_ctx_exec.c | 34 +++++++++++++++++++++++ tests/meson.build | 1 - 4 files changed, 34 insertions(+), 62 deletions(-) delete mode 100644 tests/gem_ctx_bad_exec.c diff --git a/tests/Makefile.sources b/tests/Makefile.sources index c84933f1d971..269336ad3150 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -51,7 +51,6 @@ TESTS_progs = \ gem_cs_prefetch \ gem_cs_tlb \ gem_ctx_bad_destroy \ - gem_ctx_bad_exec \ gem_ctx_create \ gem_ctx_exec \ gem_ctx_isolation \ diff --git a/tests/gem_ctx_bad_exec.c b/tests/gem_ctx_bad_exec.c deleted file mode 100644 index e3ccc5be46a0..000000000000 --- a/tests/gem_ctx_bad_exec.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright © 2012 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - */ - -#include "igt.h" - -IGT_TEST_DESCRIPTION("Test that context cannot be submitted to any ring"); - -static int exec(int fd, unsigned ring) -{ - struct drm_i915_gem_execbuffer2 execbuf; - struct drm_i915_gem_exec_object2 obj; - - memset(&obj, 0, sizeof(obj)); - memset(&execbuf, 0, sizeof(execbuf)); - - execbuf.buffers_ptr = to_user_pointer(&obj); - execbuf.buffer_count = 1; - i915_execbuffer2_set_context_id(execbuf, 1); - - return __gem_execbuf(fd, &execbuf); -} - -igt_main -{ - const struct intel_execution_engine *e; - int fd = -1; - - igt_skip_on_simulation(); - - igt_fixture - fd = drm_open_driver_render(DRIVER_INTEL); - - for (e = intel_execution_engines; e->name; e++) { - igt_subtest_f("%s", e->name) { - gem_require_ring(fd, e->exec_id | e->flags); - igt_assert_eq(exec(fd, e->exec_id | e->flags), -ENOENT); - } - } -} diff --git a/tests/gem_ctx_exec.c b/tests/gem_ctx_exec.c index 1f8ed64d4bd3..4ed6febe12b8 100644 --- a/tests/gem_ctx_exec.c +++ b/tests/gem_ctx_exec.c @@ -30,6 +30,7 @@ */ #include "igt.h" +#include <limits.h> #include <unistd.h> #include <stdlib.h> #include <stdint.h> @@ -142,6 +143,30 @@ static void big_exec(int fd, uint32_t handle, int ring) gem_sync(fd, handle); } +static void invalid_context(int fd, unsigned ring, uint32_t handle) +{ + struct drm_i915_gem_exec_object2 obj = { + .handle = handle, + }; + struct drm_i915_gem_execbuffer2 execbuf = { + .buffers_ptr = to_user_pointer(&obj), + .buffer_count = 1, + .flags = ring, + }; + const uint64_t invalid[] = { 1, INT_MAX, UINT_MAX, LONG_MAX, ULONG_MAX, + LLONG_MAX, ULLONG_MAX }; + int i; + + /* Verify all works. */ + gem_execbuf(fd, &execbuf); + + /* Go through some non-existent context id's. */ + for (i = 0; i < ARRAY_SIZE(invalid); i++) { + i915_execbuffer2_set_context_id(execbuf, invalid[i]); + igt_assert_eq(__gem_execbuf(fd, &execbuf), -ENOENT); + } +} + uint32_t handle; uint32_t batch[2] = {0, MI_BATCH_BUFFER_END}; uint32_t ctx_id, ctx_id2; @@ -149,6 +174,8 @@ int fd; igt_main { + const struct intel_execution_engine *e; + igt_fixture { fd = drm_open_driver_render(DRIVER_INTEL); igt_require_gem(fd); @@ -174,6 +201,13 @@ igt_main gem_sync(fd, handle); } + for (e = intel_execution_engines; e->name; e++) { + igt_subtest_f("invalid-context-%s", e->name) { + gem_require_ring(fd, e->exec_id | e->flags); + invalid_context(fd, e->exec_id | e->flags, handle); + } + } + igt_subtest("eviction") big_exec(fd, handle, I915_EXEC_RENDER); diff --git a/tests/meson.build b/tests/meson.build index 17deb945ec95..d22d59e0837d 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -28,7 +28,6 @@ test_progs = [ 'gem_cs_prefetch', 'gem_cs_tlb', 'gem_ctx_bad_destroy', - 'gem_ctx_bad_exec', 'gem_ctx_create', 'gem_ctx_exec', 'gem_ctx_isolation', -- 2.17.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Tvrtko Ursulin <tursulin@ursulin.net> To: igt-dev@lists.freedesktop.org Cc: Intel-gfx@lists.freedesktop.org, Tvrtko Ursulin <tvrtko.ursulin@intel.com> Subject: [igt-dev] [PATCH i-g-t 1/2] tests/gem_ctx_bad_exec: Consolidate to gem_ctx_exec Date: Mon, 17 Sep 2018 16:46:18 +0100 [thread overview] Message-ID: <20180917154619.30261-1-tvrtko.ursulin@linux.intel.com> (raw) From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Move a really small test that invalid context is rejected under the gem_ctx_exec umbrella. v2: * And actually fix the test so it does what it claims. And add more variety in the invalid context id's it tests with. (Chris Wilson) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> --- tests/Makefile.sources | 1 - tests/gem_ctx_bad_exec.c | 60 ---------------------------------------- tests/gem_ctx_exec.c | 34 +++++++++++++++++++++++ tests/meson.build | 1 - 4 files changed, 34 insertions(+), 62 deletions(-) delete mode 100644 tests/gem_ctx_bad_exec.c diff --git a/tests/Makefile.sources b/tests/Makefile.sources index c84933f1d971..269336ad3150 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -51,7 +51,6 @@ TESTS_progs = \ gem_cs_prefetch \ gem_cs_tlb \ gem_ctx_bad_destroy \ - gem_ctx_bad_exec \ gem_ctx_create \ gem_ctx_exec \ gem_ctx_isolation \ diff --git a/tests/gem_ctx_bad_exec.c b/tests/gem_ctx_bad_exec.c deleted file mode 100644 index e3ccc5be46a0..000000000000 --- a/tests/gem_ctx_bad_exec.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright © 2012 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - */ - -#include "igt.h" - -IGT_TEST_DESCRIPTION("Test that context cannot be submitted to any ring"); - -static int exec(int fd, unsigned ring) -{ - struct drm_i915_gem_execbuffer2 execbuf; - struct drm_i915_gem_exec_object2 obj; - - memset(&obj, 0, sizeof(obj)); - memset(&execbuf, 0, sizeof(execbuf)); - - execbuf.buffers_ptr = to_user_pointer(&obj); - execbuf.buffer_count = 1; - i915_execbuffer2_set_context_id(execbuf, 1); - - return __gem_execbuf(fd, &execbuf); -} - -igt_main -{ - const struct intel_execution_engine *e; - int fd = -1; - - igt_skip_on_simulation(); - - igt_fixture - fd = drm_open_driver_render(DRIVER_INTEL); - - for (e = intel_execution_engines; e->name; e++) { - igt_subtest_f("%s", e->name) { - gem_require_ring(fd, e->exec_id | e->flags); - igt_assert_eq(exec(fd, e->exec_id | e->flags), -ENOENT); - } - } -} diff --git a/tests/gem_ctx_exec.c b/tests/gem_ctx_exec.c index 1f8ed64d4bd3..4ed6febe12b8 100644 --- a/tests/gem_ctx_exec.c +++ b/tests/gem_ctx_exec.c @@ -30,6 +30,7 @@ */ #include "igt.h" +#include <limits.h> #include <unistd.h> #include <stdlib.h> #include <stdint.h> @@ -142,6 +143,30 @@ static void big_exec(int fd, uint32_t handle, int ring) gem_sync(fd, handle); } +static void invalid_context(int fd, unsigned ring, uint32_t handle) +{ + struct drm_i915_gem_exec_object2 obj = { + .handle = handle, + }; + struct drm_i915_gem_execbuffer2 execbuf = { + .buffers_ptr = to_user_pointer(&obj), + .buffer_count = 1, + .flags = ring, + }; + const uint64_t invalid[] = { 1, INT_MAX, UINT_MAX, LONG_MAX, ULONG_MAX, + LLONG_MAX, ULLONG_MAX }; + int i; + + /* Verify all works. */ + gem_execbuf(fd, &execbuf); + + /* Go through some non-existent context id's. */ + for (i = 0; i < ARRAY_SIZE(invalid); i++) { + i915_execbuffer2_set_context_id(execbuf, invalid[i]); + igt_assert_eq(__gem_execbuf(fd, &execbuf), -ENOENT); + } +} + uint32_t handle; uint32_t batch[2] = {0, MI_BATCH_BUFFER_END}; uint32_t ctx_id, ctx_id2; @@ -149,6 +174,8 @@ int fd; igt_main { + const struct intel_execution_engine *e; + igt_fixture { fd = drm_open_driver_render(DRIVER_INTEL); igt_require_gem(fd); @@ -174,6 +201,13 @@ igt_main gem_sync(fd, handle); } + for (e = intel_execution_engines; e->name; e++) { + igt_subtest_f("invalid-context-%s", e->name) { + gem_require_ring(fd, e->exec_id | e->flags); + invalid_context(fd, e->exec_id | e->flags, handle); + } + } + igt_subtest("eviction") big_exec(fd, handle, I915_EXEC_RENDER); diff --git a/tests/meson.build b/tests/meson.build index 17deb945ec95..d22d59e0837d 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -28,7 +28,6 @@ test_progs = [ 'gem_cs_prefetch', 'gem_cs_tlb', 'gem_ctx_bad_destroy', - 'gem_ctx_bad_exec', 'gem_ctx_create', 'gem_ctx_exec', 'gem_ctx_isolation', -- 2.17.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev
next reply other threads:[~2018-09-17 15:46 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-17 15:46 Tvrtko Ursulin [this message] 2018-09-17 15:46 ` [igt-dev] [PATCH i-g-t 1/2] tests/gem_ctx_bad_exec: Consolidate to gem_ctx_exec Tvrtko Ursulin 2018-09-17 15:46 ` [PATCH i-g-t 2/2] gem_ctx_exec: Remove lrc-lite-restore Tvrtko Ursulin 2018-09-17 15:46 ` [igt-dev] " Tvrtko Ursulin 2018-09-17 15:53 ` Chris Wilson 2018-09-17 15:53 ` [igt-dev] [Intel-gfx] " Chris Wilson 2018-09-17 15:52 ` [igt-dev] [PATCH i-g-t 1/2] tests/gem_ctx_bad_exec: Consolidate to gem_ctx_exec Chris Wilson 2018-09-17 15:52 ` Chris Wilson 2018-09-18 9:38 ` Tvrtko Ursulin 2018-09-18 9:38 ` [Intel-gfx] " Tvrtko Ursulin 2018-09-18 9:44 ` Chris Wilson 2018-09-18 9:44 ` [Intel-gfx] " Chris Wilson 2018-09-18 9:59 ` Tvrtko Ursulin 2018-09-18 9:59 ` [igt-dev] [Intel-gfx] " Tvrtko Ursulin 2018-09-18 10:02 ` [igt-dev] " Chris Wilson 2018-09-18 10:02 ` [igt-dev] [Intel-gfx] " Chris Wilson 2018-09-18 10:03 ` [igt-dev] " Chris Wilson 2018-09-18 10:03 ` [igt-dev] [Intel-gfx] " Chris Wilson 2018-09-18 10:33 ` [igt-dev] " Tvrtko Ursulin 2018-09-18 10:33 ` [Intel-gfx] " Tvrtko Ursulin 2018-09-18 10:45 ` Chris Wilson 2018-09-18 10:45 ` [igt-dev] [Intel-gfx] " Chris Wilson 2018-09-18 10:59 ` [PATCH i-g-t v3 " Tvrtko Ursulin 2018-09-18 10:59 ` [igt-dev] " Tvrtko Ursulin 2018-09-18 11:06 ` Chris Wilson 2018-09-18 11:06 ` [igt-dev] [Intel-gfx] " Chris Wilson 2018-09-18 11:21 ` [PATCH i-g-t v4 " Tvrtko Ursulin 2018-09-18 11:21 ` [igt-dev] " Tvrtko Ursulin 2018-09-17 16:27 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/2] " Patchwork 2018-09-17 18:04 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork 2018-09-17 20:02 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork 2018-09-18 11:28 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,v3,1/2] tests/gem_ctx_bad_exec: Consolidate to gem_ctx_exec (rev2) Patchwork 2018-09-18 11:52 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v4,1/2] tests/gem_ctx_bad_exec: Consolidate to gem_ctx_exec (rev3) Patchwork 2018-09-18 12:21 ` [igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,v3,1/2] tests/gem_ctx_bad_exec: Consolidate to gem_ctx_exec (rev2) Patchwork 2018-09-18 13:04 ` [igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,v4,1/2] tests/gem_ctx_bad_exec: Consolidate to gem_ctx_exec (rev3) Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180917154619.30261-1-tvrtko.ursulin@linux.intel.com \ --to=tursulin@ursulin.net \ --cc=Intel-gfx@lists.freedesktop.org \ --cc=igt-dev@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.