Use the pid to find associated clients, and report their runtime. This will be used to provide the information via procfs.
Signed-off-by: Chris Wilson chris@chris-wilson.co.uk --- drivers/gpu/drm/i915/i915_drm_client.c | 70 +++++++++++++++++++++++--- drivers/gpu/drm/i915/i915_drm_client.h | 12 +++-- 2 files changed, 73 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drm_client.c b/drivers/gpu/drm/i915/i915_drm_client.c index 1f8b08a413d4..52d9ae97ba25 100644 --- a/drivers/gpu/drm/i915/i915_drm_client.c +++ b/drivers/gpu/drm/i915/i915_drm_client.c @@ -26,6 +26,9 @@ void i915_drm_clients_init(struct i915_drm_clients *clients,
clients->next_id = 0; xa_init_flags(&clients->xarray, XA_FLAGS_ALLOC); + + hash_init(clients->pids); + spin_lock_init(&clients->pid_lock); }
static ssize_t @@ -95,6 +98,50 @@ show_busy(struct device *kdev, struct device_attribute *attr, char *buf) return sysfs_emit(buf, "%llu\n", total); }
+u64 i915_drm_clients_get_runtime(struct i915_drm_clients *clients, + struct pid *pid, + u64 *rt) +{ + struct i915_drm_client_name *name; + u64 total = 0; + u64 t; + + memset64(rt, 0, MAX_ENGINE_CLASS + 1); + + rcu_read_lock(); + hash_for_each_possible_rcu(clients->pids, name, node, pid_nr(pid)) { + struct i915_drm_client *client = name->client; + struct list_head *list = &client->ctx_list; + struct i915_gem_context *ctx; + int i; + + if (name->pid != pid) + continue; + + for (i = 0; i < ARRAY_SIZE(client->past_runtime); i++) { + t = atomic64_read(&client->past_runtime[i]); + rt[i] += t; + total += t; + } + + list_for_each_entry_rcu(ctx, list, client_link) { + struct i915_gem_engines_iter it; + struct intel_context *ce; + + for_each_gem_engine(ce, + rcu_dereference(ctx->engines), + it) { + t = intel_context_get_total_runtime_ns(ce); + rt[ce->engine->class] += t; + total += t; + } + } + } + rcu_read_unlock(); + + return total; +} + static const char * const uabi_class_names[] = { [I915_ENGINE_CLASS_RENDER] = "0", [I915_ENGINE_CLASS_COPY] = "1", @@ -242,7 +289,10 @@ __i915_drm_client_register(struct i915_drm_client *client, if (!name) return -ENOMEM;
+ spin_lock(&clients->pid_lock); + hash_add_rcu(clients->pids, &name->node, pid_nr(name->pid)); RCU_INIT_POINTER(client->name, name); + spin_unlock(&clients->pid_lock);
if (!clients->root) return 0; /* intel_fbdev_init registers a client before sysfs */ @@ -254,20 +304,25 @@ __i915_drm_client_register(struct i915_drm_client *client, return 0;
err_sysfs: + spin_lock(&clients->pid_lock); RCU_INIT_POINTER(client->name, NULL); + hash_del_rcu(&name->node); + spin_unlock(&clients->pid_lock); call_rcu(&name->rcu, free_name); return ret; }
static void __i915_drm_client_unregister(struct i915_drm_client *client) { + struct i915_drm_clients *clients = client->clients; struct i915_drm_client_name *name;
__client_unregister_sysfs(client);
- mutex_lock(&client->update_lock); + spin_lock(&clients->pid_lock); name = rcu_replace_pointer(client->name, NULL, true); - mutex_unlock(&client->update_lock); + hash_del_rcu(&name->node); + spin_unlock(&clients->pid_lock);
call_rcu(&name->rcu, free_name); } @@ -294,7 +349,6 @@ i915_drm_client_add(struct i915_drm_clients *clients, struct task_struct *task) return ERR_PTR(-ENOMEM);
kref_init(&client->kref); - mutex_init(&client->update_lock); spin_lock_init(&client->ctx_lock); INIT_LIST_HEAD(&client->ctx_list);
@@ -339,16 +393,20 @@ int i915_drm_client_update(struct i915_drm_client *client, struct task_struct *task) { + struct i915_drm_clients *clients = client->clients; struct i915_drm_client_name *name;
name = get_name(client, task); if (!name) return -ENOMEM;
- mutex_lock(&client->update_lock); - if (name->pid != rcu_dereference_protected(client->name, true)->pid) + spin_lock(&clients->pid_lock); + if (name->pid != rcu_dereference_protected(client->name, true)->pid) { + hash_add_rcu(clients->pids, &name->node, pid_nr(name->pid)); name = rcu_replace_pointer(client->name, name, true); - mutex_unlock(&client->update_lock); + hash_del_rcu(&name->node); + } + spin_unlock(&clients->pid_lock);
call_rcu(&name->rcu, free_name); return 0; diff --git a/drivers/gpu/drm/i915/i915_drm_client.h b/drivers/gpu/drm/i915/i915_drm_client.h index 83660fa9d2d7..080b8506a86e 100644 --- a/drivers/gpu/drm/i915/i915_drm_client.h +++ b/drivers/gpu/drm/i915/i915_drm_client.h @@ -7,10 +7,10 @@ #define __I915_DRM_CLIENT_H__
#include <linux/device.h> +#include <linux/hashtable.h> #include <linux/kobject.h> #include <linux/kref.h> #include <linux/list.h> -#include <linux/mutex.h> #include <linux/pid.h> #include <linux/rcupdate.h> #include <linux/sched.h> @@ -28,6 +28,9 @@ struct i915_drm_clients { u32 next_id;
struct kobject *root; + + spinlock_t pid_lock; /* protects the pid lut */ + DECLARE_HASHTABLE(pids, 6); };
struct i915_drm_client; @@ -40,6 +43,7 @@ struct i915_engine_busy_attribute {
struct i915_drm_client_name { struct rcu_head rcu; + struct hlist_node node; struct i915_drm_client *client; struct pid *pid; char name[]; @@ -50,8 +54,6 @@ struct i915_drm_client {
struct rcu_work rcu;
- struct mutex update_lock; /* Serializes name and pid updates. */ - unsigned int id; struct i915_drm_client_name __rcu *name; bool closed; @@ -100,6 +102,10 @@ struct i915_drm_client *i915_drm_client_add(struct i915_drm_clients *clients, int i915_drm_client_update(struct i915_drm_client *client, struct task_struct *task);
+u64 i915_drm_clients_get_runtime(struct i915_drm_clients *clients, + struct pid *pid, + u64 *rt); + static inline const struct i915_drm_client_name * __i915_drm_client_name(const struct i915_drm_client *client) {