From patchwork Wed Jan 30 13:12:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 10788555 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 8F57314E1 for ; Wed, 30 Jan 2019 13:20:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BD962ECF5 for ; Wed, 30 Jan 2019 13:20:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79E922ED06; Wed, 30 Jan 2019 13:20:43 +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 7079C2ED75 for ; Wed, 30 Jan 2019 13:20:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9CFCD6EB64; Wed, 30 Jan 2019 13:20:40 +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 0919F6EB56; Wed, 30 Jan 2019 13:20:38 +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 15403406-1500050 for multiple; Wed, 30 Jan 2019 13:20:26 +0000 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 30 Jan 2019 13:12:12 +0000 Message-Id: <20190130131212.15859-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t] i915/gem_eio: 64 batches may be too many for some devices! 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, Mika Kuoppala Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Actually measure how many batches we can fit into a ring before blocking, or else we may end up hanging the device earlier than expected! Signed-off-by: Chris Wilson Cc: Mika Kuoppala --- tests/i915/gem_eio.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tests/i915/gem_eio.c b/tests/i915/gem_eio.c index 09059c311..534bd1899 100644 --- a/tests/i915/gem_eio.c +++ b/tests/i915/gem_eio.c @@ -44,6 +44,7 @@ #include "igt_device.h" #include "igt_sysfs.h" #include "sw_sync.h" +#include "i915/gem_ring.h" IGT_TEST_DESCRIPTION("Test that specific ioctls report a wedged GPU (EIO)."); @@ -358,10 +359,15 @@ static void test_inflight(int fd, unsigned int wait) { int parent_fd = fd; unsigned int engine; + int max; igt_require_gem(fd); igt_require(gem_has_exec_fence(fd)); + max = gem_measure_ring_inflight(fd, -1, 0); + igt_require(max > 1); + max = min(max - 1, 64); + for_each_engine(parent_fd, engine) { const uint32_t bbe = MI_BATCH_BUFFER_END; struct drm_i915_gem_exec_object2 obj[2]; @@ -389,7 +395,7 @@ static void test_inflight(int fd, unsigned int wait) execbuf.buffer_count = 2; execbuf.flags = engine | I915_EXEC_FENCE_OUT; - for (unsigned int n = 0; n < ARRAY_SIZE(fence); n++) { + for (unsigned int n = 0; n < max; n++) { gem_execbuf_wr(fd, &execbuf); fence[n] = execbuf.rsvd2 >> 32; igt_assert(fence[n] != -1); @@ -397,7 +403,7 @@ static void test_inflight(int fd, unsigned int wait) check_wait(fd, obj[1].handle, wait); - for (unsigned int n = 0; n < ARRAY_SIZE(fence); n++) { + for (unsigned int n = 0; n < max; n++) { igt_assert_eq(sync_fence_status(fence[n]), -EIO); close(fence[n]); } @@ -418,6 +424,11 @@ static void test_inflight_suspend(int fd) uint32_t bbe = MI_BATCH_BUFFER_END; int fence[64]; /* conservative estimate of ring size */ igt_spin_t *hang; + int max; + + max = gem_measure_ring_inflight(fd, -1, 0); + igt_require(max > 1); + max = min(max - 1, 64); fd = gem_reopen_driver(fd); igt_require_gem(fd); @@ -437,7 +448,7 @@ static void test_inflight_suspend(int fd) execbuf.buffer_count = 2; execbuf.flags = I915_EXEC_FENCE_OUT; - for (unsigned int n = 0; n < ARRAY_SIZE(fence); n++) { + for (unsigned int n = 0; n < max; n++) { gem_execbuf_wr(fd, &execbuf); fence[n] = execbuf.rsvd2 >> 32; igt_assert(fence[n] != -1); @@ -448,7 +459,7 @@ static void test_inflight_suspend(int fd) check_wait(fd, obj[1].handle, 10); - for (unsigned int n = 0; n < ARRAY_SIZE(fence); n++) { + for (unsigned int n = 0; n < max; n++) { igt_assert_eq(sync_fence_status(fence[n]), -EIO); close(fence[n]); }