From patchwork Tue Sep 18 10:59:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10604145 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 61E79913 for ; Tue, 18 Sep 2018 10:59:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5164529A0D for ; Tue, 18 Sep 2018 10:59:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 453F92A265; Tue, 18 Sep 2018 10:59:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C493C29A0D for ; Tue, 18 Sep 2018 10:59:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A645A6E13C; Tue, 18 Sep 2018 10:59:34 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 513C06E13C for ; Tue, 18 Sep 2018 10:59:33 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id s12-v6so1992578wmc.0 for ; Tue, 18 Sep 2018 03:59:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hday7GWe86OAixK0MS00QAa/iSrQieRpXh1YF6GwkIs=; b=kgCFyV29V134G8kOkVN0jvqd/eMt6ekFg+9IQq9VwmueiPOcfsdNguA1Xb6UNABa6B r14tQ2qw3NvdnBs+Kwcv2kxcgKWAj4ORcQXvFQFT5sRnDdqRamzb7XnggaGJ5QDxd1/m KM9YgP7h1i8Fk7qBnRJIs8AcyOELiOC/3MJGAd+WGwRBel/Z3fNSTbe5bQEV80exmg7R 3BuOr6HlE50mPCFyUw0B/IoWt9CuLmwjhf5/g1O51C0zYrd8MHStZj+3yybKwrB1d4pA SDjDfjd+/Lg0AvVdLIsMSI2RedyDJuLqKTQ78sB/Z4J5T5EHjr0v1mdQ5wwGrMo4REhk zF9A== X-Gm-Message-State: APzg51Ap/teQv9HDgkFYjW3OhKPZpChvtJw+K2PZ9/rDPsD8x++W+hQ7 OvHi9NgzyV9XKr8WLrTBpsWQmOBH41U= X-Google-Smtp-Source: ANB0VdY/ATchjEo4t88vZOBpB2jGufxbZRaefQJNV5rLii+9mgF5eI6DuydQaFyJz8v9K0VXxMyheA== X-Received: by 2002:a1c:bb0a:: with SMTP id l10-v6mr14951733wmf.32.1537268371230; Tue, 18 Sep 2018 03:59:31 -0700 (PDT) Received: from localhost.localdomain ([95.144.165.37]) by smtp.gmail.com with ESMTPSA id l18-v6sm15874669wru.75.2018.09.18.03.59.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Sep 2018 03:59:30 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org Date: Tue, 18 Sep 2018 11:59:25 +0100 Message-Id: <20180918105925.2997-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <153726754231.19296.5912245934775211662@skylake-alporthouse-com> References: <153726754231.19296.5912245934775211662@skylake-alporthouse-com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t v3 1/2] tests/gem_ctx_bad_exec: Consolidate to gem_ctx_exec X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin 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) v3: * Rename the test as basic. * Limit to 32-bit. (Chris Wilson) * Add previously valid but closed context id to the test. (Chris Wilson) Signed-off-by: Tvrtko Ursulin Reviewed-by: Chris Wilson --- tests/Makefile.sources | 1 - tests/gem_ctx_bad_exec.c | 60 ---------------------------------------- tests/gem_ctx_exec.c | 38 +++++++++++++++++++++++++ tests/meson.build | 1 - 4 files changed, 38 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..1c6c18eddc20 100644 --- a/tests/gem_ctx_exec.c +++ b/tests/gem_ctx_exec.c @@ -30,6 +30,7 @@ */ #include "igt.h" +#include #include #include #include @@ -142,6 +143,34 @@ 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, + }; + uint32_t invalid[] = { 0, 1, INT_MAX, UINT_MAX }; + int i; + + invalid[0] = gem_context_create(fd); + + /* Verify everything works. */ + i915_execbuffer2_set_context_id(execbuf, invalid[0]); + gem_execbuf(fd, &execbuf); + + gem_context_destroy(fd, invalid[0]); + + /* Go through the 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 +178,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 +205,13 @@ igt_main gem_sync(fd, handle); } + for (e = intel_execution_engines; e->name; e++) { + igt_subtest_f("basic-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',