From: Matthew Brost <matthew.brost@intel.com>
To: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
daniel.vetter@ffwll.ch
Subject: Re: [Intel-gfx] [PATCH 11/27] drm/i915/selftests: Fix memory corruption in live_lrc_isolation
Date: Wed, 25 Aug 2021 13:03:21 -0700 [thread overview]
Message-ID: <20210825200319.GA2751@jons-linux-dev-box> (raw)
In-Reply-To: <1b23ca1d-7fc1-b812-8e1b-144ee2bc8b8a@intel.com>
On Tue, Aug 24, 2021 at 05:07:13PM -0700, Daniele Ceraolo Spurio wrote:
>
>
> On 8/18/2021 11:16 PM, Matthew Brost wrote:
> > 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.
>
> This is kind of a worrying explanation, as it implies an HW issue. AFAICS we
> no longer increase the context size with GuC submission, so the redzone
> should be in the same place relative to the base address of the context;
> although it is true that we have more objects in memory due to support the
> GuC, hitting the redzone consistently feels too much like a coincidence.
> When we write the watchdog regs there is a risk we're triggering a watchdog
> interrupt, which will cause the GuC to handle that; on a media reset, the
> GuC overwrites the context with the golden context in the ADS, are we sure
> that's not what is causing this problem?
> Looking in the ADS we set the context memcpy size to:
>
> real_size = intel_engine_context_size(gt, engine_class);
>
> but then we only initialize real_size - SKIP_SIZE(gt->i915), which IMO could
> be the real cause of the bug as the GuC memcpy starts at SKIP_SIZE().
>
Good analysis Daniele. This definitely seems to be the issue as the
below patch appears to have fixed the failing selftest:
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
index 9f5f43a16182..c19ce71c9de9 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
@@ -358,6 +358,11 @@ static int guc_prep_golden_context(struct intel_guc *guc,
u8 engine_class, guc_class;
struct guc_gt_system_info *info, local_info;
+ /* Skip execlist and PPGTT registers + HWSP */
+ const u32 lr_hw_context_size = 80 * sizeof(u32);
+ const u32 skip_size = LRC_PPHWSP_SZ * PAGE_SIZE +
+ lr_hw_context_size;
+
/*
* Reserve the memory for the golden contexts and point GuC at it but
* leave it empty for now. The context data will be filled in later
@@ -396,7 +401,7 @@ static int guc_prep_golden_context(struct intel_guc *guc,
if (!blob)
continue;
- blob->ads.eng_state_size[guc_class] = real_size;
+ blob->ads.eng_state_size[guc_class] = real_size - skip_size;
blob->ads.golden_context_lrca[guc_class] = addr_ggtt;
addr_ggtt += alloc_size;
}
@@ -476,7 +481,8 @@ static void guc_init_golden_context(struct intel_guc *guc)
continue;
}
- GEM_BUG_ON(blob->ads.eng_state_size[guc_class] != real_size);
+ GEM_BUG_ON(blob->ads.eng_state_size[guc_class] !=
+ real_size - skip_size);
GEM_BUG_ON(blob->ads.golden_context_lrca[guc_class] != addr_ggtt);
addr_ggtt += alloc_size;
This being said, IMO this actually a bug in the GuC firmware as it
basically is doing:
memcpy(some_guc_dest, blob->ads.golden_context_lrca +
guc_calculated_skip_size,
blob->ads.eng_state_size);
IMO if the GuC is applying an internally calculated offset to
blob->ads.golden_context_lrca it should substract that calculated size
from blob->ads.eng_state_size.
e.g. the GuC should be doing:
memcpy(some_guc_dest, blob->ads.golden_context_lrca +
guc_calculated_skip_size,
blob->ads.eng_state_size - guc_calculated_skip_size);
We can bring this up with the GuC firmware team today, but in the
meantime I'll include the above patch in the respin of this series as a
workaround.
Matt
> Daniele
>
> >
> > 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;
> > }
>
next prev parent reply other threads:[~2021-08-25 20:08 UTC|newest]
Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-19 6:16 [Intel-gfx] [PATCH 00/27] Clean up GuC CI failures, simplify locking, and kernel DOC Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-19 6:16 ` [Intel-gfx] [PATCH 01/27] drm/i915/guc: Fix blocked context accounting Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-24 23:24 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-24 23:24 ` Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 02/27] drm/i915/guc: Fix outstanding G2H accounting Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-19 21:31 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-19 21:30 ` Matthew Brost
2021-08-19 6:16 ` [Intel-gfx] [PATCH 03/27] drm/i915/guc: Unwind context requests in reverse order Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-19 23:54 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-19 23:53 ` Matthew Brost
2021-08-20 0:03 ` Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 04/27] drm/i915/guc: Don't drop ce->guc_active.lock when unwinding context Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-20 0:01 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-19 23:58 ` Matthew Brost
2021-08-19 6:16 ` [Intel-gfx] [PATCH 05/27] drm/i915/guc: Process all G2H message at once in work queue Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-20 0:06 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-20 0:06 ` Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 06/27] drm/i915/guc: Workaround reset G2H is received after schedule done G2H Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-24 23:31 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-25 4:05 ` Matthew Brost
2021-08-19 6:16 ` [Intel-gfx] [PATCH 07/27] Revert "drm/i915/gt: Propagate change in error status to children on unhold" Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-20 19:47 ` [Intel-gfx] " Jason Ekstrand
2021-08-20 19:47 ` Jason Ekstrand
2021-08-19 6:16 ` [Intel-gfx] [PATCH 08/27] drm/i915/selftests: Add a cancel request selftest that triggers a reset Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-19 6:16 ` [Intel-gfx] [PATCH 09/27] drm/i915/guc: Kick tasklet after queuing a request Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-20 18:31 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-20 18:36 ` Matthew Brost
2021-08-19 6:16 ` [Intel-gfx] [PATCH 10/27] drm/i915/guc: Don't enable scheduling on a banned context, guc_id invalid, not registered Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-20 18:42 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-20 18:42 ` Matthew Brost
2021-08-19 6:16 ` [Intel-gfx] [PATCH 11/27] drm/i915/selftests: Fix memory corruption in live_lrc_isolation Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-25 0:07 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-25 20:03 ` Matthew Brost [this message]
2021-08-19 6:16 ` [Intel-gfx] [PATCH 12/27] drm/i915/selftests: Add initial GuC selftest for scrubbing lost G2H Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-25 0:58 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-25 0:58 ` Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 13/27] drm/i915/guc: Take context ref when cancelling request Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-21 0:07 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-21 0:07 ` Daniele Ceraolo Spurio
2021-08-24 15:42 ` [Intel-gfx] " Matthew Brost
2021-08-24 15:42 ` Matthew Brost
2021-08-25 1:21 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-25 1:21 ` Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 14/27] drm/i915/guc: Don't touch guc_state.sched_state without a lock Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-25 1:20 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-25 1:44 ` Matthew Brost
2021-08-25 1:51 ` Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 15/27] drm/i915/guc: Reset LRC descriptor if register returns -ENODEV Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-21 0:14 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-21 0:14 ` Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 16/27] drm/i915: Allocate error capture in nowait context Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-19 6:16 ` [Intel-gfx] [PATCH 17/27] drm/i915/guc: Flush G2H work queue during reset Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-21 0:25 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-21 0:25 ` Daniele Ceraolo Spurio
2021-08-24 15:44 ` [Intel-gfx] " Matthew Brost
2021-08-24 15:44 ` Matthew Brost
2021-08-25 1:22 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-25 1:22 ` Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 18/27] drm/i915/guc: Release submit fence from an irq_work Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-25 1:44 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 19/27] drm/i915/guc: Move guc_blocked fence to struct guc_state Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-21 0:30 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-21 0:30 ` Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 20/27] drm/i915/guc: Rework and simplify locking Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-25 16:52 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-25 19:22 ` Matthew Brost
2021-08-19 6:16 ` [Intel-gfx] [PATCH 21/27] drm/i915/guc: Proper xarray usage for contexts_lookup Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-26 0:44 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-26 0:41 ` Matthew Brost
2021-08-26 0:48 ` Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 22/27] drm/i915/guc: Drop pin count check trick between sched_disable and re-pin Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-26 0:50 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-26 0:50 ` Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 23/27] drm/i915/guc: Move GuC priority fields in context under guc_active Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-25 21:51 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-25 22:53 ` Matthew Brost
2021-08-25 23:04 ` Matthew Brost
2021-08-19 6:16 ` [Intel-gfx] [PATCH 24/27] drm/i915/guc: Move fields protected by guc->contexts_lock into sub structure Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-25 2:00 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-25 2:00 ` Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 25/27] drm/i915/guc: Drop guc_active move everything into guc_state Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-26 0:54 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-26 0:54 ` Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 26/27] drm/i915/guc: Add GuC kernel doc Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-26 1:03 ` [Intel-gfx] " Daniele Ceraolo Spurio
2021-08-19 6:16 ` [Intel-gfx] [PATCH 27/27] drm/i915/guc: Drop static inline functions intel_guc_submission.c Matthew Brost
2021-08-19 6:16 ` Matthew Brost
2021-08-19 7:18 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Clean up GuC CI failures, simplify locking, and kernel DOC (rev3) Patchwork
2021-08-19 7:20 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-08-19 7:51 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-08-19 9:08 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " 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=20210825200319.GA2751@jons-linux-dev-box \
--to=matthew.brost@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniele.ceraolospurio@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.