[2/5] drm/i915: Expose list of clients in sysfs

Message ID	20191216120704.958-3-tvrtko.ursulin@linux.intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=1gxb=2G=lists.freedesktop.org=intel-gfx-bounces@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5477E206D3 From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: Intel-gfx@lists.freedesktop.org Date: Mon, 16 Dec 2019 12:07:01 +0000 Message-Id: <20191216120704.958-3-tvrtko.ursulin@linux.intel.com> In-Reply-To: <20191216120704.958-1-tvrtko.ursulin@linux.intel.com> References: <20191216120704.958-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 2/5] drm/i915: Expose list of clients in sysfs Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
Series	Per client engine busyness \| expand [0/5] Per client engine busyness [1/5] drm/i915: Track per-context engine busyness [2/5] drm/i915: Expose list of clients in sysfs [3/5] drm/i915: Update client name on context create [4/5] drm/i915: Expose per-engine client busyness [5/5] drm/i915: Add sysfs toggle to enable per-client engine stats

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 0781b6326b8c..9fcbcb6d6f76 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -224,6 +224,20 @@ struct drm_i915_file_private { /** ban_score: Accumulated score of all ctx bans and fast hangs. */ atomic_t ban_score; unsigned long hang_timestamp; + + struct i915_drm_client { + unsigned int id; + + struct pid *pid; + char *name; + + struct kobject *root; + + struct { + struct device_attribute pid; + struct device_attribute name; + } attr; + } client; }; /* Interface history: @@ -1278,6 +1292,13 @@ struct drm_i915_private { struct i915_pmu pmu; + struct i915_drm_clients { + spinlock_t idr_lock; + struct idr idr; + + struct kobject *root; + } clients; + struct i915_hdcp_comp_master *hdcp_master; bool hdcp_comp_added; diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 5eeef1ef7448..a65cd7e1ce7b 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1457,11 +1457,14 @@ static void i915_gem_init__mm(struct drm_i915_private *i915) i915_gem_init__objects(i915); } -void i915_gem_init_early(struct drm_i915_private *dev_priv) +void i915_gem_init_early(struct drm_i915_private *i915) { - i915_gem_init__mm(dev_priv); + i915_gem_init__mm(i915); - spin_lock_init(&dev_priv->fb_tracking.lock); + spin_lock_init(&i915->fb_tracking.lock); + + spin_lock_init(&i915->clients.idr_lock); + idr_init(&i915->clients.idr); } void i915_gem_cleanup_early(struct drm_i915_private *dev_priv) @@ -1518,6 +1521,106 @@ int i915_gem_freeze_late(struct drm_i915_private *i915) return 0; } +static ssize_t +show_client_name(struct device *kdev, struct device_attribute *attr, char *buf) +{ + struct drm_i915_file_private *file_priv = + container_of(attr, struct drm_i915_file_private, + client.attr.name); + + return snprintf(buf, PAGE_SIZE, "%s", file_priv->client.name); +} + +static ssize_t +show_client_pid(struct device *kdev, struct device_attribute *attr, char *buf) +{ + struct drm_i915_file_private *file_priv = + container_of(attr, struct drm_i915_file_private, + client.attr.pid); + + return snprintf(buf, PAGE_SIZE, "%u", pid_nr(file_priv->client.pid)); +} + +static int +i915_gem_add_client(struct drm_i915_private *i915, + struct drm_i915_file_private *file_priv, + struct task_struct *task, + unsigned int serial) +{ + struct i915_drm_client *client = &file_priv->client; + struct i915_drm_clients *clients = &i915->clients; + struct device_attribute *attr; + int ret = -ENOMEM; + char id[32]; + + if (!clients->root) + return 0; /* intel_fbdev_init registers a client before sysfs */ + + client->name = kstrdup(task->comm, GFP_KERNEL); + if (!client->name) + goto err_name; + + snprintf(id, sizeof(id), "%u", serial); + client->root = kobject_create_and_add(id, clients->root); + if (!client->root) + goto err_client; + + attr = &client->attr.name; + sysfs_attr_init(&attr->attr); + attr->attr.name = "name"; + attr->attr.mode = 0444; + attr->show = show_client_name; + + ret = sysfs_create_file(client->root, (struct attribute *)attr); + if (ret) + goto err_attr_name; + + attr = &client->attr.pid; + sysfs_attr_init(&attr->attr); + attr->attr.name = "pid"; + attr->attr.mode = 0444; + attr->show = show_client_pid; + + ret = sysfs_create_file(client->root, (struct attribute *)attr); + if (ret) + goto err_attr_pid; + + client->id = serial; + client->pid = get_task_pid(task, PIDTYPE_PID); + + return 0; + +err_attr_pid: + sysfs_remove_file(client->root, (struct attribute *)&client->attr.name); +err_attr_name: + kobject_put(client->root); +err_client: + kfree(client->name); +err_name: + return ret; +} + +static void i915_gem_remove_client(struct drm_i915_file_private *file_priv) +{ + struct i915_drm_clients *clients = &file_priv->dev_priv->clients; + struct i915_drm_client *client = &file_priv->client; + + if (!client->name) + return; /* intel_fbdev_init registers a client before sysfs */ + + sysfs_remove_file(client->root, (struct attribute *)&client->attr.pid); + sysfs_remove_file(client->root, (struct attribute *)&client->attr.name); + kobject_put(client->root); + + spin_lock(&clients->idr_lock); + idr_remove(&clients->idr, client->id); + spin_unlock(&clients->idr_lock); + + put_pid(client->pid); + + kfree(client->name); +} + void i915_gem_release(struct drm_device *dev, struct drm_file *file) { struct drm_i915_file_private *file_priv = file->driver_priv; @@ -1531,33 +1634,58 @@ void i915_gem_release(struct drm_device *dev, struct drm_file *file) list_for_each_entry(request, &file_priv->mm.request_list, client_link) request->file_priv = NULL; spin_unlock(&file_priv->mm.lock); + + i915_gem_remove_client(file_priv); } int i915_gem_open(struct drm_i915_private *i915, struct drm_file *file) { + struct i915_drm_clients *clients = &i915->clients; struct drm_i915_file_private *file_priv; - int ret; + int ret = -ENOMEM; + int id; DRM_DEBUG("\n"); file_priv = kzalloc(sizeof(*file_priv), GFP_KERNEL); if (!file_priv) - return -ENOMEM; + goto err_alloc; + + spin_lock(&clients->idr_lock); + id = idr_alloc_cyclic(&clients->idr, file_priv, 0, -1, GFP_KERNEL); + spin_unlock(&clients->idr_lock); + if (id < 0) + goto err_alloc; + + ret = i915_gem_add_client(i915, file_priv, current, id); + if (ret) + goto err_client; file->driver_priv = file_priv; + ret = i915_gem_context_open(i915, file); + if (ret) + goto err_context; + file_priv->dev_priv = i915; file_priv->file = file; + file_priv->bsd_engine = -1; + file_priv->hang_timestamp = jiffies; spin_lock_init(&file_priv->mm.lock); INIT_LIST_HEAD(&file_priv->mm.request_list); - file_priv->bsd_engine = -1; - file_priv->hang_timestamp = jiffies; + return 0; - ret = i915_gem_context_open(i915, file); - if (ret) - kfree(file_priv); +err_context: + i915_gem_remove_client(file_priv); + +err_client: + spin_lock(&clients->idr_lock); + idr_remove(&clients->idr, id); + spin_unlock(&clients->idr_lock); + kfree(file_priv); +err_alloc: return ret; } diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c index ad2b1b833d7b..3ab50e29fddf 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.c +++ b/drivers/gpu/drm/i915/i915_sysfs.c @@ -559,6 +559,11 @@ void i915_setup_sysfs(struct drm_i915_private *dev_priv) struct device *kdev = dev_priv->drm.primary->kdev; int ret; + dev_priv->clients.root = + kobject_create_and_add("clients", &kdev->kobj); + if (!dev_priv->clients.root) + DRM_ERROR("Per-client sysfs setup failed\n"); + #ifdef CONFIG_PM if (HAS_RC6(dev_priv)) { ret = sysfs_merge_group(&kdev->kobj, @@ -619,4 +624,7 @@ void i915_teardown_sysfs(struct drm_i915_private *dev_priv) sysfs_unmerge_group(&kdev->kobj, &rc6_attr_group); sysfs_unmerge_group(&kdev->kobj, &rc6p_attr_group); #endif + + if (dev_priv->clients.root) + kobject_put(dev_priv->clients.root); }

[2/5] drm/i915: Expose list of clients in sysfs

Commit Message

Comments

Patch