| Message ID | 20200127231540.3302516-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/6] drm/i915: Skip capturing errors from internal contexts | expand |
Chris Wilson <chris@chris-wilson.co.uk> writes: > We don't want to report errors on the internal contexts to userspace, > suppressing their own, so treat them as simulated errors. These mostly > arise inside selftests and so are simulated anyway. For the rest, we can > rely on the normal debug channels in CI. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_gpu_error.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c > index 594341e27a47..0f67bef83106 100644 > --- a/drivers/gpu/drm/i915/i915_gpu_error.c > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c > @@ -1228,7 +1228,7 @@ static bool record_context(struct i915_gem_context_coredump *e, > { > struct i915_gem_context *ctx; > struct task_struct *task; > - bool capture; > + bool simulated; > > rcu_read_lock(); > ctx = rcu_dereference(rq->context->gem_context); > @@ -1236,7 +1236,7 @@ static bool record_context(struct i915_gem_context_coredump *e, > ctx = NULL; > rcu_read_unlock(); > if (!ctx) > - return false; > + return true; > > rcu_read_lock(); > task = pid_task(ctx->pid, PIDTYPE_PID); > @@ -1250,10 +1250,10 @@ static bool record_context(struct i915_gem_context_coredump *e, > e->guilty = atomic_read(&ctx->guilty_count); > e->active = atomic_read(&ctx->active_count); > > - capture = i915_gem_context_no_error_capture(ctx); > + simulated = i915_gem_context_no_error_capture(ctx); > > i915_gem_context_put(ctx); > - return capture; > + return simulated; > } > > struct intel_engine_capture_vma { > -- > 2.25.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 594341e27a47..0f67bef83106 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -1228,7 +1228,7 @@ static bool record_context(struct i915_gem_context_coredump *e, { struct i915_gem_context *ctx; struct task_struct *task; - bool capture; + bool simulated; rcu_read_lock(); ctx = rcu_dereference(rq->context->gem_context); @@ -1236,7 +1236,7 @@ static bool record_context(struct i915_gem_context_coredump *e, ctx = NULL; rcu_read_unlock(); if (!ctx) - return false; + return true; rcu_read_lock(); task = pid_task(ctx->pid, PIDTYPE_PID); @@ -1250,10 +1250,10 @@ static bool record_context(struct i915_gem_context_coredump *e, e->guilty = atomic_read(&ctx->guilty_count); e->active = atomic_read(&ctx->active_count); - capture = i915_gem_context_no_error_capture(ctx); + simulated = i915_gem_context_no_error_capture(ctx); i915_gem_context_put(ctx); - return capture; + return simulated; } struct intel_engine_capture_vma {
We don't want to report errors on the internal contexts to userspace, suppressing their own, so treat them as simulated errors. These mostly arise inside selftests and so are simulated anyway. For the rest, we can rely on the normal debug channels in CI. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_gpu_error.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)