[Intel-gfx] [RFC 4/6] drm/i915: Update client name on context create

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursu...@intel.com>

Some clients have the DRM fd passed to them over a socket by the X server.

Grab the real client and pid when they create their first context and
update the exposed data for more useful enumeration.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h         |  8 ++++++++
 drivers/gpu/drm/i915/i915_gem.c         |  4 ++--
 drivers/gpu/drm/i915/i915_gem_context.c | 18 +++++++++++++++---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 1d7a94555a87..b6fa3d45ed22 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3086,6 +3086,14 @@ i915_gem_object_pin_to_display_plane(struct 
drm_i915_gem_object *obj,
 void i915_gem_object_unpin_from_display_plane(struct i915_vma *vma);
 int i915_gem_object_attach_phys(struct drm_i915_gem_object *obj,
                                int align);
+
+int
+i915_gem_add_client(struct drm_i915_private *i915,
+               struct drm_i915_file_private *file_priv,
+               struct task_struct *task,
+               unsigned int serial);
+void i915_gem_remove_client(struct drm_i915_file_private *file_priv);
+
 int i915_gem_open(struct drm_i915_private *i915, struct drm_file *file);
 void i915_gem_release(struct drm_device *dev, struct drm_file *file);
 
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 0ae5764a58d2..03cac6ce0c31 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4834,7 +4834,7 @@ show_client_pid(struct device *kdev, struct 
device_attribute *attr, char *buf)
        return snprintf(buf, PAGE_SIZE, "%u", file_priv->client.pid);
 }
 
-static int
+int
 i915_gem_add_client(struct drm_i915_private *i915,
                struct drm_i915_file_private *file_priv,
                struct task_struct *task,
@@ -4894,7 +4894,7 @@ i915_gem_add_client(struct drm_i915_private *i915,
        return ret;
 }
 
-static void i915_gem_remove_client(struct drm_i915_file_private *file_priv)
+void i915_gem_remove_client(struct drm_i915_file_private *file_priv)
 {
        sysfs_remove_file(file_priv->client.root,
                          (struct attribute *)&file_priv->client.attr.pid);
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c 
b/drivers/gpu/drm/i915/i915_gem_context.c
index 65cefc520e79..1ac2521fc448 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -1499,6 +1499,8 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, 
void *data,
 {
        struct drm_i915_private *i915 = to_i915(dev);
        struct drm_i915_gem_context_create_ext *args = data;
+       pid_t pid = pid_nr(get_task_pid(current, PIDTYPE_PID));
+       struct drm_i915_file_private *file_priv = file->driver_priv;
        struct create_ext ext_data;
        int ret;
 
@@ -1512,11 +1514,11 @@ int i915_gem_context_create_ioctl(struct drm_device 
*dev, void *data,
        if (ret)
                return ret;
 
-       ext_data.fpriv = file->driver_priv;
+       ext_data.fpriv = file_priv;
        if (client_is_banned(ext_data.fpriv)) {
                DRM_DEBUG("client %s[%d] banned from creating ctx\n",
-                         current->comm,
-                         pid_nr(get_task_pid(current, PIDTYPE_PID)));
+                         current->comm, pid);
+
                return -EIO;
        }
 
@@ -1524,6 +1526,16 @@ int i915_gem_context_create_ioctl(struct drm_device 
*dev, void *data,
        if (ret)
                return ret;
 
+       if (file_priv->client.pid != pid) {
+               i915_gem_remove_client(file_priv);
+               ret = i915_gem_add_client(i915, file_priv, current,
+                                         file_priv->client.id);
+               if (ret) {
+                       mutex_unlock(&dev->struct_mutex);
+                       return ret;
+               }
+       }
+
        ext_data.ctx = i915_gem_create_context(i915, args->flags);
        mutex_unlock(&dev->struct_mutex);
        if (IS_ERR(ext_data.ctx))
-- 
2.19.1

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