From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH v3 2/2] HAX: drm/i915/selftest: Temporarily avoid tainting the kernel on engine reset failure
Date: Fri, 5 Nov 2021 16:01:46 +0100 [thread overview]
Message-ID: <20211105150146.834052-2-thomas.hellstrom@linux.intel.com> (raw)
In-Reply-To: <20211105150146.834052-1-thomas.hellstrom@linux.intel.com>
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 <thomas.hellstrom@linux.intel.com>
---
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;
--
2.31.1
next prev parent reply other threads:[~2021-11-05 15:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-05 15:01 [Intel-gfx] [PATCH v3 1/2] drm/i915/selftests: Use clear_and_wake_up_bit() for the per-engine reset bitlocks Thomas Hellström
2021-11-05 15:01 ` Thomas Hellström [this message]
2021-11-05 15:42 ` [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [v3,1/2] " Patchwork
2021-11-05 16:55 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-11-08 8:09 ` Thomas Hellström
2021-11-08 18:25 ` Vudum, Lakshminarayana
2021-11-08 16:43 ` [Intel-gfx] ✓ Fi.CI.IGT: success " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211105150146.834052-2-thomas.hellstrom@linux.intel.com \
--to=thomas.hellstrom@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox