| Message ID | 20170621103929.20135-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 21/06/2017 11:39, Chris Wilson wrote: > 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> > --- > drivers/gpu/drm/i915/i915_gem_execbuffer.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c > index b2457556591c..0ecd2abaef3c 100644 > --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c > @@ -672,13 +672,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; > > @@ -700,6 +693,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); > > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index b2457556591c..0ecd2abaef3c 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -672,13 +672,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; @@ -700,6 +693,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);
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> --- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)