dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Brost <matthew.brost@intel.com>
To: <gfx-internal-devel@eclists.intel.com>,
	<dri-devel@lists.freedesktop.org>
Subject: [PATCH 8/9] drm/i915/selftests: Fix memory corruption in live_lrc_isolation
Date: Wed, 11 Aug 2021 01:16:21 +0000	[thread overview]
Message-ID: <20210811011622.255784-9-matthew.brost@intel.com> (raw)
In-Reply-To: <20210811011622.255784-1-matthew.brost@intel.com>

GuC submission has exposed an existing memory corruption in
live_lrc_isolation. We believe that some writes to the watchdog offsets
in the LRC (0x178 & 0x17c) can result in trashing of portions of the
address space. With GuC submission there are additional objects which
can move the context redzone into the space that is trashed. To
workaround this avoid poisoning the watchdog.

v2:
 (Daniel Vetter)
  - Add VLK ref in code to workaround

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
 drivers/gpu/drm/i915/gt/selftest_lrc.c | 29 +++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
index b0977a3b699b..cdc6ae48a1e1 100644
--- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
+++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
@@ -1074,6 +1074,32 @@ record_registers(struct intel_context *ce,
 	goto err_after;
 }
 
+static u32 safe_offset(u32 offset, u32 reg)
+{
+	/* XXX skip testing of watchdog - VLK-22772 */
+	if (offset == 0x178 || offset == 0x17c)
+		reg = 0;
+
+	return reg;
+}
+
+static int get_offset_mask(struct intel_engine_cs *engine)
+{
+	if (GRAPHICS_VER(engine->i915) < 12)
+		return 0xfff;
+
+	switch (engine->class) {
+	default:
+	case RENDER_CLASS:
+		return 0x07ff;
+	case COPY_ENGINE_CLASS:
+		return 0x0fff;
+	case VIDEO_DECODE_CLASS:
+	case VIDEO_ENHANCEMENT_CLASS:
+		return 0x3fff;
+	}
+}
+
 static struct i915_vma *load_context(struct intel_context *ce, u32 poison)
 {
 	struct i915_vma *batch;
@@ -1117,7 +1143,8 @@ static struct i915_vma *load_context(struct intel_context *ce, u32 poison)
 		len = (len + 1) / 2;
 		*cs++ = MI_LOAD_REGISTER_IMM(len);
 		while (len--) {
-			*cs++ = hw[dw];
+			*cs++ = safe_offset(hw[dw] & get_offset_mask(ce->engine),
+					    hw[dw]);
 			*cs++ = poison;
 			dw += 2;
 		}
-- 
2.32.0


  parent reply	other threads:[~2021-08-11  1:16 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-11  1:16 [PATCH 0/9] Clean up some CI failures for GuC submission Matthew Brost
2021-08-11  1:16 ` [PATCH 1/9] drm/i915/guc: Fix blocked context accounting Matthew Brost
2021-08-11 10:30   ` Daniel Vetter
2021-08-11 17:28     ` Matthew Brost
2021-08-11  1:16 ` [PATCH 2/9] drm/i915/guc: outstanding G2H accounting Matthew Brost
2021-08-11  1:16 ` [PATCH 3/9] drm/i915/guc: Unwind context requests in reverse order Matthew Brost
2021-08-11  1:16 ` [PATCH 4/9] drm/i915/guc: Don't drop ce->guc_active.lock when unwinding context Matthew Brost
2021-08-11  1:16 ` [PATCH 5/9] drm/i915/guc: Flush the work queue for GuC generated G2H Matthew Brost
2021-08-12 14:11   ` Daniel Vetter
2021-08-12 15:23     ` Matthew Brost
2021-08-12 19:47       ` Daniel Vetter
2021-08-12 22:38         ` Matthew Brost
2021-08-13 15:11           ` Daniel Vetter
2021-08-13 19:02             ` Matthew Brost
2021-08-16 15:39               ` Daniel Vetter
2021-08-11  1:16 ` [PATCH 6/9] drm/i915/guc: Do not clear enable during reset in an enable is inflight Matthew Brost
2021-08-11  1:16 ` [PATCH 7/9] drm/i915/guc: Don't enable scheduling on a banned context Matthew Brost
2021-08-11  1:16 ` Matthew Brost [this message]
2021-08-11  1:16 ` [PATCH 9/9] drm/i915/selftests: Add initial GuC selftest for scrubbing lost G2H Matthew Brost

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=20210811011622.255784-9-matthew.brost@intel.com \
    --to=matthew.brost@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=gfx-internal-devel@eclists.intel.com \
    /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