From patchwork Thu Nov 10 17:31:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kuoppala X-Patchwork-Id: 9421715 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3450D601C0 for ; Thu, 10 Nov 2016 17:32:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01255297C8 for ; Thu, 10 Nov 2016 17:32:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8951297EA; Thu, 10 Nov 2016 17:32:12 +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=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM 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 08A1E297C8 for ; Thu, 10 Nov 2016 17:32:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 79CD56E800; Thu, 10 Nov 2016 17:32:11 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 012CF6E800 for ; Thu, 10 Nov 2016 17:32:10 +0000 (UTC) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP; 10 Nov 2016 09:32:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.31,619,1473145200"; d="scan'208"; a="1066805199" Received: from rosetta.fi.intel.com ([10.237.72.176]) by fmsmga001.fm.intel.com with ESMTP; 10 Nov 2016 09:32:09 -0800 Received: by rosetta.fi.intel.com (Postfix, from userid 1000) id EDFB584000F; Thu, 10 Nov 2016 19:31:01 +0200 (EET) From: Mika Kuoppala To: intel-gfx@lists.freedesktop.org Date: Thu, 10 Nov 2016 19:31:00 +0200 Message-Id: <1478799060-25075-1-git-send-email-mika.kuoppala@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [Intel-gfx] [PATCH i-g-t] lib: substitute cxt BAN_PERIOD with BANNABLE X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Context BAN_PERIOD will get depracated so subsitute it with BANNABLE property. Make ctx param test to accept both variants for now until kernel changes have landed, to not break BAT. Cc: Chris Wilson Signed-off-by: Mika Kuoppala --- lib/igt_gt.c | 77 ++++++++++++++++++++++++++++++--------------------- lib/ioctl_wrappers.c | 16 +++++++++-- lib/ioctl_wrappers.h | 3 +- tests/gem_ctx_param.c | 9 ++++-- 4 files changed, 68 insertions(+), 37 deletions(-) diff --git a/lib/igt_gt.c b/lib/igt_gt.c index a165932..b8c3511 100644 --- a/lib/igt_gt.c +++ b/lib/igt_gt.c @@ -119,11 +119,43 @@ void igt_require_hang_ring(int fd, int ring) igt_skip("hang injection disabled by user"); gem_require_ring(fd, ring); - gem_context_require_ban_period(fd); + gem_context_require_bannable(fd); if (!igt_check_boolean_env_var("IGT_HANG_WITHOUT_RESET", false)) igt_require(has_gpu_reset(fd)); } +static unsigned igt_get_ban(int fd, unsigned ctx) +{ + struct local_i915_gem_context_param param; + + param.param = LOCAL_CONTEXT_PARAM_BANNABLE; + param.value = 0; + param.size = 0; + + if (__gem_context_get_param(fd, ¶m)) { + igt_assert(param.value == 0); + param.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD; + gem_context_get_param(fd, ¶m); + } + + return param.value; +} + +static void igt_set_ban(int fd, unsigned ctx, unsigned ban) +{ + struct local_i915_gem_context_param param; + + param.value = ban; + param.size = 0; + param.param = LOCAL_CONTEXT_PARAM_BANNABLE; + + if(__gem_context_set_param(fd, ¶m)) { + igt_assert(param.value == ban); + param.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD; + gem_context_set_param(fd, ¶m); + } +} + igt_hang_t igt_allow_hang(int fd, unsigned ctx, unsigned flags) { struct local_i915_gem_context_param param; @@ -131,7 +163,7 @@ igt_hang_t igt_allow_hang(int fd, unsigned ctx, unsigned flags) if (!igt_check_boolean_env_var("IGT_HANG", true)) igt_skip("hang injection disabled by user"); - gem_context_require_ban_period(fd); + gem_context_require_bannable(fd); if (!igt_check_boolean_env_var("IGT_HANG_WITHOUT_RESET", false)) igt_require(has_gpu_reset(fd)); @@ -148,16 +180,9 @@ igt_hang_t igt_allow_hang(int fd, unsigned ctx, unsigned flags) __gem_context_set_param(fd, ¶m); } - param.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD; - param.value = 0; - gem_context_get_param(fd, ¶m); - ban = param.value; - - if ((flags & HANG_ALLOW_BAN) == 0) { - param.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD; - param.value = 0; - gem_context_set_param(fd, ¶m); - } + ban = igt_get_ban(fd, ctx); + if ((flags & HANG_ALLOW_BAN) == 0) + igt_set_ban(fd, ctx, 0); return (struct igt_hang){ 0, ctx, ban, flags }; } @@ -166,13 +191,11 @@ void igt_disallow_hang(int fd, igt_hang_t arg) { struct local_i915_gem_context_param param; - param.context = arg.ctx; - param.size = 0; - param.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD; - param.value = arg.ban; - gem_context_set_param(fd, ¶m); + igt_set_ban(fd, arg.ctx, arg.ban); if ((arg.flags & HANG_ALLOW_CAPTURE) == 0) { + param.context = arg.ctx; + param.size = 0; param.param = LOCAL_CONTEXT_PARAM_NO_ERROR_CAPTURE; param.value = 0; if (__gem_context_set_param(fd, ¶m)) @@ -227,16 +250,10 @@ igt_hang_t igt_hang_ctx(int fd, __gem_context_set_param(fd, ¶m); } - param.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD; - param.value = 0; - gem_context_get_param(fd, ¶m); - ban = param.value; + ban = igt_get_ban(fd, ctx); - if ((flags & HANG_ALLOW_BAN) == 0) { - param.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD; - param.value = 0; - gem_context_set_param(fd, ¶m); - } + if ((flags & HANG_ALLOW_BAN) == 0) + igt_set_ban(fd, ctx, 0); memset(&reloc, 0, sizeof(reloc)); memset(&exec, 0, sizeof(exec)); @@ -323,13 +340,11 @@ void igt_post_hang_ring(int fd, igt_hang_t arg) I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); gem_close(fd, arg.handle); - param.context = arg.ctx; - param.size = 0; - param.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD; - param.value = arg.ban; - gem_context_set_param(fd, ¶m); + igt_set_ban(fd, arg.ctx, arg.ban); if ((arg.flags & HANG_ALLOW_CAPTURE) == 0) { + param.context = arg.ctx; + param.size = 0; param.param = LOCAL_CONTEXT_PARAM_NO_ERROR_CAPTURE; param.value = 0; if (__gem_context_set_param(fd, ¶m)) diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index eabf3ee..06638d4 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -961,9 +961,21 @@ void gem_context_require_param(int fd, uint64_t param) igt_require(igt_ioctl(fd, LOCAL_IOCTL_I915_GEM_CONTEXT_GETPARAM, &p) == 0); } -void gem_context_require_ban_period(int fd) +void gem_context_require_bannable(int fd) { static int has_ban_period = -1; + static int has_bannable = -1; + + if (has_bannable < 0) { + struct local_i915_gem_context_param p; + + p.context = 0; + p.param = LOCAL_CONTEXT_PARAM_BANNABLE; + p.value = 0; + p.size = 0; + + has_bannable = igt_ioctl(fd, LOCAL_IOCTL_I915_GEM_CONTEXT_GETPARAM, &p) == 0; + } if (has_ban_period < 0) { struct local_i915_gem_context_param p; @@ -976,7 +988,7 @@ void gem_context_require_ban_period(int fd) has_ban_period = igt_ioctl(fd, LOCAL_IOCTL_I915_GEM_CONTEXT_GETPARAM, &p) == 0; } - igt_require(has_ban_period); + igt_require(has_ban_period || has_bannable); } int __gem_userptr(int fd, void *ptr, int size, int read_only, uint32_t flags, uint32_t *handle) diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h index 465f760..2627097 100644 --- a/lib/ioctl_wrappers.h +++ b/lib/ioctl_wrappers.h @@ -120,9 +120,10 @@ struct local_i915_gem_context_param { #define LOCAL_CONTEXT_PARAM_NO_ZEROMAP 0x2 #define LOCAL_CONTEXT_PARAM_GTT_SIZE 0x3 #define LOCAL_CONTEXT_PARAM_NO_ERROR_CAPTURE 0x4 +#define LOCAL_CONTEXT_PARAM_BANNABLE 0x5 uint64_t value; }; -void gem_context_require_ban_period(int fd); +void gem_context_require_bannable(int fd); void gem_context_require_param(int fd, uint64_t param); void gem_context_get_param(int fd, struct local_i915_gem_context_param *p); void gem_context_set_param(int fd, struct local_i915_gem_context_param *p); diff --git a/tests/gem_ctx_param.c b/tests/gem_ctx_param.c index 57d5e36..efdaf19 100644 --- a/tests/gem_ctx_param.c +++ b/tests/gem_ctx_param.c @@ -43,6 +43,11 @@ igt_main arg.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD; + /* XXX start to enforce ban period returning -EINVAL when + * transition has been done */ + if (__gem_context_get_param(fd, &arg) == -EINVAL) + arg.param = LOCAL_CONTEXT_PARAM_BANNABLE; + igt_subtest("basic") { arg.context = ctx; gem_context_get_param(fd, &arg); @@ -82,8 +87,6 @@ igt_main arg.size = 0; } - arg.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD; - igt_subtest("non-root-set") { igt_fork(child, 1) { igt_drop_root(); @@ -137,7 +140,7 @@ igt_main * to catch ABI extensions. Don't "fix" this testcase without adding all * the tests for the new param first. */ - arg.param = LOCAL_CONTEXT_PARAM_NO_ERROR_CAPTURE + 1; + arg.param = LOCAL_CONTEXT_PARAM_BANNABLE + 1; igt_subtest("invalid-param-get") { arg.context = ctx;