1
0
Fork 0
alistair23-linux/drivers/gpu/drm/i915/gt
Chris Wilson ad1df24b37 drm/i915/gt: Prevent use of engine->wa_ctx after error
commit 488751a0ef upstream.

On error we unpin and free the wa_ctx.vma, but do not clear any of the
derived flags. During lrc_init, we look at the flags and attempt to
dereference the wa_ctx.vma if they are set. To protect the error path
where we try to limp along without the wa_ctx, make sure we clear those
flags!

Reported-by: Matt Roper <matthew.d.roper@intel.com>
Fixes: 604a8f6f1e ("drm/i915/lrc: Only enable per-context and per-bb buffers if set")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: <stable@vger.kernel.org> # v4.15+
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210108204026.20682-1-chris@chris-wilson.co.uk
(cherry-picked from 5b4dc95cf7)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210118095332.458813-1-chris@chris-wilson.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-01-27 11:47:42 +01:00
..
selftests drm/i915: Markup expected timeline locks for i915_active 2019-08-16 18:02:07 +01:00
uc drm/i915/uc: Never fail on HuC firmware errors 2019-08-18 11:58:41 +01:00
Makefile
gen6_renderstate.c
gen7_renderstate.c
gen8_renderstate.c
gen9_renderstate.c
intel_breadcrumbs.c Merge drm/drm-next into drm-intel-next-queued 2019-08-22 00:10:36 -07:00
intel_context.c drm/i915: Markup expected timeline locks for i915_active 2019-08-16 18:02:07 +01:00
intel_context.h drm/i915/gt: Mark context->active_count as protected by timeline->mutex 2019-08-16 18:02:06 +01:00
intel_context_types.h drm/i915/execlists: Lift process_csb() out of the irq-off spinlock 2019-08-16 20:59:02 +01:00
intel_engine.h drm/i915/execlists: Always force a context reload when rewinding RING_TAIL 2020-02-28 17:22:25 +01:00
intel_engine_cs.c drm/i915: Correctly set SFC capability for video engines 2020-11-18 19:20:33 +01:00
intel_engine_pm.c drm/i915: Hold irq-off for the entire fake lock period 2019-09-06 09:53:07 -07:00
intel_engine_pm.h
intel_engine_pool.c drm/i915: make pool objects read-only 2019-11-19 12:43:27 -08:00
intel_engine_pool.h drm/i915: Markup expected timeline locks for i915_active 2019-08-16 18:02:07 +01:00
intel_engine_pool_types.h
intel_engine_types.h drm/i915/execlists: Always force a context reload when rewinding RING_TAIL 2020-02-28 17:22:25 +01:00
intel_engine_user.c
intel_engine_user.h
intel_gpu_commands.h drm/i915/icl: Add command cache invalidate 2019-08-15 13:13:23 +01:00
intel_gt.c drm/i915: Protect request retirement with timeline->mutex 2019-08-15 23:21:13 +01:00
intel_gt.h
intel_gt_irq.c
intel_gt_irq.h
intel_gt_pm.c drm/i915/gen8+: Add RC6 CTX corruption WA 2019-11-05 11:43:07 -08:00
intel_gt_pm.h
intel_gt_pm_irq.c
intel_gt_pm_irq.h
intel_gt_types.h drm/i915: Move engine IDs out of i915_reg.h 2019-08-16 21:52:48 +01:00
intel_hangcheck.c
intel_lrc.c drm/i915/gt: Prevent use of engine->wa_ctx after error 2021-01-27 11:47:42 +01:00
intel_lrc.h
intel_lrc_reg.h drm/i915/tgl: add Gen12 default indirect ctx offset 2019-08-20 14:23:45 +01:00
intel_mocs.c drm/i915/gt: Program mocs:63 for cache eviction on gen9 2020-12-11 13:23:29 +01:00
intel_mocs.h
intel_renderstate.c drm/i915: Serialize against vma moves 2019-08-19 15:25:56 +01:00
intel_renderstate.h
intel_reset.c drm/i915: Fixup preempt-to-busy vs reset of a virtual request 2019-10-09 14:39:30 -07:00
intel_reset.h drm/i915: Don't mix srcu tag and negative error codes 2019-10-07 10:44:48 -07:00
intel_reset_types.h
intel_ringbuffer.c drm/i915/execlists: Always force a context reload when rewinding RING_TAIL 2020-02-28 17:22:25 +01:00
intel_sseu.c
intel_sseu.h
intel_timeline.c drm/i915: Hold irq-off for the entire fake lock period 2019-09-06 09:53:07 -07:00
intel_timeline.h drm/i915/gt: Track timeline activeness in enter/exit 2019-08-15 23:16:05 +01:00
intel_timeline_types.h drm/i915/gt: Guard timeline pinning without relying on struct_mutex 2019-08-15 23:21:13 +01:00
intel_workarounds.c drm/i915: Whitelist COMMON_SLICE_CHICKEN2 2019-10-07 10:44:47 -07:00
intel_workarounds.h
intel_workarounds_types.h
mock_engine.c drm/i915: Protect request retirement with timeline->mutex 2019-08-15 23:21:13 +01:00
mock_engine.h
selftest_context.c drm/i915/selftests: Check the context size 2019-08-17 09:27:58 +01:00
selftest_engine.c
selftest_engine.h
selftest_engine_cs.c
selftest_engine_pm.c
selftest_hangcheck.c drm/i915: Track ggtt fence reservations under its own mutex 2019-08-22 08:53:40 +01:00
selftest_lrc.c drm/i915: Serialize against vma moves 2019-08-19 15:25:56 +01:00
selftest_reset.c
selftest_timeline.c drm/i915: Markup expected timeline locks for i915_active 2019-08-16 18:02:07 +01:00
selftest_workarounds.c drm/i915: Serialize against vma moves 2019-08-19 15:25:56 +01:00