Skip to content

Commit

Permalink
drm/i915/gt: Report context-is-closed prior to pinning
Browse files Browse the repository at this point in the history
Our assertion caught that we do try to pin a closed context if userspace
is viciously racing context-closure with execbuf, so make it fail
gracefully.

Closes: https://gitlab.freedesktop.org/drm/intel/issues/1492
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200320130159.3922-1-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Mar 20, 2020
1 parent cb1824b commit b412c63
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/gpu/drm/i915/gt/intel_context.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ int __intel_context_do_pin(struct intel_context *ce)
{
int err;

GEM_BUG_ON(intel_context_is_closed(ce));

if (unlikely(!test_bit(CONTEXT_ALLOC_BIT, &ce->flags))) {
err = intel_context_alloc_state(ce);
if (err)
Expand All @@ -114,6 +112,11 @@ int __intel_context_do_pin(struct intel_context *ce)
goto out_release;
}

if (unlikely(intel_context_is_closed(ce))) {
err = -ENOENT;
goto out_release;
}

if (likely(!atomic_add_unless(&ce->pin_count, 1, 0))) {
err = intel_context_active_acquire(ce);
if (unlikely(err))
Expand Down

0 comments on commit b412c63

Please sign in to comment.