From patchwork Mon Dec 4 23:45:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Antonio Argenziano X-Patchwork-Id: 10091757 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 7971660327 for ; Mon, 4 Dec 2017 23:45:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A43E28E6D for ; Mon, 4 Dec 2017 23:45:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E01028F07; Mon, 4 Dec 2017 23:45:59 +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 D54C428E6D for ; Mon, 4 Dec 2017 23:45:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1DC326E3CE; Mon, 4 Dec 2017 23:45:58 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id B7D7B6E3CE for ; Mon, 4 Dec 2017 23:45:56 +0000 (UTC) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Dec 2017 15:45:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,362,1508828400"; d="scan'208";a="184004467" Received: from relo-linux-2.fm.intel.com ([10.1.27.122]) by fmsmga006.fm.intel.com with ESMTP; 04 Dec 2017 15:45:56 -0800 From: Antonio Argenziano To: intel-gfx@lists.freedesktop.org Date: Mon, 4 Dec 2017 15:45:40 -0800 Message-Id: <20171204234541.23649-1-antonio.argenziano@intel.com> X-Mailer: git-send-email 2.14.2 Subject: [Intel-gfx] [PATCH i-g-t v2 1/2] tests/gem_exec_schedule: Add reset on failed preemption 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 This patch adds a test where a low priority batch is going to be declared hung while a preemption is pending. The test wants to verify that a 'hanging' low priority batch will not disrupt the execution of a high priority context and that the driver does due diligence in managing a reset while a preemption is pending. -v2: - Use igt_hang_ctx to hang the engine (Chris) - Enable/Process engine reset using IGT libs (Chris) - Create new subtest_group for the test (Chris) Cc: Chris Wilson Cc: Michal Winiarski Signed-off-by: Antonio Argenziano Reviewed-by: Michał Winiarski --- tests/gem_exec_schedule.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/tests/gem_exec_schedule.c b/tests/gem_exec_schedule.c index a2f4419a..d0f85b3e 100644 --- a/tests/gem_exec_schedule.c +++ b/tests/gem_exec_schedule.c @@ -356,13 +356,15 @@ static void promotion(int fd, unsigned ring) munmap(ptr, 4096); } -#define NEW_CTX 0x1 +#define NEW_CTX (0x1 << 0) +#define HANG_LP (0x1 << 1) static void preempt(int fd, unsigned ring, unsigned flags) { uint32_t result = gem_create(fd, 4096); uint32_t *ptr = gem_mmap__gtt(fd, result, 4096, PROT_READ); igt_spin_t *spin[16]; uint32_t ctx[2]; + igt_hang_t hang; ctx[LO] = gem_context_create(fd); gem_context_set_priority(fd, ctx[LO], MIN_PRIO); @@ -370,6 +372,9 @@ static void preempt(int fd, unsigned ring, unsigned flags) ctx[HI] = gem_context_create(fd); gem_context_set_priority(fd, ctx[HI], MAX_PRIO); + if (flags & HANG_LP) + hang = igt_hang_ctx(fd, ctx[LO], ring, 0, NULL); + for (int n = 0; n < 16; n++) { if (flags & NEW_CTX) { gem_context_destroy(fd, ctx[LO]); @@ -389,6 +394,9 @@ static void preempt(int fd, unsigned ring, unsigned flags) for (int n = 0; n < 16; n++) igt_spin_batch_free(fd, spin[n]); + if (flags & HANG_LP) + igt_post_hang_ring(fd, hang); + gem_context_destroy(fd, ctx[LO]); gem_context_destroy(fd, ctx[HI]); @@ -1023,6 +1031,24 @@ igt_main igt_subtest_f("preempt-self-%s", e->name) preempt_self(fd, e->exec_id | e->flags); + + igt_subtest_group { + igt_hang_t hang; + + igt_fixture { + igt_stop_hang_detector(); + hang = igt_allow_hang(fd, 0, 0); + } + + igt_subtest_f("preempt-hang-%s", e->name) { + preempt(fd, e->exec_id | e->flags, NEW_CTX | HANG_LP); + } + + igt_fixture { + igt_disallow_hang(fd, hang); + igt_fork_hang_detector(fd); + } + } } igt_subtest_f("deep-%s", e->name)