summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMika Kuoppala <mika.kuoppala@intel.com>2016-11-08 17:21:09 +0200
committerMika Kuoppala <mika.kuoppala@intel.com>2016-11-11 15:45:27 +0200
commitdc7ec32830e13a7f852d69b2f12da2806dc14db4 (patch)
tree1ecb63b09181e38f6e8d0aa35c7a0d4635ad5cf2
parent9f3c978720a82f3043060b5e43cfd7d4fa79f2bd (diff)
drm/i915: Add per client max context ban limit
If we have a bad client submitting unfavourably across different contexts, creating new ones, the per context scoring of badness doesn't remove the root cause, the offending client. To counter, keep track of per client context bans. Deny access if client is responsible for more than 3 context bans in it's lifetime. Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h5
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c28
-rw-r--r--drivers/gpu/drm/i915/i915_gem_context.c16
-rw-r--r--drivers/gpu/drm/i915/i915_gem_execbuffer.c8
-rw-r--r--drivers/gpu/drm/i915/i915_gpu_error.c10
5 files changed, 54 insertions, 13 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 734450dd746c..755112b9aa6e 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -411,6 +411,10 @@ struct drm_i915_file_private {
} rps;
unsigned int bsd_engine;
+
+#define I915_MAX_CLIENT_CONTEXT_BANS 3
+ /* Accumulated hang score across all context */
+ int context_bans;
};
/* Used by dp and fdi links */
@@ -849,6 +853,7 @@ struct drm_i915_error_state {
pid_t pid;
char comm[TASK_COMM_LEN];
+ int context_bans;
} engine[I915_NUM_ENGINES];
struct drm_i915_error_buffer {
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 8aa69f99b5f9..2d4e0d5ebe28 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2570,19 +2570,33 @@ static bool i915_context_is_banned(const struct i915_gem_context *ctx)
return false;
}
-static void i915_gem_context_mark_guilty(struct i915_gem_context *ctx)
+static void i915_gem_request_mark_guilty(struct drm_i915_gem_request *request)
{
- struct i915_ctx_hang_stats *hs = &ctx->hang_stats;
+ struct i915_ctx_hang_stats *hs = &request->ctx->hang_stats;
hs->ban_score += 10;
- hs->banned = i915_context_is_banned(ctx);
+ hs->banned = i915_context_is_banned(request->ctx);
hs->batch_active++;
+
+ DRM_DEBUG_DRIVER("context %s marked guilty (score %d) banned? %s\n",
+ request->ctx->name, hs->ban_score, yesno(hs->banned));
+
+ if (!request->file_priv)
+ return;
+
+ if (hs->banned) {
+ request->file_priv->context_bans++;
+
+ DRM_DEBUG_DRIVER("client %s has has %d context banned\n",
+ request->ctx->name,
+ request->file_priv->context_bans);
+ }
}
-static void i915_gem_context_mark_innocent(struct i915_gem_context *ctx)
+static void i915_gem_request_mark_innocent(struct drm_i915_gem_request *request)
{
- struct i915_ctx_hang_stats *hs = &ctx->hang_stats;
+ struct i915_ctx_hang_stats *hs = &request->ctx->hang_stats;
hs->batch_pending++;
}
@@ -2653,9 +2667,9 @@ static void i915_gem_reset_engine(struct intel_engine_cs *engine)
}
if (ring_hung)
- i915_gem_context_mark_guilty(request->ctx);
+ i915_gem_request_mark_guilty(request);
else
- i915_gem_context_mark_innocent(request->ctx);
+ i915_gem_request_mark_innocent(request);
if (!ring_hung)
return;
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 4266b9580798..9010fab9fe24 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -347,6 +347,14 @@ err_out:
return ERR_PTR(ret);
}
+static bool client_is_banned(struct drm_i915_file_private *file_priv)
+{
+ if (file_priv->context_bans <= I915_MAX_CLIENT_CONTEXT_BANS)
+ return false;
+
+ return true;
+}
+
/**
* The default context needs to exist per ring that uses contexts. It stores the
* context state of the GPU for applications that don't utilize HW contexts, as
@@ -360,6 +368,14 @@ i915_gem_create_context(struct drm_device *dev,
lockdep_assert_held(&dev->struct_mutex);
+ if (file_priv && client_is_banned(file_priv)) {
+ DRM_DEBUG("client %s[%d] banned from creating ctx\n",
+ current->comm,
+ pid_nr(get_task_pid(current, PIDTYPE_PID)));
+
+ return ERR_PTR(-EIO);
+ }
+
ctx = __create_hw_context(dev, file_priv);
if (IS_ERR(ctx))
return ctx;
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index fb5b44339f71..357303f5c539 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1231,16 +1231,20 @@ static struct i915_gem_context *
i915_gem_validate_context(struct drm_device *dev, struct drm_file *file,
struct intel_engine_cs *engine, const u32 ctx_id)
{
+ struct drm_i915_file_private *file_priv = file->driver_priv;
struct i915_gem_context *ctx;
struct i915_ctx_hang_stats *hs;
- ctx = i915_gem_context_lookup(file->driver_priv, ctx_id);
+ ctx = i915_gem_context_lookup(file_priv, ctx_id);
if (IS_ERR(ctx))
return ctx;
hs = &ctx->hang_stats;
if (hs->banned) {
- DRM_DEBUG("Context %u tried to submit while banned\n", ctx_id);
+ DRM_DEBUG("Client %s banned from submitting (%d:%d)\n",
+ ctx->name,
+ file_priv->context_bans,
+ hs->ban_score);
return ERR_PTR(-EIO);
}
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 4b638555da4c..542ee7c34a9b 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -536,10 +536,11 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
for (i = 0; i < ARRAY_SIZE(error->engine); i++) {
if (error->engine[i].hangcheck_guilty &&
error->engine[i].pid != -1) {
- err_printf(m, "Active process (on ring %s): %s [%d]\n",
+ err_printf(m, "Active process (on ring %s): %s [%d], context bans %d\n",
engine_str(i),
error->engine[i].comm,
- error->engine[i].pid);
+ error->engine[i].pid,
+ error->engine[i].context_bans);
}
}
err_printf(m, "Reset count: %u\n", error->reset_count);
@@ -630,9 +631,10 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
if (obj) {
err_puts(m, dev_priv->engine[i]->name);
if (ee->pid != -1)
- err_printf(m, " (submitted by %s [%d])",
+ err_printf(m, " (submitted by %s [%d], bans %d)",
ee->comm,
- ee->pid);
+ ee->pid,
+ ee->context_bans);
err_printf(m, " --- gtt_offset = 0x%08x %08x\n",
upper_32_bits(obj->gtt_offset),
lower_32_bits(obj->gtt_offset));