drm/i915/gt: Prevent queuing retire workers on the virtual engine
Virtual engines are fleeting. They carry a reference count and may be freed when their last request is retired. This makes them unsuitable for the task of housing engine->retire.work so assert that it is not used. Tvrtko tracked down an instance where we did indeed violate this rule. In virtual_submit_request, we flush a completed request directly with __i915_request_submit and this causes us to queue that request on the veng's breadcrumb list and signal it. Leading us down a path where we should not attach the retire. Reported-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Fixes:dc93c9b693
("drm/i915/gt: Schedule request retirement when signaler idles") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200206204915.2636606-1-chris@chris-wilson.co.uk (cherry picked from commitf91d8156ab
) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
parent
2e0a576511
commit
e543e370ec
|
@ -136,6 +136,9 @@ static void add_retire(struct intel_breadcrumbs *b, struct intel_timeline *tl)
|
|||
struct intel_engine_cs *engine =
|
||||
container_of(b, struct intel_engine_cs, breadcrumbs);
|
||||
|
||||
if (unlikely(intel_engine_is_virtual(engine)))
|
||||
engine = intel_virtual_engine_get_sibling(engine, 0);
|
||||
|
||||
intel_engine_add_retire(engine, tl);
|
||||
}
|
||||
|
||||
|
|
|
@ -99,6 +99,9 @@ static bool add_retire(struct intel_engine_cs *engine,
|
|||
void intel_engine_add_retire(struct intel_engine_cs *engine,
|
||||
struct intel_timeline *tl)
|
||||
{
|
||||
/* We don't deal well with the engine disappearing beneath us */
|
||||
GEM_BUG_ON(intel_engine_is_virtual(engine));
|
||||
|
||||
if (add_retire(engine, tl))
|
||||
schedule_work(&engine->retire_work);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue