[Intel-gfx] [PATCH 6/9] drm/i915: Track all user contexts per client

[Tvrtko Ursulin]

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

We soon want to start answering questions like how much GPU time is the
context belonging to a client which exited still using.

To enable this we start tracking all context belonging to a client on a
separate list.

v2:
 * Keep adding to gem.contexts.list as last. (Lucas)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_context.c       | 8 ++++++++
 drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 3 +++
 drivers/gpu/drm/i915/i915_drm_client.c            | 3 +++
 drivers/gpu/drm/i915/i915_drm_client.h            | 5 +++++
 4 files changed, 19 insertions(+)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c 
b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index a50b83659399..8a5b36418860 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -354,6 +354,10 @@ static void i915_gem_context_free(struct i915_gem_context 
*ctx)
        if (client) {
                unsigned int i;
 
+               spin_lock(&client->ctx_lock);
+               list_del_rcu(&ctx->client_link);
+               spin_unlock(&client->ctx_lock);
+
                /* Transfer accumulated runtime to the parent drm client. */
                BUILD_BUG_ON(ARRAY_SIZE(client->past_runtime) !=
                             ARRAY_SIZE(ctx->past_runtime));
@@ -988,6 +992,10 @@ static int gem_context_register(struct i915_gem_context 
*ctx,
 
        ctx->client = client;
 
+       spin_lock(&client->ctx_lock);
+       list_add_tail_rcu(&ctx->client_link, &client->ctx_list);
+       spin_unlock(&client->ctx_lock);
+
        spin_lock(&i915->gem.contexts.lock);
        list_add_tail(&ctx->link, &i915->gem.contexts.list);
        spin_unlock(&i915->gem.contexts.lock);
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h 
b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
index e473984b52c8..d65e3bd3c8bb 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
@@ -103,6 +103,9 @@ struct i915_gem_context {
        /** client: struct i915_drm_client */
        struct i915_drm_client *client;
 
+       /** link: &drm_client.context_list */
+       struct list_head client_link;
+
        /**
         * @ref: reference count
         *
diff --git a/drivers/gpu/drm/i915/i915_drm_client.c 
b/drivers/gpu/drm/i915/i915_drm_client.c
index 617509c2e887..d99673508f8c 100644
--- a/drivers/gpu/drm/i915/i915_drm_client.c
+++ b/drivers/gpu/drm/i915/i915_drm_client.c
@@ -154,6 +154,9 @@ i915_drm_client_add(struct i915_drm_clients *clients, 
struct task_struct *task)
 
        kref_init(&client->kref);
        mutex_init(&client->update_lock);
+       spin_lock_init(&client->ctx_lock);
+       INIT_LIST_HEAD(&client->ctx_list);
+
        client->clients = clients;
 
        ret = xa_alloc_cyclic(&clients->xarray, &client->id, client,
diff --git a/drivers/gpu/drm/i915/i915_drm_client.h 
b/drivers/gpu/drm/i915/i915_drm_client.h
index 29b116606596..0be27aa9bbda 100644
--- a/drivers/gpu/drm/i915/i915_drm_client.h
+++ b/drivers/gpu/drm/i915/i915_drm_client.h
@@ -9,10 +9,12 @@
 #include <linux/device.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>
+#include <linux/spinlock.h>
 #include <linux/xarray.h>
 
 #include "gt/intel_engine_types.h"
@@ -36,6 +38,9 @@ struct i915_drm_client {
        char __rcu *name;
        bool closed;
 
+       spinlock_t ctx_lock; /* For add/remove from ctx_list. */
+       struct list_head ctx_list; /* List of contexts belonging to client. */
+
        struct i915_drm_clients *clients;
 
        struct kobject *root;
-- 
2.25.1

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