From patchwork Fri Nov 5 15:01:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 12604851 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 207DBC433F5 for ; Fri, 5 Nov 2021 15:05:36 +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 D8DF1603E8 for ; Fri, 5 Nov 2021 15:05:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D8DF1603E8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B55E6EB79; Fri, 5 Nov 2021 15:05:35 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 15D676EB74 for ; Fri, 5 Nov 2021 15:05:32 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10158"; a="231756613" X-IronPort-AV: E=Sophos;i="5.87,212,1631602800"; d="scan'208";a="231756613" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Nov 2021 08:01:56 -0700 X-IronPort-AV: E=Sophos;i="5.87,212,1631602800"; d="scan'208";a="730548416" Received: from inechita-mobl1.ger.corp.intel.com (HELO thellstr-mobl1.intel.com) ([10.249.254.167]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Nov 2021 08:01:55 -0700 From: =?utf-8?q?Thomas_Hellstr=C3=B6m?= To: intel-gfx@lists.freedesktop.org Date: Fri, 5 Nov 2021 16:01:46 +0100 Message-Id: <20211105150146.834052-2-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211105150146.834052-1-thomas.hellstrom@linux.intel.com> References: <20211105150146.834052-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v3 2/2] HAX: drm/i915/selftest: Temporarily avoid tainting the kernel on engine reset failure 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The taint aborts the CI test runner. Skip the affected GEM_TRACE_DUMP() that taints the kernel to allow CI to proceed. There has been a suggestion to also remove the intel_gt_set_wedged() and return -EINTR to allow also skipped subtests to proceed but that might and would probably clash with the GuC global reset. v2: - Comment out GEM_TRACE_DUMP() also active_request_put(). v3: - Condition the workaround on DG1. Signed-off-by: Thomas Hellström --- drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c index e5ad4d5a91c0..7fd31dd33e87 100644 --- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c +++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c @@ -887,7 +887,9 @@ static int active_request_put(struct i915_request *rq) rq->engine->name, rq->fence.context, rq->fence.seqno); - GEM_TRACE_DUMP(); + /* Temporary workaround to allow CI to proceed */ + if (!IS_DG1(rq->context->engine->i915)) + GEM_TRACE_DUMP(); intel_gt_set_wedged(rq->engine->gt); err = -EIO; @@ -1115,7 +1117,12 @@ static int __igt_reset_engines(struct intel_gt *gt, rq->fence.seqno, rq->context->guc_id.id); i915_request_put(rq); - GEM_TRACE_DUMP(); + /* + * Temporary workaround to allow CI + * to proceed. + */ + if (!IS_DG1(gt->i915)) + GEM_TRACE_DUMP(); intel_gt_set_wedged(gt); err = -EIO; goto restore;