From patchwork Wed Jan 29 22:24:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 11356965 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 700C613A4 for ; Wed, 29 Jan 2020 22:25:19 +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 584C2206F0 for ; Wed, 29 Jan 2020 22:25:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 584C2206F0 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 650C16F89F; Wed, 29 Jan 2020 22:25:17 +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 63C8B6F8A1; Wed, 29 Jan 2020 22:25:15 +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 20053177-1500050 for multiple; Wed, 29 Jan 2020 22:24:56 +0000 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 29 Jan 2020 22:24:56 +0000 Message-Id: <20200129222456.1503424-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t] i915/gem_exec_reloc: Add SIGINT injection X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 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 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Do a pass over gem_exec_reloc where we inject lots of SIGINTs. Signed-off-by: Chris Wilson Cc: Antonio Argenziano Reviewed-by: Antonio Argenziano --- tests/i915/gem_exec_reloc.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c index bc904a0ae..1aa03fba3 100644 --- a/tests/i915/gem_exec_reloc.c +++ b/tests/i915/gem_exec_reloc.c @@ -379,7 +379,8 @@ static bool has_64b_reloc(int fd) #define NORELOC 1 #define ACTIVE 2 -#define HANG 4 +#define INTERRUPTIBLE 4 +#define HANG 8 static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags) { #define OBJSZ 8192 @@ -735,6 +736,7 @@ igt_main { "", 0 , true}, { "-noreloc", NORELOC, true }, { "-active", ACTIVE, true }, + { "-interruptible", ACTIVE | INTERRUPTIBLE }, { "-hang", ACTIVE | HANG }, { }, }, *f; @@ -762,14 +764,17 @@ igt_main f->name) { if ((m->before | m->after) & I915_GEM_DOMAIN_WC) igt_require(gem_mmap__has_wc(fd)); - basic_reloc(fd, m->before, m->after, f->flags); + igt_while_interruptible(f->flags & INTERRUPTIBLE) + basic_reloc(fd, m->before, m->after, f->flags); } } if (!(f->flags & NORELOC)) { igt_subtest_f("%srange%s", - f->basic ? "basic-" : "", f->name) - basic_range(fd, f->flags); + f->basic ? "basic-" : "", f->name) { + igt_while_interruptible(f->flags & INTERRUPTIBLE) + basic_range(fd, f->flags); + } } igt_fixture {