From patchwork Wed Nov 13 18:28:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 11242639 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8C98B138C for ; Wed, 13 Nov 2019 18:28:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6094A20409 for ; Wed, 13 Nov 2019 18:28:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6094A20409 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=chris-wilson.co.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2EC436EDE2; Wed, 13 Nov 2019 18:28:35 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8A7C56EDE2; Wed, 13 Nov 2019 18:28:25 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 19191409-1500050 for multiple; Wed, 13 Nov 2019 18:28:10 +0000 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 13 Nov 2019 18:28:06 +0000 Message-Id: <20191113182808.10780-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 1/3] i915: Skip if secure batches is not available 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: igt-dev@lists.freedesktop.org, Kuoppala@freedesktop.org, "Kuoppala, Mika" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: "Kuoppala, Mika" If we can't do secure execbuf, there is no point in trying. Signed-off-by: Kuoppala, Mika Reviewed-by: Chris Wilson --- tests/i915/gem_exec_params.c | 22 ++++++++++++++++++++-- tests/i915/gem_mocs_settings.c | 14 ++++++++++++++ tests/perf_pmu.c | 14 ++++++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/tests/i915/gem_exec_params.c b/tests/i915/gem_exec_params.c index 8f15e6454..9c3525698 100644 --- a/tests/i915/gem_exec_params.c +++ b/tests/i915/gem_exec_params.c @@ -193,6 +193,19 @@ static void test_batch_first(int fd) gem_close(fd, obj[0].handle); } +static int has_secure_batches(const int fd) +{ + int v = -1; + drm_i915_getparam_t gp = { + .param = I915_PARAM_HAS_SECURE_BATCHES, + .value = &v, + }; + + drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp); + + return v > 0; +} + struct drm_i915_gem_execbuffer2 execbuf; struct drm_i915_gem_exec_object2 gem_exec[1]; uint32_t batch[2] = {MI_BATCH_BUFFER_END}; @@ -340,6 +353,8 @@ igt_main } igt_subtest("secure-non-root") { + igt_require(has_secure_batches(fd)); + igt_fork(child, 1) { igt_drop_root(); @@ -351,9 +366,12 @@ igt_main } igt_subtest("secure-non-master") { - igt_require(__igt_device_set_master(fd) == 0); /* Requires root privilege */ + igt_require(has_secure_batches(fd)); + + /* Requires root privilege... */ + igt_require(__igt_device_set_master(fd) == 0); + igt_device_drop_master(fd); /* ... to drop master! */ - igt_device_drop_master(fd); execbuf.flags = I915_EXEC_RENDER | I915_EXEC_SECURE; RUN_FAIL(EPERM); diff --git a/tests/i915/gem_mocs_settings.c b/tests/i915/gem_mocs_settings.c index fc2ccb216..9627d828f 100644 --- a/tests/i915/gem_mocs_settings.c +++ b/tests/i915/gem_mocs_settings.c @@ -225,6 +225,19 @@ static uint32_t get_engine_base(int fd, uint32_t engine) } } +static int has_secure_batches(const int fd) +{ + int v = -1; + drm_i915_getparam_t gp = { + .param = I915_PARAM_HAS_SECURE_BATCHES, + .value = &v, + }; + + drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp); + + return v > 0; +} + #define MI_STORE_REGISTER_MEM_64_BIT_ADDR ((0x24 << 23) | 2) static int create_read_batch(struct drm_i915_gem_relocation_entry *reloc, @@ -566,6 +579,7 @@ igt_main igt_require_gem(fd); gem_require_mocs_registers(fd); igt_require(get_mocs_settings(fd, &table, false)); + igt_require(has_secure_batches(fd)); } for (e = intel_execution_engines; e->name; e++) { diff --git a/tests/perf_pmu.c b/tests/perf_pmu.c index e2bd2cc55..54842784c 100644 --- a/tests/perf_pmu.c +++ b/tests/perf_pmu.c @@ -893,6 +893,19 @@ static int wait_vblank(int fd, union drm_wait_vblank *vbl) return err; } +static int has_secure_batches(const int fd) +{ + int v = -1; + drm_i915_getparam_t gp = { + .param = I915_PARAM_HAS_SECURE_BATCHES, + .value = &v, + }; + + drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp); + + return v > 0; +} + static void event_wait(int gem_fd, const struct intel_execution_engine2 *e) { @@ -910,6 +923,7 @@ event_wait(int gem_fd, const struct intel_execution_engine2 *e) devid = intel_get_drm_devid(gem_fd); igt_require(intel_gen(devid) >= 7); + igt_require(has_secure_batches(fd)); igt_skip_on(IS_VALLEYVIEW(devid) || IS_CHERRYVIEW(devid)); kmstest_set_vt_graphics_mode();