drm/i915: Check context status before looking up our obj/vma

Since we keep the context around across the slow lookup where we may
drop the struct_mutex, we should double check that the context is still
valid upon reacquisition.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170816085210.4199-2-chris@chris-wilson.co.uk
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 359d5dc6d8df4870e8395c411862c55e157e59b0..044fb1205554e3687f5fb99dcd49ea136271ca3e 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -679,13 +679,6 @@ static int eb_select_context(struct i915_execbuffer *eb)
        if (unlikely(!ctx))
                return -ENOENT;
 
-       if (unlikely(i915_gem_context_is_banned(ctx))) {
-               DRM_DEBUG("Context %u tried to submit while banned\n",
-                         ctx->user_handle);
-               i915_gem_context_put(ctx);
-               return -EIO;
-       }
-
        eb->ctx = ctx;
        eb->vm = ctx->ppgtt ? &ctx->ppgtt->base : &eb->i915->ggtt.base;
 
@@ -707,6 +700,12 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb)
        int slow_pass = -1;
        int err;
 
+       if (unlikely(i915_gem_context_is_closed(eb->ctx)))
+               return -ENOENT;
+
+       if (unlikely(i915_gem_context_is_banned(eb->ctx)))
+               return -EIO;
+
        INIT_LIST_HEAD(&eb->relocs);
        INIT_LIST_HEAD(&eb->unbound);