[Intel-gfx] [PATCH 14/18] drm/i915: Create a unique name for the context

[Chris Wilson]

This will be used for communicating issues with this context to
userspace, so we want to identify the parent process and the individual
context. Note that the name isn't quite unique, it makes the presumption
of there only being a single device fd per process.

Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_drv.h         |  1 +
 drivers/gpu/drm/i915/i915_gem_context.c | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f60d2e17033d..cc5fa593e4c4 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -914,6 +914,7 @@ struct i915_gem_context {
        struct drm_i915_file_private *file_priv;
        struct i915_hw_ppgtt *ppgtt;
        struct pid *pid;
+       const char *name;
 
        struct i915_ctx_hang_stats hang_stats;
 
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c 
b/drivers/gpu/drm/i915/i915_gem_context.c
index df10f4e95736..edcfebd3c6ef 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -158,6 +158,7 @@ void i915_gem_context_free(struct kref *ctx_ref)
                i915_vma_put(ce->state);
        }
 
+       kfree(ctx->name);
        put_pid(ctx->pid);
        list_del(&ctx->link);
 
@@ -310,12 +311,21 @@ __create_hw_context(struct drm_device *dev,
                        goto err_out;
        } else
                ret = DEFAULT_CONTEXT_HANDLE;
+       ctx->user_handle = ret;
 
        ctx->file_priv = file_priv;
-       if (file_priv)
+       if (file_priv) {
                ctx->pid = get_task_pid(current, PIDTYPE_PID);
+               ctx->name = kasprintf(GFP_KERNEL, "%s[%d]/%x",
+                                     current->comm,
+                                     pid_nr(ctx->pid),
+                                     ctx->user_handle);
+               if (!ctx->name) {
+                       ret = -ENOMEM;
+                       goto err_pid;
+               }
+       }
 
-       ctx->user_handle = ret;
        /* NB: Mark all slices as needing a remap so that when the context first
         * loads it will restore whatever remap state already exists. If there
         * is no remap info, it will be a NOP. */
@@ -329,6 +339,9 @@ __create_hw_context(struct drm_device *dev,
 
        return ctx;
 
+err_pid:
+       put_pid(ctx->pid);
+       idr_remove(&file_priv->context_idr, ctx->user_handle);
 err_out:
        context_close(ctx);
        return ERR_PTR(ret);
-- 
2.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx