From patchwork Thu Oct 12 22:10:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Argenziano X-Patchwork-Id: 10002995 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 9915B602BF for ; Thu, 12 Oct 2017 22:11:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A5F628EFA for ; Thu, 12 Oct 2017 22:11:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F30F28F02; Thu, 12 Oct 2017 22:11: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=-4.2 required=2.0 tests=BAYES_00, 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 F180128EFA for ; Thu, 12 Oct 2017 22:11:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B0C986E990; Thu, 12 Oct 2017 22:11:35 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9B3D96E990 for ; Thu, 12 Oct 2017 22:11:34 +0000 (UTC) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Oct 2017 15:11:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,368,1503385200"; d="scan'208";a="137941714" Received: from relo-linux-2.fm.intel.com ([10.1.27.122]) by orsmga004.jf.intel.com with ESMTP; 12 Oct 2017 15:11:33 -0700 From: Antonio Argenziano To: intel-gfx@lists.freedesktop.org Date: Thu, 12 Oct 2017 15:10:37 -0700 Message-Id: <20171012221037.9081-2-antonio.argenziano@intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171012221037.9081-1-antonio.argenziano@intel.com> References: <20171012221037.9081-1-antonio.argenziano@intel.com> Subject: [Intel-gfx] [i-g-t 2/2] tests/gem_reset_stats: Add client ban test 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 When a client gets a fixed amount of its contexts banned, will be blocked from creating any new contexts itself. This patch adds a test for this feature. Signed-off-by: Antonio Argenziano Cc: Michel Thierry --- tests/gem_ctx_create.c | 10 +++++----- tests/gem_reset_stats.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/tests/gem_ctx_create.c b/tests/gem_ctx_create.c index ae0825a1..abe9a32e 100644 --- a/tests/gem_ctx_create.c +++ b/tests/gem_ctx_create.c @@ -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_create_local(int fd, struct drm_i915_gem_context_create *arg) { int ret = 0; if (drmIoctl(fd, DRM_IOCTL_I915_GEM_CONTEXT_CREATE, arg)) @@ -255,7 +255,7 @@ 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_local(fd, &create); if (err) { igt_info("Created %lu contexts, before failing with '%s' [%d]\n", count, strerror(-err), -err); @@ -322,7 +322,7 @@ igt_main igt_require_gem(fd); memset(&create, 0, sizeof(create)); - igt_require(__gem_context_create(fd, &create) == 0); + igt_require(__gem_context_create_local(fd, &create) == 0); gem_context_destroy(fd, create.ctx_id); for_each_engine(fd, engine) { @@ -347,7 +347,7 @@ igt_main memset(&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_create_local(fd, &create), 0); igt_assert(create.ctx_id != 0); gem_context_destroy(fd, create.ctx_id); } @@ -356,7 +356,7 @@ igt_main memset(&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_create_local(fd, &create), -EINVAL); } igt_subtest("maximum-mem") diff --git a/tests/gem_reset_stats.c b/tests/gem_reset_stats.c index edc40767..f51475a9 100644 --- a/tests/gem_reset_stats.c +++ b/tests/gem_reset_stats.c @@ -438,6 +438,50 @@ static void test_ban_ctx(const struct intel_execution_engine *e) close(fd); } +#define CLIENT_BAN 4 +#define CTX_BAN 5 +static void test_client_ban(const struct intel_execution_engine *e) +{ + int fd_bad,fd_good; + struct local_drm_i915_reset_stats rs_bad, rs_good; + int ctx_bans; + uint32_t ctx_bad[CLIENT_BAN]; + uint32_t test_ctx; + + fd_bad = drm_open_driver(DRIVER_INTEL); + fd_good = drm_open_driver(DRIVER_INTEL); + + assert_reset_status(fd_bad, fd_bad, 0, RS_NO_ERROR); + assert_reset_status(fd_good, fd_good, 0, RS_NO_ERROR); + + for (int i = 0; i < CLIENT_BAN; i++) { + ctx_bad[i] = gem_context_create(fd_bad); + noop(fd_bad, ctx_bad[i], e); + assert_reset_status(fd_bad, fd_bad, ctx_bad[i], RS_NO_ERROR); + + ctx_bans = CTX_BAN; + while (ctx_bans--) + inject_hang(fd_bad, ctx_bad[i], e, BAN); + + igt_assert_eq(noop(fd_bad, ctx_bad[i], e), -EIO); + + assert_reset_status(fd_bad, fd_bad, ctx_bad[i], RS_BATCH_ACTIVE); + igt_assert_eq(gem_reset_stats(fd_bad, ctx_bad[i], &rs_bad), 0); + igt_assert_eq(rs_bad.batch_active, CTX_BAN); + } + + igt_assert_eq(__gem_context_create(fd_bad, &test_ctx), -EIO); + igt_info("Client banned after %d bad contexts\n", CLIENT_BAN); + + igt_assert_lt(0, noop(fd_good, 0, e)); + assert_reset_status(fd_good, fd_good, 0, RS_NO_ERROR); + igt_assert_eq(gem_reset_stats(fd_good, 0, &rs_good), 0); + igt_assert_eq(rs_good.batch_active, 0); + + close(fd_bad); + close(fd_good); +} + static void test_unrelated_ctx(const struct intel_execution_engine *e) { int fd1,fd2; @@ -817,6 +861,9 @@ igt_main igt_subtest_f("ban-ctx-%s", e->name) RUN_CTX_TEST(test_ban_ctx(e)); + igt_subtest_f("ban-client-%s", e->name) + RUN_CTX_TEST(test_client_ban(e)); + igt_subtest_f("reset-count-%s", e->name) RUN_TEST(test_reset_count(e, false));