Commit 749085a2 authored by Chris Wilson's avatar Chris Wilson Committed by Rodrigo Vivi

drm/i915/execlists: Protect peeking at execlists->active

Now that we dropped the engine->active.lock serialisation from around
process_csb(), direct submission can run concurrently to the interrupt
handler. As such execlists->active may be advanced as we dequeue,
dropping the reference to the request. We need to employ our RCU request
protection to ensure that the request is not freed too early.

Fixes: df403069 ("drm/i915/execlists: Lift process_csb() out of the irq-off spinlock")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191009100955.21477-1-chris@chris-wilson.co.uk
(cherry picked from commit c949ae43)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 68184eb7
...@@ -903,7 +903,7 @@ static void virtual_xfer_breadcrumbs(struct virtual_engine *ve, ...@@ -903,7 +903,7 @@ static void virtual_xfer_breadcrumbs(struct virtual_engine *ve,
static struct i915_request * static struct i915_request *
last_active(const struct intel_engine_execlists *execlists) last_active(const struct intel_engine_execlists *execlists)
{ {
struct i915_request * const *last = execlists->active; struct i915_request * const *last = READ_ONCE(execlists->active);
while (*last && i915_request_completed(*last)) while (*last && i915_request_completed(*last))
last++; last++;
...@@ -1608,8 +1608,11 @@ static void process_csb(struct intel_engine_cs *engine) ...@@ -1608,8 +1608,11 @@ static void process_csb(struct intel_engine_cs *engine)
static void __execlists_submission_tasklet(struct intel_engine_cs *const engine) static void __execlists_submission_tasklet(struct intel_engine_cs *const engine)
{ {
lockdep_assert_held(&engine->active.lock); lockdep_assert_held(&engine->active.lock);
if (!engine->execlists.pending[0]) if (!engine->execlists.pending[0]) {
rcu_read_lock(); /* protect peeking at execlists->active */
execlists_dequeue(engine); execlists_dequeue(engine);
rcu_read_unlock();
}
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment