[CI 0/8] Per client GPU utilisation

dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [CI 0/8] Per client GPU utilisation
@ 2022-04-01 14:21 Tvrtko Ursulin
  2022-04-01 14:21 ` [CI 1/8] drm/i915: Explicitly track DRM clients Tvrtko Ursulin
                   ` (7 more replies)
  0 siblings, 8 replies; 14+ messages in thread
From: Tvrtko Ursulin @ 2022-04-01 14:21 UTC (permalink / raw)
  To: Intel-gfx; +Cc: dri-devel

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

Test-with: 20220401141155.3122817-1-tvrtko.ursulin@linux.intel.com

Tvrtko Ursulin (8):
  drm/i915: Explicitly track DRM clients
  drm/i915: Make GEM contexts track DRM clients
  drm/i915: Track runtime spent in closed and unreachable GEM contexts
  drm/i915: Track all user contexts per client
  drm/i915: Track context current active time
  drm: Document fdinfo format specification
  drm/i915: Count engine instances per uabi class
  drm/i915: Expose client engine utilisation via fdinfo

 Documentation/gpu/drm-usage-stats.rst         | 112 +++++++++++++
 Documentation/gpu/i915.rst                    |  28 ++++
 Documentation/gpu/index.rst                   |   1 +
 drivers/gpu/drm/i915/Makefile                 |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_context.c   |  43 ++++-
 .../gpu/drm/i915/gem/i915_gem_context_types.h |   6 +
 drivers/gpu/drm/i915/gt/intel_context.c       |  27 ++-
 drivers/gpu/drm/i915/gt/intel_context.h       |  15 +-
 drivers/gpu/drm/i915/gt/intel_context_types.h |  24 ++-
 drivers/gpu/drm/i915/gt/intel_engine_user.c   |  11 +-
 .../drm/i915/gt/intel_execlists_submission.c  |  23 ++-
 .../gpu/drm/i915/gt/intel_gt_clock_utils.c    |   4 +
 drivers/gpu/drm/i915/gt/intel_lrc.c           |  27 +--
 drivers/gpu/drm/i915/gt/intel_lrc.h           |  27 ++-
 drivers/gpu/drm/i915/gt/selftest_lrc.c        |  10 +-
 drivers/gpu/drm/i915/i915_driver.c            |   9 +
 drivers/gpu/drm/i915/i915_drm_client.c        | 154 ++++++++++++++++++
 drivers/gpu/drm/i915/i915_drm_client.h        |  68 ++++++++
 drivers/gpu/drm/i915/i915_drv.h               |   4 +
 drivers/gpu/drm/i915/i915_file_private.h      |   3 +
 drivers/gpu/drm/i915/i915_gem.c               |  21 ++-
 drivers/gpu/drm/i915/i915_gpu_error.c         |   9 +-
 drivers/gpu/drm/i915/i915_gpu_error.h         |   2 +-
 23 files changed, 569 insertions(+), 60 deletions(-)
 create mode 100644 Documentation/gpu/drm-usage-stats.rst
 create mode 100644 drivers/gpu/drm/i915/i915_drm_client.c
 create mode 100644 drivers/gpu/drm/i915/i915_drm_client.h

-- 
2.32.0


^ permalink raw reply	[flat|nested] 14+ messages in thread

* [CI 1/8] drm/i915: Explicitly track DRM clients
  2022-04-01 14:21 [CI 0/8] Per client GPU utilisation Tvrtko Ursulin
@ 2022-04-01 14:21 ` Tvrtko Ursulin
  2022-04-01 14:21 ` [CI 2/8] drm/i915: Make GEM contexts " Tvrtko Ursulin
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Tvrtko Ursulin @ 2022-04-01 14:21 UTC (permalink / raw)
  To: Intel-gfx; +Cc: dri-devel

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

Tracking DRM clients more explicitly will allow later patches to
accumulate past and current GPU usage in a centralised place and also
consolidate access to owning task pid/name.

Unique client id is also assigned for the purpose of distinguishing/
consolidating between multiple file descriptors owned by the same process.

v2:
 Chris Wilson:
 * Enclose new members into dedicated structs.
 * Protect against failed sysfs registration.

v3:
 * sysfs_attr_init.

v4:
 * Fix for internal clients.

v5:
 * Use cyclic ida for client id. (Chris)
 * Do not leak pid reference. (Chris)
 * Tidy code with some locals.

v6:
 * Use xa_alloc_cyclic to simplify locking. (Chris)
 * No need to unregister individial sysfs files. (Chris)
 * Rebase on top of fpriv kref.
 * Track client closed status and reflect in sysfs.

v7:
 * Make drm_client more standalone concept.

v8:
 * Simplify sysfs show. (Chris)
 * Always track name and pid.

v9:
 * Fix cyclic id assignment.

v10:
 * No need for a mutex around xa_alloc_cyclic.
 * Refactor sysfs into own function.
 * Unregister sysfs before freeing pid and name.
 * Move clients setup into own function.

v11:
 * Call clients init directly from driver init. (Chris)

v12:
 * Do not fail client add on id wrap. (Maciej)

v13 (Lucas): Rebase.

v14:
 * Dropped sysfs bits.

v15:
 * Dropped tracking of pid/ and name.
 * Dropped RCU freeing of the client object.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> # v11
Reviewed-by: Aravind Iddamsetty <aravind.iddamsetty@intel.com> # v11
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
---
 drivers/gpu/drm/i915/Makefile            |  1 +
 drivers/gpu/drm/i915/i915_driver.c       |  6 +++
 drivers/gpu/drm/i915/i915_drm_client.c   | 68 ++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_drm_client.h   | 50 +++++++++++++++++
 drivers/gpu/drm/i915/i915_drv.h          |  3 ++
 drivers/gpu/drm/i915/i915_file_private.h |  3 ++
 drivers/gpu/drm/i915/i915_gem.c          | 21 ++++++--
 7 files changed, 149 insertions(+), 3 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/i915_drm_client.c
 create mode 100644 drivers/gpu/drm/i915/i915_drm_client.h

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index c1d5540f6052..6d4c628ae355 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -32,6 +32,7 @@ subdir-ccflags-y += -I$(srctree)/$(src)
 
 # core driver code
 i915-y += i915_driver.o \
+	  i915_drm_client.o \
 	  i915_config.o \
 	  i915_getparam.o \
 	  i915_ioctl.o \
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 15808ecc421a..b2df273e6d7b 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -77,6 +77,7 @@
 #include "i915_file_private.h"
 #include "i915_debugfs.h"
 #include "i915_driver.h"
+#include "i915_drm_client.h"
 #include "i915_drv.h"
 #include "i915_getparam.h"
 #include "i915_ioc32.h"
@@ -355,6 +356,8 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
 
 	intel_root_gt_init_early(dev_priv);
 
+	i915_drm_clients_init(&dev_priv->clients, dev_priv);
+
 	i915_gem_init_early(dev_priv);
 
 	/* This must be called before any calls to HAS_PCH_* */
@@ -375,6 +378,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
 err_gem:
 	i915_gem_cleanup_early(dev_priv);
 	intel_gt_driver_late_release_all(dev_priv);
+	i915_drm_clients_fini(&dev_priv->clients);
 	intel_region_ttm_device_fini(dev_priv);
 err_ttm:
 	vlv_suspend_cleanup(dev_priv);
@@ -394,6 +398,7 @@ static void i915_driver_late_release(struct drm_i915_private *dev_priv)
 	intel_power_domains_cleanup(dev_priv);
 	i915_gem_cleanup_early(dev_priv);
 	intel_gt_driver_late_release_all(dev_priv);
+	i915_drm_clients_fini(&dev_priv->clients);
 	intel_region_ttm_device_fini(dev_priv);
 	vlv_suspend_cleanup(dev_priv);
 	i915_workqueues_cleanup(dev_priv);
@@ -1009,6 +1014,7 @@ static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)
 	struct drm_i915_file_private *file_priv = file->driver_priv;
 
 	i915_gem_context_close(file);
+	i915_drm_client_put(file_priv->client);
 
 	kfree_rcu(file_priv, rcu);
 
diff --git a/drivers/gpu/drm/i915/i915_drm_client.c b/drivers/gpu/drm/i915/i915_drm_client.c
new file mode 100644
index 000000000000..e61e9ba15256
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_drm_client.c
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2020 Intel Corporation
+ */
+
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+
+#include "i915_drm_client.h"
+#include "i915_gem.h"
+#include "i915_utils.h"
+
+void i915_drm_clients_init(struct i915_drm_clients *clients,
+			   struct drm_i915_private *i915)
+{
+	clients->i915 = i915;
+	clients->next_id = 0;
+
+	xa_init_flags(&clients->xarray, XA_FLAGS_ALLOC | XA_FLAGS_LOCK_IRQ);
+}
+
+struct i915_drm_client *i915_drm_client_add(struct i915_drm_clients *clients)
+{
+	struct i915_drm_client *client;
+	struct xarray *xa = &clients->xarray;
+	int ret;
+
+	client = kzalloc(sizeof(*client), GFP_KERNEL);
+	if (!client)
+		return ERR_PTR(-ENOMEM);
+
+	xa_lock_irq(xa);
+	ret = __xa_alloc_cyclic(xa, &client->id, client, xa_limit_32b,
+				&clients->next_id, GFP_KERNEL);
+	xa_unlock_irq(xa);
+	if (ret < 0)
+		goto err;
+
+	kref_init(&client->kref);
+	client->clients = clients;
+
+	return client;
+
+err:
+	kfree(client);
+
+	return ERR_PTR(ret);
+}
+
+void __i915_drm_client_free(struct kref *kref)
+{
+	struct i915_drm_client *client =
+		container_of(kref, typeof(*client), kref);
+	struct xarray *xa = &client->clients->xarray;
+	unsigned long flags;
+
+	xa_lock_irqsave(xa, flags);
+	__xa_erase(xa, client->id);
+	xa_unlock_irqrestore(xa, flags);
+	kfree(client);
+}
+
+void i915_drm_clients_fini(struct i915_drm_clients *clients)
+{
+	GEM_BUG_ON(!xa_empty(&clients->xarray));
+	xa_destroy(&clients->xarray);
+}
diff --git a/drivers/gpu/drm/i915/i915_drm_client.h b/drivers/gpu/drm/i915/i915_drm_client.h
new file mode 100644
index 000000000000..e8986ad51176
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_drm_client.h
@@ -0,0 +1,50 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2020 Intel Corporation
+ */
+
+#ifndef __I915_DRM_CLIENT_H__
+#define __I915_DRM_CLIENT_H__
+
+#include <linux/kref.h>
+#include <linux/xarray.h>
+
+struct drm_i915_private;
+
+struct i915_drm_clients {
+	struct drm_i915_private *i915;
+
+	struct xarray xarray;
+	u32 next_id;
+};
+
+struct i915_drm_client {
+	struct kref kref;
+
+	unsigned int id;
+
+	struct i915_drm_clients *clients;
+};
+
+void i915_drm_clients_init(struct i915_drm_clients *clients,
+			   struct drm_i915_private *i915);
+
+static inline struct i915_drm_client *
+i915_drm_client_get(struct i915_drm_client *client)
+{
+	kref_get(&client->kref);
+	return client;
+}
+
+void __i915_drm_client_free(struct kref *kref);
+
+static inline void i915_drm_client_put(struct i915_drm_client *client)
+{
+	kref_put(&client->kref, __i915_drm_client_free);
+}
+
+struct i915_drm_client *i915_drm_client_add(struct i915_drm_clients *clients);
+
+void i915_drm_clients_fini(struct i915_drm_clients *clients);
+
+#endif /* !__I915_DRM_CLIENT_H__ */
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 799f386a7ef2..bbda3e01d03d 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -61,6 +61,7 @@
 #include "gt/intel_workarounds.h"
 #include "gt/uc/intel_uc.h"
 
+#include "i915_drm_client.h"
 #include "i915_gem.h"
 #include "i915_gpu_error.h"
 #include "i915_params.h"
@@ -826,6 +827,8 @@ struct drm_i915_private {
 
 	struct i915_pmu pmu;
 
+	struct i915_drm_clients clients;
+
 	struct i915_hdcp_comp_master *hdcp_master;
 	bool hdcp_comp_added;
 
diff --git a/drivers/gpu/drm/i915/i915_file_private.h b/drivers/gpu/drm/i915/i915_file_private.h
index fb16cc431b2a..f42877869692 100644
--- a/drivers/gpu/drm/i915/i915_file_private.h
+++ b/drivers/gpu/drm/i915/i915_file_private.h
@@ -12,6 +12,7 @@
 
 struct drm_i915_private;
 struct drm_file;
+struct i915_drm_client;
 
 struct drm_i915_file_private {
 	struct drm_i915_private *dev_priv;
@@ -103,6 +104,8 @@ 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 *client;
 };
 
 #endif /* __I915_FILE_PRIVATE_H__ */
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 44741f842852..702e5b89be22 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1227,25 +1227,40 @@ void i915_gem_cleanup_early(struct drm_i915_private *dev_priv)
 int i915_gem_open(struct drm_i915_private *i915, struct drm_file *file)
 {
 	struct drm_i915_file_private *file_priv;
-	int ret;
+	struct i915_drm_client *client;
+	int ret = -ENOMEM;
 
 	DRM_DEBUG("\n");
 
 	file_priv = kzalloc(sizeof(*file_priv), GFP_KERNEL);
 	if (!file_priv)
-		return -ENOMEM;
+		goto err_alloc;
+
+	client = i915_drm_client_add(&i915->clients);
+	if (IS_ERR(client)) {
+		ret = PTR_ERR(client);
+		goto err_client;
+	}
 
 	file->driver_priv = file_priv;
 	file_priv->dev_priv = i915;
 	file_priv->file = file;
+	file_priv->client = client;
 
 	file_priv->bsd_engine = -1;
 	file_priv->hang_timestamp = jiffies;
 
 	ret = i915_gem_context_open(i915, file);
 	if (ret)
-		kfree(file_priv);
+		goto err_context;
+
+	return 0;
 
+err_context:
+	i915_drm_client_put(client);
+err_client:
+	kfree(file_priv);
+err_alloc:
 	return ret;
 }
 
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [CI 2/8] drm/i915: Make GEM contexts track DRM clients
  2022-04-01 14:21 [CI 0/8] Per client GPU utilisation Tvrtko Ursulin
  2022-04-01 14:21 ` [CI 1/8] drm/i915: Explicitly track DRM clients Tvrtko Ursulin
@ 2022-04-01 14:21 ` Tvrtko Ursulin
  2022-04-01 14:22 ` [CI 3/8] drm/i915: Track runtime spent in closed and unreachable GEM contexts Tvrtko Ursulin
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Tvrtko Ursulin @ 2022-04-01 14:21 UTC (permalink / raw)
  To: Intel-gfx; +Cc: dri-devel

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

Make GEM contexts keep a reference to i915_drm_client for the whole of
of their lifetime which will come handy in following patches.

v2: Don't bother supporting selftests contexts from debugfs. (Chris)
v3 (Lucas): Finish constructing ctx before adding it to the list
v4 (Ram): Rebase.
v5: Trivial rebase for proto ctx changes.
v6: Rebase after clients no longer track name and pid.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> # v5
Reviewed-by: Aravind Iddamsetty <aravind.iddamsetty@intel.com> # v5
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_context.c       | 5 +++++
 drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index 5394fbed8bf0..6781ee34646c 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -1257,6 +1257,9 @@ static void i915_gem_context_release_work(struct work_struct *work)
 	if (ctx->pxp_wakeref)
 		intel_runtime_pm_put(&ctx->i915->runtime_pm, ctx->pxp_wakeref);
 
+	if (ctx->client)
+		i915_drm_client_put(ctx->client);
+
 	mutex_destroy(&ctx->engines_mutex);
 	mutex_destroy(&ctx->lut_mutex);
 
@@ -1663,6 +1666,8 @@ static void gem_context_register(struct i915_gem_context *ctx,
 	ctx->file_priv = fpriv;
 
 	ctx->pid = get_task_pid(current, PIDTYPE_PID);
+	ctx->client = i915_drm_client_get(fpriv->client);
+
 	snprintf(ctx->name, sizeof(ctx->name), "%s[%d]",
 		 current->comm, pid_nr(ctx->pid));
 
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 282cdb8a5c5a..93d24f189ba9 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
@@ -293,6 +293,9 @@ struct i915_gem_context {
 	/** @link: place with &drm_i915_private.context_list */
 	struct list_head link;
 
+	/** @client: struct i915_drm_client */
+	struct i915_drm_client *client;
+
 	/**
 	 * @ref: reference count
 	 *
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [CI 3/8] drm/i915: Track runtime spent in closed and unreachable GEM contexts
  2022-04-01 14:21 [CI 0/8] Per client GPU utilisation Tvrtko Ursulin
  2022-04-01 14:21 ` [CI 1/8] drm/i915: Explicitly track DRM clients Tvrtko Ursulin
  2022-04-01 14:21 ` [CI 2/8] drm/i915: Make GEM contexts " Tvrtko Ursulin
@ 2022-04-01 14:22 ` Tvrtko Ursulin
  2022-04-01 14:22 ` [CI 4/8] drm/i915: Track all user contexts per client Tvrtko Ursulin
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Tvrtko Ursulin @ 2022-04-01 14:22 UTC (permalink / raw)
  To: Intel-gfx; +Cc: dri-devel

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

As contexts are abandoned we want to remember how much GPU time they used
(per class) so later we can used it for smarter purposes.

As GEM contexts are closed we want to have the DRM client remember how
much GPU time they used (per class) so later we can used it for smarter
purposes.

v2:
 * Size past runtimes array by uabi class, not internal.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Aravind Iddamsetty <aravind.iddamsetty@intel.com> # v1
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> # v1
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_context.c | 25 +++++++++++++++++++--
 drivers/gpu/drm/i915/i915_drm_client.h      |  9 ++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index 6781ee34646c..50cc87b0cf97 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -1031,23 +1031,44 @@ static void free_engines_rcu(struct rcu_head *rcu)
 	free_engines(engines);
 }
 
+static void accumulate_runtime(struct i915_drm_client *client,
+			       struct i915_gem_engines *engines)
+{
+	struct i915_gem_engines_iter it;
+	struct intel_context *ce;
+
+	if (!client)
+		return;
+
+	/* Transfer accumulated runtime to the parent GEM context. */
+	for_each_gem_engine(ce, engines, it) {
+		unsigned int class = ce->engine->uabi_class;
+
+		GEM_BUG_ON(class >= ARRAY_SIZE(client->past_runtime));
+		atomic64_add(intel_context_get_total_runtime_ns(ce),
+			     &client->past_runtime[class]);
+	}
+}
+
 static int
 engines_notify(struct i915_sw_fence *fence, enum i915_sw_fence_notify state)
 {
 	struct i915_gem_engines *engines =
 		container_of(fence, typeof(*engines), fence);
+	struct i915_gem_context *ctx = engines->ctx;
 
 	switch (state) {
 	case FENCE_COMPLETE:
 		if (!list_empty(&engines->link)) {
-			struct i915_gem_context *ctx = engines->ctx;
 			unsigned long flags;
 
 			spin_lock_irqsave(&ctx->stale.lock, flags);
 			list_del(&engines->link);
 			spin_unlock_irqrestore(&ctx->stale.lock, flags);
 		}
-		i915_gem_context_put(engines->ctx);
+		accumulate_runtime(ctx->client, engines);
+		i915_gem_context_put(ctx);
+
 		break;
 
 	case FENCE_FREE:
diff --git a/drivers/gpu/drm/i915/i915_drm_client.h b/drivers/gpu/drm/i915/i915_drm_client.h
index e8986ad51176..cbc3161ab021 100644
--- a/drivers/gpu/drm/i915/i915_drm_client.h
+++ b/drivers/gpu/drm/i915/i915_drm_client.h
@@ -9,6 +9,10 @@
 #include <linux/kref.h>
 #include <linux/xarray.h>
 
+#include "gt/intel_engine_types.h"
+
+#define I915_LAST_UABI_ENGINE_CLASS I915_ENGINE_CLASS_VIDEO_ENHANCE
+
 struct drm_i915_private;
 
 struct i915_drm_clients {
@@ -24,6 +28,11 @@ struct i915_drm_client {
 	unsigned int id;
 
 	struct i915_drm_clients *clients;
+
+	/**
+	 * @past_runtime: Accumulation of pphwsp runtimes from closed contexts.
+	 */
+	atomic64_t past_runtime[I915_LAST_UABI_ENGINE_CLASS + 1];
 };
 
 void i915_drm_clients_init(struct i915_drm_clients *clients,
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [CI 4/8] drm/i915: Track all user contexts per client
  2022-04-01 14:21 [CI 0/8] Per client GPU utilisation Tvrtko Ursulin
                   ` (2 preceding siblings ...)
  2022-04-01 14:22 ` [CI 3/8] drm/i915: Track runtime spent in closed and unreachable GEM contexts Tvrtko Ursulin
@ 2022-04-01 14:22 ` Tvrtko Ursulin
  2022-04-01 14:22 ` [CI 5/8] drm/i915: Track context current active time Tvrtko Ursulin
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Tvrtko Ursulin @ 2022-04-01 14:22 UTC (permalink / raw)
  To: Intel-gfx; +Cc: dri-devel

From: Tvrtko Ursulin <tvrtko.ursulin@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.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Aravind Iddamsetty <aravind.iddamsetty@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_context.c       | 13 +++++++++++++
 drivers/gpu/drm/i915/gem/i915_gem_context_types.h |  3 +++
 drivers/gpu/drm/i915/i915_drm_client.c            |  2 ++
 drivers/gpu/drm/i915/i915_drm_client.h            |  5 +++++
 4 files changed, 23 insertions(+)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index 50cc87b0cf97..92652528b7f9 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -1491,6 +1491,8 @@ static void set_closed_name(struct i915_gem_context *ctx)
 
 static void context_close(struct i915_gem_context *ctx)
 {
+	struct i915_drm_client *client;
+
 	/* Flush any concurrent set_engines() */
 	mutex_lock(&ctx->engines_mutex);
 	unpin_engines(__context_engines_static(ctx));
@@ -1515,6 +1517,13 @@ static void context_close(struct i915_gem_context *ctx)
 	list_del(&ctx->link);
 	spin_unlock(&ctx->i915->gem.contexts.lock);
 
+	client = ctx->client;
+	if (client) {
+		spin_lock(&client->ctx_lock);
+		list_del_rcu(&ctx->client_link);
+		spin_unlock(&client->ctx_lock);
+	}
+
 	mutex_unlock(&ctx->mutex);
 
 	/*
@@ -1696,6 +1705,10 @@ static void gem_context_register(struct i915_gem_context *ctx,
 	old = xa_store(&fpriv->context_xa, id, ctx, GFP_KERNEL);
 	WARN_ON(old);
 
+	spin_lock(&ctx->client->ctx_lock);
+	list_add_tail_rcu(&ctx->client_link, &ctx->client->ctx_list);
+	spin_unlock(&ctx->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 93d24f189ba9..5946dcb11cf5 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
@@ -296,6 +296,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 e61e9ba15256..91a8559bebf7 100644
--- a/drivers/gpu/drm/i915/i915_drm_client.c
+++ b/drivers/gpu/drm/i915/i915_drm_client.c
@@ -38,6 +38,8 @@ struct i915_drm_client *i915_drm_client_add(struct i915_drm_clients *clients)
 		goto err;
 
 	kref_init(&client->kref);
+	spin_lock_init(&client->ctx_lock);
+	INIT_LIST_HEAD(&client->ctx_list);
 	client->clients = clients;
 
 	return client;
diff --git a/drivers/gpu/drm/i915/i915_drm_client.h b/drivers/gpu/drm/i915/i915_drm_client.h
index cbc3161ab021..191368386ace 100644
--- a/drivers/gpu/drm/i915/i915_drm_client.h
+++ b/drivers/gpu/drm/i915/i915_drm_client.h
@@ -7,6 +7,8 @@
 #define __I915_DRM_CLIENT_H__
 
 #include <linux/kref.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
 #include <linux/xarray.h>
 
 #include "gt/intel_engine_types.h"
@@ -27,6 +29,9 @@ struct i915_drm_client {
 
 	unsigned int id;
 
+	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;
 
 	/**
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [CI 5/8] drm/i915: Track context current active time
  2022-04-01 14:21 [CI 0/8] Per client GPU utilisation Tvrtko Ursulin
                   ` (3 preceding siblings ...)
  2022-04-01 14:22 ` [CI 4/8] drm/i915: Track all user contexts per client Tvrtko Ursulin
@ 2022-04-01 14:22 ` Tvrtko Ursulin
  2022-04-01 14:22 ` [CI 6/8] drm: Document fdinfo format specification Tvrtko Ursulin
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 14+ messages in thread
From: Tvrtko Ursulin @ 2022-04-01 14:22 UTC (permalink / raw)
  To: Intel-gfx; +Cc: dri-devel

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

Track context active (on hardware) status together with the start
timestamp.

This will be used to provide better granularity of context
runtime reporting in conjunction with already tracked pphwsp accumulated
runtime.

The latter is only updated on context save so does not give us visibility
to any currently executing work.

As part of the patch the existing runtime tracking data is moved under the
new ce->stats member and updated under the seqlock. This provides the
ability to atomically read out accumulated plus active runtime.

v2:
 * Rename and make __intel_context_get_active_time unlocked.

v3:
 * Use GRAPHICS_VER.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Aravind Iddamsetty <aravind.iddamsetty@intel.com> #  v1
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_context.c       | 27 ++++++++++++++++++-
 drivers/gpu/drm/i915/gt/intel_context.h       | 15 ++++-------
 drivers/gpu/drm/i915/gt/intel_context_types.h | 24 +++++++++++------
 .../drm/i915/gt/intel_execlists_submission.c  | 23 ++++++++++++----
 .../gpu/drm/i915/gt/intel_gt_clock_utils.c    |  4 +++
 drivers/gpu/drm/i915/gt/intel_lrc.c           | 27 ++++++++++---------
 drivers/gpu/drm/i915/gt/intel_lrc.h           | 27 ++++++++++++++++++-
 drivers/gpu/drm/i915/gt/selftest_lrc.c        | 10 +++----
 drivers/gpu/drm/i915/i915_gpu_error.c         |  9 +++----
 drivers/gpu/drm/i915/i915_gpu_error.h         |  2 +-
 10 files changed, 118 insertions(+), 50 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
index d87145b8fca0..4070cb5711d8 100644
--- a/drivers/gpu/drm/i915/gt/intel_context.c
+++ b/drivers/gpu/drm/i915/gt/intel_context.c
@@ -386,7 +386,7 @@ intel_context_init(struct intel_context *ce, struct intel_engine_cs *engine)
 	ce->ring = NULL;
 	ce->ring_size = SZ_4K;
 
-	ewma_runtime_init(&ce->runtime.avg);
+	ewma_runtime_init(&ce->stats.runtime.avg);
 
 	ce->vm = i915_vm_get(engine->gt->vm);
 
@@ -576,6 +576,31 @@ void intel_context_bind_parent_child(struct intel_context *parent,
 	child->parallel.parent = parent;
 }
 
+u64 intel_context_get_total_runtime_ns(const struct intel_context *ce)
+{
+	u64 total, active;
+
+	total = ce->stats.runtime.total;
+	if (ce->ops->flags & COPS_RUNTIME_CYCLES)
+		total *= ce->engine->gt->clock_period_ns;
+
+	active = READ_ONCE(ce->stats.active);
+	if (active)
+		active = intel_context_clock() - active;
+
+	return total + active;
+}
+
+u64 intel_context_get_avg_runtime_ns(struct intel_context *ce)
+{
+	u64 avg = ewma_runtime_read(&ce->stats.runtime.avg);
+
+	if (ce->ops->flags & COPS_RUNTIME_CYCLES)
+		avg *= ce->engine->gt->clock_period_ns;
+
+	return avg;
+}
+
 #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
 #include "selftest_context.c"
 #endif
diff --git a/drivers/gpu/drm/i915/gt/intel_context.h b/drivers/gpu/drm/i915/gt/intel_context.h
index d8c74bbf9aae..b7d3214d2cdd 100644
--- a/drivers/gpu/drm/i915/gt/intel_context.h
+++ b/drivers/gpu/drm/i915/gt/intel_context.h
@@ -351,18 +351,13 @@ intel_context_clear_nopreempt(struct intel_context *ce)
 	clear_bit(CONTEXT_NOPREEMPT, &ce->flags);
 }
 
-static inline u64 intel_context_get_total_runtime_ns(struct intel_context *ce)
-{
-	const u32 period = ce->engine->gt->clock_period_ns;
-
-	return READ_ONCE(ce->runtime.total) * period;
-}
+u64 intel_context_get_total_runtime_ns(const struct intel_context *ce);
+u64 intel_context_get_avg_runtime_ns(struct intel_context *ce);
 
-static inline u64 intel_context_get_avg_runtime_ns(struct intel_context *ce)
+static inline u64 intel_context_clock(void)
 {
-	const u32 period = ce->engine->gt->clock_period_ns;
-
-	return mul_u32_u32(ewma_runtime_read(&ce->runtime.avg), period);
+	/* As we mix CS cycles with CPU clocks, use the raw monotonic clock. */
+	return ktime_get_raw_fast_ns();
 }
 
 #endif /* __INTEL_CONTEXT_H__ */
diff --git a/drivers/gpu/drm/i915/gt/intel_context_types.h b/drivers/gpu/drm/i915/gt/intel_context_types.h
index 30cd81ad8911..09f82545789f 100644
--- a/drivers/gpu/drm/i915/gt/intel_context_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_context_types.h
@@ -35,6 +35,9 @@ struct intel_context_ops {
 #define COPS_HAS_INFLIGHT_BIT 0
 #define COPS_HAS_INFLIGHT BIT(COPS_HAS_INFLIGHT_BIT)
 
+#define COPS_RUNTIME_CYCLES_BIT 1
+#define COPS_RUNTIME_CYCLES BIT(COPS_RUNTIME_CYCLES_BIT)
+
 	int (*alloc)(struct intel_context *ce);
 
 	void (*ban)(struct intel_context *ce, struct i915_request *rq);
@@ -134,14 +137,19 @@ struct intel_context {
 	} lrc;
 	u32 tag; /* cookie passed to HW to track this context on submission */
 
-	/* Time on GPU as tracked by the hw. */
-	struct {
-		struct ewma_runtime avg;
-		u64 total;
-		u32 last;
-		I915_SELFTEST_DECLARE(u32 num_underflow);
-		I915_SELFTEST_DECLARE(u32 max_underflow);
-	} runtime;
+	/** stats: Context GPU engine busyness tracking. */
+	struct intel_context_stats {
+		u64 active;
+
+		/* Time on GPU as tracked by the hw. */
+		struct {
+			struct ewma_runtime avg;
+			u64 total;
+			u32 last;
+			I915_SELFTEST_DECLARE(u32 num_underflow);
+			I915_SELFTEST_DECLARE(u32 max_underflow);
+		} runtime;
+	} stats;
 
 	unsigned int active_count; /* protected by timeline->mutex */
 
diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index e23c1d0e980b..f8749c433b7c 100644
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -625,8 +625,6 @@ static void __execlists_schedule_out(struct i915_request * const rq,
 		GEM_BUG_ON(test_bit(ccid - 1, &engine->context_tag));
 		__set_bit(ccid - 1, &engine->context_tag);
 	}
-
-	lrc_update_runtime(ce);
 	intel_engine_context_out(engine);
 	execlists_context_status_change(rq, INTEL_CONTEXT_SCHEDULE_OUT);
 	if (engine->fw_domain && !--engine->fw_active)
@@ -2005,8 +2003,23 @@ process_csb(struct intel_engine_cs *engine, struct i915_request **inactive)
 	 * and merits a fresh timeslice. We reinstall the timer after
 	 * inspecting the queue to see if we need to resumbit.
 	 */
-	if (*prev != *execlists->active) /* elide lite-restores */
+	if (*prev != *execlists->active) { /* elide lite-restores */
+		/*
+		 * Note the inherent discrepancy between the HW runtime,
+		 * recorded as part of the context switch, and the CPU
+		 * adjustment for active contexts. We have to hope that
+		 * the delay in processing the CS event is very small
+		 * and consistent. It works to our advantage to have
+		 * the CPU adjustment _undershoot_ (i.e. start later than)
+		 * the CS timestamp so we never overreport the runtime
+		 * and correct overselves later when updating from HW.
+		 */
+		if (*prev)
+			lrc_runtime_stop((*prev)->context);
+		if (*execlists->active)
+			lrc_runtime_start((*execlists->active)->context);
 		new_timeslice(execlists);
+	}
 
 	return inactive;
 }
@@ -2638,7 +2651,7 @@ execlists_create_parallel(struct intel_engine_cs **engines,
 }
 
 static const struct intel_context_ops execlists_context_ops = {
-	.flags = COPS_HAS_INFLIGHT,
+	.flags = COPS_HAS_INFLIGHT | COPS_RUNTIME_CYCLES,
 
 	.alloc = execlists_context_alloc,
 
@@ -3696,7 +3709,7 @@ virtual_get_sibling(struct intel_engine_cs *engine, unsigned int sibling)
 }
 
 static const struct intel_context_ops virtual_context_ops = {
-	.flags = COPS_HAS_INFLIGHT,
+	.flags = COPS_HAS_INFLIGHT | COPS_RUNTIME_CYCLES,
 
 	.alloc = virtual_context_alloc,
 
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c b/drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c
index 0db822c3b7e5..d5d1b04dbcad 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c
@@ -161,6 +161,10 @@ void intel_gt_init_clock_frequency(struct intel_gt *gt)
 	if (gt->clock_frequency)
 		gt->clock_period_ns = intel_gt_clock_interval_to_ns(gt, 1);
 
+	/* Icelake appears to use another fixed frequency for CTX_TIMESTAMP */
+	if (GRAPHICS_VER(gt->i915) == 11)
+		gt->clock_period_ns = NSEC_PER_SEC / 13750000;
+
 	GT_TRACE(gt,
 		 "Using clock frequency: %dkHz, period: %dns, wrap: %lldms\n",
 		 gt->clock_frequency / 1000,
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index dffef6ab4baf..3f83a9038e13 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -778,7 +778,7 @@ static void init_common_regs(u32 * const regs,
 					   CTX_CTRL_RS_CTX_ENABLE);
 	regs[CTX_CONTEXT_CONTROL] = ctl;
 
-	regs[CTX_TIMESTAMP] = ce->runtime.last;
+	regs[CTX_TIMESTAMP] = ce->stats.runtime.last;
 }
 
 static void init_wa_bb_regs(u32 * const regs,
@@ -1734,11 +1734,12 @@ void lrc_init_wa_ctx(struct intel_engine_cs *engine)
 	}
 }
 
-static void st_update_runtime_underflow(struct intel_context *ce, s32 dt)
+static void st_runtime_underflow(struct intel_context_stats *stats, s32 dt)
 {
 #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
-	ce->runtime.num_underflow++;
-	ce->runtime.max_underflow = max_t(u32, ce->runtime.max_underflow, -dt);
+	stats->runtime.num_underflow++;
+	stats->runtime.max_underflow =
+		max_t(u32, stats->runtime.max_underflow, -dt);
 #endif
 }
 
@@ -1755,25 +1756,25 @@ static u32 lrc_get_runtime(const struct intel_context *ce)
 
 void lrc_update_runtime(struct intel_context *ce)
 {
+	struct intel_context_stats *stats = &ce->stats;
 	u32 old;
 	s32 dt;
 
-	if (intel_context_is_barrier(ce))
+	old = stats->runtime.last;
+	stats->runtime.last = lrc_get_runtime(ce);
+	dt = stats->runtime.last - old;
+	if (!dt)
 		return;
 
-	old = ce->runtime.last;
-	ce->runtime.last = lrc_get_runtime(ce);
-	dt = ce->runtime.last - old;
-
 	if (unlikely(dt < 0)) {
 		CE_TRACE(ce, "runtime underflow: last=%u, new=%u, delta=%d\n",
-			 old, ce->runtime.last, dt);
-		st_update_runtime_underflow(ce, dt);
+			 old, stats->runtime.last, dt);
+		st_runtime_underflow(stats, dt);
 		return;
 	}
 
-	ewma_runtime_add(&ce->runtime.avg, dt);
-	ce->runtime.total += dt;
+	ewma_runtime_add(&stats->runtime.avg, dt);
+	stats->runtime.total += dt;
 }
 
 #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.h b/drivers/gpu/drm/i915/gt/intel_lrc.h
index 6e4f9f58fca5..7371bb5c8129 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.h
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.h
@@ -11,9 +11,10 @@
 #include <linux/bitfield.h>
 #include <linux/types.h>
 
+#include "intel_context.h"
+
 struct drm_i915_gem_object;
 struct i915_gem_ww_ctx;
-struct intel_context;
 struct intel_engine_cs;
 struct intel_ring;
 struct kref;
@@ -120,4 +121,28 @@ static inline u32 lrc_desc_priority(int prio)
 		return GEN12_CTX_PRIORITY_NORMAL;
 }
 
+static inline void lrc_runtime_start(struct intel_context *ce)
+{
+	struct intel_context_stats *stats = &ce->stats;
+
+	if (intel_context_is_barrier(ce))
+		return;
+
+	if (stats->active)
+		return;
+
+	WRITE_ONCE(stats->active, intel_context_clock());
+}
+
+static inline void lrc_runtime_stop(struct intel_context *ce)
+{
+	struct intel_context_stats *stats = &ce->stats;
+
+	if (!stats->active)
+		return;
+
+	lrc_update_runtime(ce);
+	WRITE_ONCE(stats->active, 0);
+}
+
 #endif /* __INTEL_LRC_H__ */
diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
index 21c29d315cc0..6ba52ef1acb8 100644
--- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
+++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
@@ -1753,8 +1753,8 @@ static int __live_pphwsp_runtime(struct intel_engine_cs *engine)
 	if (IS_ERR(ce))
 		return PTR_ERR(ce);
 
-	ce->runtime.num_underflow = 0;
-	ce->runtime.max_underflow = 0;
+	ce->stats.runtime.num_underflow = 0;
+	ce->stats.runtime.max_underflow = 0;
 
 	do {
 		unsigned int loop = 1024;
@@ -1792,11 +1792,11 @@ static int __live_pphwsp_runtime(struct intel_engine_cs *engine)
 		intel_context_get_avg_runtime_ns(ce));
 
 	err = 0;
-	if (ce->runtime.num_underflow) {
+	if (ce->stats.runtime.num_underflow) {
 		pr_err("%s: pphwsp underflow %u time(s), max %u cycles!\n",
 		       engine->name,
-		       ce->runtime.num_underflow,
-		       ce->runtime.max_underflow);
+		       ce->stats.runtime.num_underflow,
+		       ce->stats.runtime.max_underflow);
 		GEM_TRACE_DUMP();
 		err = -EOVERFLOW;
 	}
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index fa14314e7d70..0512c66fa4f3 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -512,13 +512,10 @@ static void error_print_context(struct drm_i915_error_state_buf *m,
 				const char *header,
 				const struct i915_gem_context_coredump *ctx)
 {
-	const u32 period = to_gt(m->i915)->clock_period_ns;
-
 	err_printf(m, "%s%s[%d] prio %d, guilty %d active %d, runtime total %lluns, avg %lluns\n",
 		   header, ctx->comm, ctx->pid, ctx->sched_attr.priority,
 		   ctx->guilty, ctx->active,
-		   ctx->total_runtime * period,
-		   mul_u32_u32(ctx->avg_runtime, period));
+		   ctx->total_runtime, ctx->avg_runtime);
 }
 
 static struct i915_vma_coredump *
@@ -1359,8 +1356,8 @@ static bool record_context(struct i915_gem_context_coredump *e,
 	e->guilty = atomic_read(&ctx->guilty_count);
 	e->active = atomic_read(&ctx->active_count);
 
-	e->total_runtime = rq->context->runtime.total;
-	e->avg_runtime = ewma_runtime_read(&rq->context->runtime.avg);
+	e->total_runtime = intel_context_get_total_runtime_ns(rq->context);
+	e->avg_runtime = intel_context_get_avg_runtime_ns(rq->context);
 
 	simulated = i915_gem_context_no_error_capture(ctx);
 
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h
index 7977a01a708f..a611abacd9c2 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.h
+++ b/drivers/gpu/drm/i915/i915_gpu_error.h
@@ -94,7 +94,7 @@ struct intel_engine_coredump {
 		char comm[TASK_COMM_LEN];
 
 		u64 total_runtime;
-		u32 avg_runtime;
+		u64 avg_runtime;
 
 		pid_t pid;
 		int active;
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [CI 6/8] drm: Document fdinfo format specification
  2022-04-01 14:21 [CI 0/8] Per client GPU utilisation Tvrtko Ursulin
                   ` (4 preceding siblings ...)
  2022-04-01 14:22 ` [CI 5/8] drm/i915: Track context current active time Tvrtko Ursulin
@ 2022-04-01 14:22 ` Tvrtko Ursulin
  2022-04-01 14:22 ` [CI 7/8] drm/i915: Count engine instances per uabi class Tvrtko Ursulin
  2022-04-01 14:22 ` [CI 8/8] drm/i915: Expose client engine utilisation via fdinfo Tvrtko Ursulin
  7 siblings, 0 replies; 14+ messages in thread
From: Tvrtko Ursulin @ 2022-04-01 14:22 UTC (permalink / raw)
  To: Intel-gfx; +Cc: dri-devel

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

Proposal to standardise the fdinfo text format as optionally output by DRM
drivers.

Idea is that a simple but, well defined, spec will enable generic
userspace tools to be written while at the same time avoiding a more heavy
handed approach of adding a mid-layer to DRM.

i915 implements a subset of the spec, everything apart from the memory
stats currently, and a matching intel_gpu_top tool exists.

Open is to see if AMD can migrate to using the proposed GPU utilisation
key-value pairs, or if they are not workable to see whether to go
vendor specific, or if a standardised  alternative can be found which is
workable for both drivers.

Same for the memory utilisation key-value pairs proposal.

v2:
 * Update for removal of name and pid.

v3:
 * 'Drm-driver' tag will be obtained from struct drm_driver.name. (Daniel)

v4:
 * Added drm-engine-capacity- tag.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: David M Nieto <David.Nieto@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Stone <daniel@fooishbar.org>
Cc: Chris Healy <cphealy@gmail.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
---
 Documentation/gpu/drm-usage-stats.rst | 106 ++++++++++++++++++++++++++
 Documentation/gpu/index.rst           |   1 +
 2 files changed, 107 insertions(+)
 create mode 100644 Documentation/gpu/drm-usage-stats.rst

diff --git a/Documentation/gpu/drm-usage-stats.rst b/Documentation/gpu/drm-usage-stats.rst
new file mode 100644
index 000000000000..b8cc28f4da6f
--- /dev/null
+++ b/Documentation/gpu/drm-usage-stats.rst
@@ -0,0 +1,106 @@
+.. _drm-client-usage-stats:
+
+======================
+DRM client usage stats
+======================
+
+DRM drivers can choose to export partly standardised text output via the
+`fops->show_fdinfo()` as part of the driver specific file operations registered
+in the `struct drm_driver` object registered with the DRM core.
+
+One purpose of this output is to enable writing as generic as practicaly
+feasible `top(1)` like userspace monitoring tools.
+
+Given the differences between various DRM drivers the specification of the
+output is split between common and driver specific parts. Having said that,
+wherever possible effort should still be made to standardise as much as
+possible.
+
+File format specification
+=========================
+
+- File shall contain one key value pair per one line of text.
+- Colon character (`:`) must be used to delimit keys and values.
+- All keys shall be prefixed with `drm-`.
+- Whitespace between the delimiter and first non-whitespace character shall be
+  ignored when parsing.
+- Neither keys or values are allowed to contain whitespace characters.
+- Numerical key value pairs can end with optional unit string.
+- Data type of the value is fixed as defined in the specification.
+
+Key types
+---------
+
+1. Mandatory, fully standardised.
+2. Optional, fully standardised.
+3. Driver specific.
+
+Data types
+----------
+
+- <uint> - Unsigned integer without defining the maximum value.
+- <str> - String excluding any above defined reserved characters or whitespace.
+
+Mandatory fully standardised keys
+---------------------------------
+
+- drm-driver: <str>
+
+String shall contain the name this driver registered as via the respective
+`struct drm_driver` data structure.
+
+Optional fully standardised keys
+--------------------------------
+
+- drm-pdev: <aaaa:bb.cc.d>
+
+For PCI devices this should contain the PCI slot address of the device in
+question.
+
+- drm-client-id: <uint>
+
+Unique value relating to the open DRM file descriptor used to distinguish
+duplicated and shared file descriptors. Conceptually the value should map 1:1
+to the in kernel representation of `struct drm_file` instances.
+
+Uniqueness of the value shall be either globally unique, or unique within the
+scope of each device, in which case `drm-pdev` shall be present as well.
+
+Userspace should make sure to not double account any usage statistics by using
+the above described criteria in order to associate data to individual clients.
+
+- drm-engine-<str>: <uint> ns
+
+GPUs usually contain multiple execution engines. Each shall be given a stable
+and unique name (str), with possible values documented in the driver specific
+documentation.
+
+Value shall be in specified time units which the respective GPU engine spent
+busy executing workloads belonging to this client.
+
+Values are not required to be constantly monotonic if it makes the driver
+implementation easier, but are required to catch up with the previously reported
+larger value within a reasonable period. Upon observing a value lower than what
+was previously read, userspace is expected to stay with that larger previous
+value until a monotonic update is seen.
+
+- drm-engine-capacity-<str>: <uint>
+
+Engine identifier string must be the same as the one specified in the
+drm-engine-<str> tag and shall contain a greater than zero number in case the
+exported engine corresponds to a group of identical hardware engines.
+
+In the absence of this tag parser shall assume capacity of one. Zero capacity
+is not allowed.
+
+- drm-memory-<str>: <uint> [KiB|MiB]
+
+Each possible memory type which can be used to store buffer objects by the
+GPU in question shall be given a stable and unique name to be returned as the
+string here.
+
+Value shall reflect the amount of storage currently consumed by the buffer
+object belong to this client, in the respective memory region.
+
+Default unit shall be bytes with optional unit specifiers of 'KiB' or 'MiB'
+indicating kibi- or mebi-bytes.
diff --git a/Documentation/gpu/index.rst b/Documentation/gpu/index.rst
index b9c1214d8f23..b99dede9a5b1 100644
--- a/Documentation/gpu/index.rst
+++ b/Documentation/gpu/index.rst
@@ -10,6 +10,7 @@ Linux GPU Driver Developer's Guide
    drm-kms
    drm-kms-helpers
    drm-uapi
+   drm-usage-stats
    driver-uapi
    drm-client
    drivers
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [CI 7/8] drm/i915: Count engine instances per uabi class
  2022-04-01 14:21 [CI 0/8] Per client GPU utilisation Tvrtko Ursulin
                   ` (5 preceding siblings ...)
  2022-04-01 14:22 ` [CI 6/8] drm: Document fdinfo format specification Tvrtko Ursulin
@ 2022-04-01 14:22 ` Tvrtko Ursulin
  2022-04-01 14:22 ` [CI 8/8] drm/i915: Expose client engine utilisation via fdinfo Tvrtko Ursulin
  7 siblings, 0 replies; 14+ messages in thread
From: Tvrtko Ursulin @ 2022-04-01 14:22 UTC (permalink / raw)
  To: Intel-gfx; +Cc: dri-devel

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

This will be useful to have at hand in a following patch.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_engine_user.c | 11 ++++++-----
 drivers/gpu/drm/i915/i915_drv.h             |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_user.c b/drivers/gpu/drm/i915/gt/intel_engine_user.c
index b8c9b6b89003..0f6cd96b459f 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_user.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_user.c
@@ -193,7 +193,6 @@ static void add_legacy_ring(struct legacy_ring *ring,
 void intel_engines_driver_register(struct drm_i915_private *i915)
 {
 	struct legacy_ring ring = {};
-	u8 uabi_instances[5] = {};
 	struct list_head *it, *next;
 	struct rb_node **p, *prev;
 	LIST_HEAD(engines);
@@ -214,8 +213,10 @@ void intel_engines_driver_register(struct drm_i915_private *i915)
 		GEM_BUG_ON(engine->class >= ARRAY_SIZE(uabi_classes));
 		engine->uabi_class = uabi_classes[engine->class];
 
-		GEM_BUG_ON(engine->uabi_class >= ARRAY_SIZE(uabi_instances));
-		engine->uabi_instance = uabi_instances[engine->uabi_class]++;
+		GEM_BUG_ON(engine->uabi_class >=
+			   ARRAY_SIZE(i915->engine_uabi_class_count));
+		engine->uabi_instance =
+			i915->engine_uabi_class_count[engine->uabi_class]++;
 
 		/* Replace the internal name with the final user facing name */
 		memcpy(old, engine->name, sizeof(engine->name));
@@ -245,8 +246,8 @@ void intel_engines_driver_register(struct drm_i915_private *i915)
 		int class, inst;
 		int errors = 0;
 
-		for (class = 0; class < ARRAY_SIZE(uabi_instances); class++) {
-			for (inst = 0; inst < uabi_instances[class]; inst++) {
+		for (class = 0; class < ARRAY_SIZE(i915->engine_uabi_class_count); class++) {
+			for (inst = 0; inst < i915->engine_uabi_class_count[class]; inst++) {
 				engine = intel_engine_lookup_user(i915,
 								  class, inst);
 				if (!engine) {
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index bbda3e01d03d..7f33cf2afb9e 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -500,6 +500,7 @@ struct drm_i915_private {
 	struct pci_dev *bridge_dev;
 
 	struct rb_root uabi_engines;
+	unsigned int engine_uabi_class_count[I915_LAST_UABI_ENGINE_CLASS + 1];
 
 	struct resource mch_res;
 
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [CI 8/8] drm/i915: Expose client engine utilisation via fdinfo
  2022-04-01 14:21 [CI 0/8] Per client GPU utilisation Tvrtko Ursulin
                   ` (6 preceding siblings ...)
  2022-04-01 14:22 ` [CI 7/8] drm/i915: Count engine instances per uabi class Tvrtko Ursulin
@ 2022-04-01 14:22 ` Tvrtko Ursulin
  2022-04-04  9:12   ` [Intel-gfx] " Tvrtko Ursulin
  7 siblings, 1 reply; 14+ messages in thread
From: Tvrtko Ursulin @ 2022-04-01 14:22 UTC (permalink / raw)
  To: Intel-gfx; +Cc: dri-devel

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

Similar to AMD commit
874442541133 ("drm/amdgpu: Add show_fdinfo() interface"), using the
infrastructure added in previous patches, we add basic client info
and GPU engine utilisation for i915.

Example of the output:

  pos:    0
  flags:  0100002
  mnt_id: 21
  drm-driver: i915
  drm-pdev:   0000:00:02.0
  drm-client-id:      7
  drm-engine-render:  9288864723 ns
  drm-engine-copy:    2035071108 ns
  drm-engine-video:   0 ns
  drm-engine-video-enhance:   0 ns

v2:
 * Update for removal of name and pid.

v3:
 * Use drm_driver.name.

v4:
 * Added drm-engine-capacity- tag.
 * Fix typo. (Umesh)

v5:
 * Don't output engine data before Gen8.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: David M Nieto <David.Nieto@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Chris Healy <cphealy@gmail.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
---
 Documentation/gpu/drm-usage-stats.rst  |  6 ++
 Documentation/gpu/i915.rst             | 28 +++++++++
 drivers/gpu/drm/i915/i915_driver.c     |  3 +
 drivers/gpu/drm/i915/i915_drm_client.c | 84 ++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_drm_client.h |  4 ++
 5 files changed, 125 insertions(+)

diff --git a/Documentation/gpu/drm-usage-stats.rst b/Documentation/gpu/drm-usage-stats.rst
index b8cc28f4da6f..6c9f166a8d6f 100644
--- a/Documentation/gpu/drm-usage-stats.rst
+++ b/Documentation/gpu/drm-usage-stats.rst
@@ -104,3 +104,9 @@ object belong to this client, in the respective memory region.
 
 Default unit shall be bytes with optional unit specifiers of 'KiB' or 'MiB'
 indicating kibi- or mebi-bytes.
+
+===============================
+Driver specific implementations
+===============================
+
+:ref:`i915-usage-stats`
diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
index 0f08693d05cd..54060cd6c419 100644
--- a/Documentation/gpu/i915.rst
+++ b/Documentation/gpu/i915.rst
@@ -697,3 +697,31 @@ The style guide for ``i915_reg.h``.
 
 .. kernel-doc:: drivers/gpu/drm/i915/i915_reg.h
    :doc: The i915 register macro definition style guide
+
+.. _i915-usage-stats:
+
+i915 DRM client usage stats implementation
+==========================================
+
+The drm/i915 driver implements the DRM client usage stats specification as
+documented in :ref:`drm-client-usage-stats`.
+
+Example of the output showing the implemented key value pairs and entirety of
+the currently possible format options:
+
+::
+
+      pos:    0
+      flags:  0100002
+      mnt_id: 21
+      drm-driver: i915
+      drm-pdev:   0000:00:02.0
+      drm-client-id:      7
+      drm-engine-render:  9288864723 ns
+      drm-engine-copy:    2035071108 ns
+      drm-engine-video:   0 ns
+      drm-engine-capacity-video:   2
+      drm-engine-video-enhance:   0 ns
+
+Possible `drm-engine-` key names are: `render`, `copy`, `video` and
+`video-enhance`.
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index b2df273e6d7b..3ffb617d75c9 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1745,6 +1745,9 @@ static const struct file_operations i915_driver_fops = {
 	.read = drm_read,
 	.compat_ioctl = i915_ioc32_compat_ioctl,
 	.llseek = noop_llseek,
+#ifdef CONFIG_PROC_FS
+	.show_fdinfo = i915_drm_client_fdinfo,
+#endif
 };
 
 static int
diff --git a/drivers/gpu/drm/i915/i915_drm_client.c b/drivers/gpu/drm/i915/i915_drm_client.c
index 91a8559bebf7..e539f6b23060 100644
--- a/drivers/gpu/drm/i915/i915_drm_client.c
+++ b/drivers/gpu/drm/i915/i915_drm_client.c
@@ -7,7 +7,13 @@
 #include <linux/slab.h>
 #include <linux/types.h>
 
+#include <uapi/drm/i915_drm.h>
+
+#include <drm/drm_print.h>
+
+#include "gem/i915_gem_context.h"
 #include "i915_drm_client.h"
+#include "i915_file_private.h"
 #include "i915_gem.h"
 #include "i915_utils.h"
 
@@ -68,3 +74,81 @@ void i915_drm_clients_fini(struct i915_drm_clients *clients)
 	GEM_BUG_ON(!xa_empty(&clients->xarray));
 	xa_destroy(&clients->xarray);
 }
+
+#ifdef CONFIG_PROC_FS
+static const char * const uabi_class_names[] = {
+	[I915_ENGINE_CLASS_RENDER] = "render",
+	[I915_ENGINE_CLASS_COPY] = "copy",
+	[I915_ENGINE_CLASS_VIDEO] = "video",
+	[I915_ENGINE_CLASS_VIDEO_ENHANCE] = "video-enhance",
+};
+
+static u64 busy_add(struct i915_gem_context *ctx, unsigned int class)
+{
+	struct i915_gem_engines_iter it;
+	struct intel_context *ce;
+	u64 total = 0;
+
+	for_each_gem_engine(ce, rcu_dereference(ctx->engines), it) {
+		if (ce->engine->uabi_class != class)
+			continue;
+
+		total += intel_context_get_total_runtime_ns(ce);
+	}
+
+	return total;
+}
+
+static void
+show_client_class(struct seq_file *m,
+		  struct i915_drm_client *client,
+		  unsigned int class)
+{
+	const struct list_head *list = &client->ctx_list;
+	u64 total = atomic64_read(&client->past_runtime[class]);
+	const unsigned int capacity =
+		client->clients->i915->engine_uabi_class_count[class];
+	struct i915_gem_context *ctx;
+
+	rcu_read_lock();
+	list_for_each_entry_rcu(ctx, list, client_link)
+		total += busy_add(ctx, class);
+	rcu_read_unlock();
+
+	seq_printf(m, "drm-engine-%s:\t%llu ns\n",
+		   uabi_class_names[class], total);
+
+	if (capacity > 1)
+		seq_printf(m, "drm-engine-capacity-%s:\t%u\n",
+			   uabi_class_names[class],
+			   capacity);
+}
+
+void i915_drm_client_fdinfo(struct seq_file *m, struct file *f)
+{
+	struct drm_file *file = f->private_data;
+	struct drm_i915_file_private *file_priv = file->driver_priv;
+	struct drm_i915_private *i915 = file_priv->dev_priv;
+	struct i915_drm_client *client = file_priv->client;
+	struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
+	unsigned int i;
+
+	/*
+	 * ******************************************************************
+	 * For text output format description please see drm-usage-stats.rst!
+	 * ******************************************************************
+	 */
+
+	seq_printf(m, "drm-driver:\t%s\n", i915->drm.driver->name);
+	seq_printf(m, "drm-pdev:\t%04x:%02x:%02x.%d\n",
+		   pci_domain_nr(pdev->bus), pdev->bus->number,
+		   PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
+	seq_printf(m, "drm-client-id:\t%u\n", client->id);
+
+	if (GRAPHICS_VER(i915) < 8)
+		return;
+
+	for (i = 0; i < ARRAY_SIZE(uabi_class_names); i++)
+		show_client_class(m, client, i);
+}
+#endif
diff --git a/drivers/gpu/drm/i915/i915_drm_client.h b/drivers/gpu/drm/i915/i915_drm_client.h
index 191368386ace..5f5b02b01ba0 100644
--- a/drivers/gpu/drm/i915/i915_drm_client.h
+++ b/drivers/gpu/drm/i915/i915_drm_client.h
@@ -59,6 +59,10 @@ static inline void i915_drm_client_put(struct i915_drm_client *client)
 
 struct i915_drm_client *i915_drm_client_add(struct i915_drm_clients *clients);
 
+#ifdef CONFIG_PROC_FS
+void i915_drm_client_fdinfo(struct seq_file *m, struct file *f);
+#endif
+
 void i915_drm_clients_fini(struct i915_drm_clients *clients);
 
 #endif /* !__I915_DRM_CLIENT_H__ */
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: [Intel-gfx] [CI 8/8] drm/i915: Expose client engine utilisation via fdinfo
  2022-04-01 14:22 ` [CI 8/8] drm/i915: Expose client engine utilisation via fdinfo Tvrtko Ursulin
@ 2022-04-04  9:12   ` Tvrtko Ursulin
  2022-04-04  9:23     ` Tvrtko Ursulin
  0 siblings, 1 reply; 14+ messages in thread
From: Tvrtko Ursulin @ 2022-04-04  9:12 UTC (permalink / raw)
  To: Intel-gfx; +Cc: dri-devel


On 01/04/2022 15:22, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> 
> Similar to AMD commit
> 874442541133 ("drm/amdgpu: Add show_fdinfo() interface"), using the
> infrastructure added in previous patches, we add basic client info
> and GPU engine utilisation for i915.
> 
> Example of the output:
> 
>    pos:    0
>    flags:  0100002
>    mnt_id: 21
>    drm-driver: i915
>    drm-pdev:   0000:00:02.0
>    drm-client-id:      7
>    drm-engine-render:  9288864723 ns
>    drm-engine-copy:    2035071108 ns
>    drm-engine-video:   0 ns
>    drm-engine-video-enhance:   0 ns
> 
> v2:
>   * Update for removal of name and pid.
> 
> v3:
>   * Use drm_driver.name.
> 
> v4:
>   * Added drm-engine-capacity- tag.
>   * Fix typo. (Umesh)
> 
> v5:
>   * Don't output engine data before Gen8.
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: David M Nieto <David.Nieto@amd.com>
> Cc: Christian König <christian.koenig@amd.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Chris Healy <cphealy@gmail.com>
> Acked-by: Christian König <christian.koenig@amd.com>
> Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>

Forgot to apply an earlier:

Acked-by: Rob Clark <robdclark@gmail.com>

Regards,

Tvrtko

> ---
>   Documentation/gpu/drm-usage-stats.rst  |  6 ++
>   Documentation/gpu/i915.rst             | 28 +++++++++
>   drivers/gpu/drm/i915/i915_driver.c     |  3 +
>   drivers/gpu/drm/i915/i915_drm_client.c | 84 ++++++++++++++++++++++++++
>   drivers/gpu/drm/i915/i915_drm_client.h |  4 ++
>   5 files changed, 125 insertions(+)
> 
> diff --git a/Documentation/gpu/drm-usage-stats.rst b/Documentation/gpu/drm-usage-stats.rst
> index b8cc28f4da6f..6c9f166a8d6f 100644
> --- a/Documentation/gpu/drm-usage-stats.rst
> +++ b/Documentation/gpu/drm-usage-stats.rst
> @@ -104,3 +104,9 @@ object belong to this client, in the respective memory region.
>   
>   Default unit shall be bytes with optional unit specifiers of 'KiB' or 'MiB'
>   indicating kibi- or mebi-bytes.
> +
> +===============================
> +Driver specific implementations
> +===============================
> +
> +:ref:`i915-usage-stats`
> diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
> index 0f08693d05cd..54060cd6c419 100644
> --- a/Documentation/gpu/i915.rst
> +++ b/Documentation/gpu/i915.rst
> @@ -697,3 +697,31 @@ The style guide for ``i915_reg.h``.
>   
>   .. kernel-doc:: drivers/gpu/drm/i915/i915_reg.h
>      :doc: The i915 register macro definition style guide
> +
> +.. _i915-usage-stats:
> +
> +i915 DRM client usage stats implementation
> +==========================================
> +
> +The drm/i915 driver implements the DRM client usage stats specification as
> +documented in :ref:`drm-client-usage-stats`.
> +
> +Example of the output showing the implemented key value pairs and entirety of
> +the currently possible format options:
> +
> +::
> +
> +      pos:    0
> +      flags:  0100002
> +      mnt_id: 21
> +      drm-driver: i915
> +      drm-pdev:   0000:00:02.0
> +      drm-client-id:      7
> +      drm-engine-render:  9288864723 ns
> +      drm-engine-copy:    2035071108 ns
> +      drm-engine-video:   0 ns
> +      drm-engine-capacity-video:   2
> +      drm-engine-video-enhance:   0 ns
> +
> +Possible `drm-engine-` key names are: `render`, `copy`, `video` and
> +`video-enhance`.
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index b2df273e6d7b..3ffb617d75c9 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1745,6 +1745,9 @@ static const struct file_operations i915_driver_fops = {
>   	.read = drm_read,
>   	.compat_ioctl = i915_ioc32_compat_ioctl,
>   	.llseek = noop_llseek,
> +#ifdef CONFIG_PROC_FS
> +	.show_fdinfo = i915_drm_client_fdinfo,
> +#endif
>   };
>   
>   static int
> diff --git a/drivers/gpu/drm/i915/i915_drm_client.c b/drivers/gpu/drm/i915/i915_drm_client.c
> index 91a8559bebf7..e539f6b23060 100644
> --- a/drivers/gpu/drm/i915/i915_drm_client.c
> +++ b/drivers/gpu/drm/i915/i915_drm_client.c
> @@ -7,7 +7,13 @@
>   #include <linux/slab.h>
>   #include <linux/types.h>
>   
> +#include <uapi/drm/i915_drm.h>
> +
> +#include <drm/drm_print.h>
> +
> +#include "gem/i915_gem_context.h"
>   #include "i915_drm_client.h"
> +#include "i915_file_private.h"
>   #include "i915_gem.h"
>   #include "i915_utils.h"
>   
> @@ -68,3 +74,81 @@ void i915_drm_clients_fini(struct i915_drm_clients *clients)
>   	GEM_BUG_ON(!xa_empty(&clients->xarray));
>   	xa_destroy(&clients->xarray);
>   }
> +
> +#ifdef CONFIG_PROC_FS
> +static const char * const uabi_class_names[] = {
> +	[I915_ENGINE_CLASS_RENDER] = "render",
> +	[I915_ENGINE_CLASS_COPY] = "copy",
> +	[I915_ENGINE_CLASS_VIDEO] = "video",
> +	[I915_ENGINE_CLASS_VIDEO_ENHANCE] = "video-enhance",
> +};
> +
> +static u64 busy_add(struct i915_gem_context *ctx, unsigned int class)
> +{
> +	struct i915_gem_engines_iter it;
> +	struct intel_context *ce;
> +	u64 total = 0;
> +
> +	for_each_gem_engine(ce, rcu_dereference(ctx->engines), it) {
> +		if (ce->engine->uabi_class != class)
> +			continue;
> +
> +		total += intel_context_get_total_runtime_ns(ce);
> +	}
> +
> +	return total;
> +}
> +
> +static void
> +show_client_class(struct seq_file *m,
> +		  struct i915_drm_client *client,
> +		  unsigned int class)
> +{
> +	const struct list_head *list = &client->ctx_list;
> +	u64 total = atomic64_read(&client->past_runtime[class]);
> +	const unsigned int capacity =
> +		client->clients->i915->engine_uabi_class_count[class];
> +	struct i915_gem_context *ctx;
> +
> +	rcu_read_lock();
> +	list_for_each_entry_rcu(ctx, list, client_link)
> +		total += busy_add(ctx, class);
> +	rcu_read_unlock();
> +
> +	seq_printf(m, "drm-engine-%s:\t%llu ns\n",
> +		   uabi_class_names[class], total);
> +
> +	if (capacity > 1)
> +		seq_printf(m, "drm-engine-capacity-%s:\t%u\n",
> +			   uabi_class_names[class],
> +			   capacity);
> +}
> +
> +void i915_drm_client_fdinfo(struct seq_file *m, struct file *f)
> +{
> +	struct drm_file *file = f->private_data;
> +	struct drm_i915_file_private *file_priv = file->driver_priv;
> +	struct drm_i915_private *i915 = file_priv->dev_priv;
> +	struct i915_drm_client *client = file_priv->client;
> +	struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
> +	unsigned int i;
> +
> +	/*
> +	 * ******************************************************************
> +	 * For text output format description please see drm-usage-stats.rst!
> +	 * ******************************************************************
> +	 */
> +
> +	seq_printf(m, "drm-driver:\t%s\n", i915->drm.driver->name);
> +	seq_printf(m, "drm-pdev:\t%04x:%02x:%02x.%d\n",
> +		   pci_domain_nr(pdev->bus), pdev->bus->number,
> +		   PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
> +	seq_printf(m, "drm-client-id:\t%u\n", client->id);
> +
> +	if (GRAPHICS_VER(i915) < 8)
> +		return;
> +
> +	for (i = 0; i < ARRAY_SIZE(uabi_class_names); i++)
> +		show_client_class(m, client, i);
> +}
> +#endif
> diff --git a/drivers/gpu/drm/i915/i915_drm_client.h b/drivers/gpu/drm/i915/i915_drm_client.h
> index 191368386ace..5f5b02b01ba0 100644
> --- a/drivers/gpu/drm/i915/i915_drm_client.h
> +++ b/drivers/gpu/drm/i915/i915_drm_client.h
> @@ -59,6 +59,10 @@ static inline void i915_drm_client_put(struct i915_drm_client *client)
>   
>   struct i915_drm_client *i915_drm_client_add(struct i915_drm_clients *clients);
>   
> +#ifdef CONFIG_PROC_FS
> +void i915_drm_client_fdinfo(struct seq_file *m, struct file *f);
> +#endif
> +
>   void i915_drm_clients_fini(struct i915_drm_clients *clients);
>   
>   #endif /* !__I915_DRM_CLIENT_H__ */

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [Intel-gfx] [CI 8/8] drm/i915: Expose client engine utilisation via fdinfo
  2022-04-04  9:12   ` [Intel-gfx] " Tvrtko Ursulin
@ 2022-04-04  9:23     ` Tvrtko Ursulin
  2022-04-04 15:36       ` Daniel Vetter
  0 siblings, 1 reply; 14+ messages in thread
From: Tvrtko Ursulin @ 2022-04-04  9:23 UTC (permalink / raw)
  To: Intel-gfx, Dave Airlie, Daniel Vetter; +Cc: Christian König, dri-devel


+ Dave and Daniel

Guys, are you okay with merging this via drm-intel-gt-next? It is one 
new file at Documentation/gpu/drm-usage-stats.rst only which is outside 
i915. It has acks from Christian and Rob.

Daniel, series is also fully reviewed and IGT reviewed and ready. Rob 
also demonstrated the approach works for msm when using the vendor 
agnosstic gputop tool I sketched out (see 
20220225202614.225197-3-robdclark@gmail.com).

My plan is to merge the i915 support with the common spec and 
intel_gpu_top on the IGT side. Then follow-up with vendor agnostic 
gputop and later yet potentially re-visit the AMD side by re-sending the 
patch which tweaks the fdinfo format there and adds support for relative 
engine utilisation as provided by amdgpu.

Regards,

Tvrtko

On 04/04/2022 10:12, Tvrtko Ursulin wrote:
> 
> On 01/04/2022 15:22, Tvrtko Ursulin wrote:
>> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>
>> Similar to AMD commit
>> 874442541133 ("drm/amdgpu: Add show_fdinfo() interface"), using the
>> infrastructure added in previous patches, we add basic client info
>> and GPU engine utilisation for i915.
>>
>> Example of the output:
>>
>>    pos:    0
>>    flags:  0100002
>>    mnt_id: 21
>>    drm-driver: i915
>>    drm-pdev:   0000:00:02.0
>>    drm-client-id:      7
>>    drm-engine-render:  9288864723 ns
>>    drm-engine-copy:    2035071108 ns
>>    drm-engine-video:   0 ns
>>    drm-engine-video-enhance:   0 ns
>>
>> v2:
>>   * Update for removal of name and pid.
>>
>> v3:
>>   * Use drm_driver.name.
>>
>> v4:
>>   * Added drm-engine-capacity- tag.
>>   * Fix typo. (Umesh)
>>
>> v5:
>>   * Don't output engine data before Gen8.
>>
>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>> Cc: David M Nieto <David.Nieto@amd.com>
>> Cc: Christian König <christian.koenig@amd.com>
>> Cc: Daniel Vetter <daniel@ffwll.ch>
>> Cc: Chris Healy <cphealy@gmail.com>
>> Acked-by: Christian König <christian.koenig@amd.com>
>> Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
> 
> Forgot to apply an earlier:
> 
> Acked-by: Rob Clark <robdclark@gmail.com>
> 
> Regards,
> 
> Tvrtko
> 
>> ---
>>   Documentation/gpu/drm-usage-stats.rst  |  6 ++
>>   Documentation/gpu/i915.rst             | 28 +++++++++
>>   drivers/gpu/drm/i915/i915_driver.c     |  3 +
>>   drivers/gpu/drm/i915/i915_drm_client.c | 84 ++++++++++++++++++++++++++
>>   drivers/gpu/drm/i915/i915_drm_client.h |  4 ++
>>   5 files changed, 125 insertions(+)
>>
>> diff --git a/Documentation/gpu/drm-usage-stats.rst 
>> b/Documentation/gpu/drm-usage-stats.rst
>> index b8cc28f4da6f..6c9f166a8d6f 100644
>> --- a/Documentation/gpu/drm-usage-stats.rst
>> +++ b/Documentation/gpu/drm-usage-stats.rst
>> @@ -104,3 +104,9 @@ object belong to this client, in the respective 
>> memory region.
>>   Default unit shall be bytes with optional unit specifiers of 'KiB' 
>> or 'MiB'
>>   indicating kibi- or mebi-bytes.
>> +
>> +===============================
>> +Driver specific implementations
>> +===============================
>> +
>> +:ref:`i915-usage-stats`
>> diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
>> index 0f08693d05cd..54060cd6c419 100644
>> --- a/Documentation/gpu/i915.rst
>> +++ b/Documentation/gpu/i915.rst
>> @@ -697,3 +697,31 @@ The style guide for ``i915_reg.h``.
>>   .. kernel-doc:: drivers/gpu/drm/i915/i915_reg.h
>>      :doc: The i915 register macro definition style guide
>> +
>> +.. _i915-usage-stats:
>> +
>> +i915 DRM client usage stats implementation
>> +==========================================
>> +
>> +The drm/i915 driver implements the DRM client usage stats 
>> specification as
>> +documented in :ref:`drm-client-usage-stats`.
>> +
>> +Example of the output showing the implemented key value pairs and 
>> entirety of
>> +the currently possible format options:
>> +
>> +::
>> +
>> +      pos:    0
>> +      flags:  0100002
>> +      mnt_id: 21
>> +      drm-driver: i915
>> +      drm-pdev:   0000:00:02.0
>> +      drm-client-id:      7
>> +      drm-engine-render:  9288864723 ns
>> +      drm-engine-copy:    2035071108 ns
>> +      drm-engine-video:   0 ns
>> +      drm-engine-capacity-video:   2
>> +      drm-engine-video-enhance:   0 ns
>> +
>> +Possible `drm-engine-` key names are: `render`, `copy`, `video` and
>> +`video-enhance`.
>> diff --git a/drivers/gpu/drm/i915/i915_driver.c 
>> b/drivers/gpu/drm/i915/i915_driver.c
>> index b2df273e6d7b..3ffb617d75c9 100644
>> --- a/drivers/gpu/drm/i915/i915_driver.c
>> +++ b/drivers/gpu/drm/i915/i915_driver.c
>> @@ -1745,6 +1745,9 @@ static const struct file_operations 
>> i915_driver_fops = {
>>       .read = drm_read,
>>       .compat_ioctl = i915_ioc32_compat_ioctl,
>>       .llseek = noop_llseek,
>> +#ifdef CONFIG_PROC_FS
>> +    .show_fdinfo = i915_drm_client_fdinfo,
>> +#endif
>>   };
>>   static int
>> diff --git a/drivers/gpu/drm/i915/i915_drm_client.c 
>> b/drivers/gpu/drm/i915/i915_drm_client.c
>> index 91a8559bebf7..e539f6b23060 100644
>> --- a/drivers/gpu/drm/i915/i915_drm_client.c
>> +++ b/drivers/gpu/drm/i915/i915_drm_client.c
>> @@ -7,7 +7,13 @@
>>   #include <linux/slab.h>
>>   #include <linux/types.h>
>> +#include <uapi/drm/i915_drm.h>
>> +
>> +#include <drm/drm_print.h>
>> +
>> +#include "gem/i915_gem_context.h"
>>   #include "i915_drm_client.h"
>> +#include "i915_file_private.h"
>>   #include "i915_gem.h"
>>   #include "i915_utils.h"
>> @@ -68,3 +74,81 @@ void i915_drm_clients_fini(struct i915_drm_clients 
>> *clients)
>>       GEM_BUG_ON(!xa_empty(&clients->xarray));
>>       xa_destroy(&clients->xarray);
>>   }
>> +
>> +#ifdef CONFIG_PROC_FS
>> +static const char * const uabi_class_names[] = {
>> +    [I915_ENGINE_CLASS_RENDER] = "render",
>> +    [I915_ENGINE_CLASS_COPY] = "copy",
>> +    [I915_ENGINE_CLASS_VIDEO] = "video",
>> +    [I915_ENGINE_CLASS_VIDEO_ENHANCE] = "video-enhance",
>> +};
>> +
>> +static u64 busy_add(struct i915_gem_context *ctx, unsigned int class)
>> +{
>> +    struct i915_gem_engines_iter it;
>> +    struct intel_context *ce;
>> +    u64 total = 0;
>> +
>> +    for_each_gem_engine(ce, rcu_dereference(ctx->engines), it) {
>> +        if (ce->engine->uabi_class != class)
>> +            continue;
>> +
>> +        total += intel_context_get_total_runtime_ns(ce);
>> +    }
>> +
>> +    return total;
>> +}
>> +
>> +static void
>> +show_client_class(struct seq_file *m,
>> +          struct i915_drm_client *client,
>> +          unsigned int class)
>> +{
>> +    const struct list_head *list = &client->ctx_list;
>> +    u64 total = atomic64_read(&client->past_runtime[class]);
>> +    const unsigned int capacity =
>> +        client->clients->i915->engine_uabi_class_count[class];
>> +    struct i915_gem_context *ctx;
>> +
>> +    rcu_read_lock();
>> +    list_for_each_entry_rcu(ctx, list, client_link)
>> +        total += busy_add(ctx, class);
>> +    rcu_read_unlock();
>> +
>> +    seq_printf(m, "drm-engine-%s:\t%llu ns\n",
>> +           uabi_class_names[class], total);
>> +
>> +    if (capacity > 1)
>> +        seq_printf(m, "drm-engine-capacity-%s:\t%u\n",
>> +               uabi_class_names[class],
>> +               capacity);
>> +}
>> +
>> +void i915_drm_client_fdinfo(struct seq_file *m, struct file *f)
>> +{
>> +    struct drm_file *file = f->private_data;
>> +    struct drm_i915_file_private *file_priv = file->driver_priv;
>> +    struct drm_i915_private *i915 = file_priv->dev_priv;
>> +    struct i915_drm_client *client = file_priv->client;
>> +    struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
>> +    unsigned int i;
>> +
>> +    /*
>> +     * 
>> ******************************************************************
>> +     * For text output format description please see 
>> drm-usage-stats.rst!
>> +     * 
>> ******************************************************************
>> +     */
>> +
>> +    seq_printf(m, "drm-driver:\t%s\n", i915->drm.driver->name);
>> +    seq_printf(m, "drm-pdev:\t%04x:%02x:%02x.%d\n",
>> +           pci_domain_nr(pdev->bus), pdev->bus->number,
>> +           PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
>> +    seq_printf(m, "drm-client-id:\t%u\n", client->id);
>> +
>> +    if (GRAPHICS_VER(i915) < 8)
>> +        return;
>> +
>> +    for (i = 0; i < ARRAY_SIZE(uabi_class_names); i++)
>> +        show_client_class(m, client, i);
>> +}
>> +#endif
>> diff --git a/drivers/gpu/drm/i915/i915_drm_client.h 
>> b/drivers/gpu/drm/i915/i915_drm_client.h
>> index 191368386ace..5f5b02b01ba0 100644
>> --- a/drivers/gpu/drm/i915/i915_drm_client.h
>> +++ b/drivers/gpu/drm/i915/i915_drm_client.h
>> @@ -59,6 +59,10 @@ static inline void i915_drm_client_put(struct 
>> i915_drm_client *client)
>>   struct i915_drm_client *i915_drm_client_add(struct i915_drm_clients 
>> *clients);
>> +#ifdef CONFIG_PROC_FS
>> +void i915_drm_client_fdinfo(struct seq_file *m, struct file *f);
>> +#endif
>> +
>>   void i915_drm_clients_fini(struct i915_drm_clients *clients);
>>   #endif /* !__I915_DRM_CLIENT_H__ */

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [Intel-gfx] [CI 8/8] drm/i915: Expose client engine utilisation via fdinfo
  2022-04-04  9:23     ` Tvrtko Ursulin
@ 2022-04-04 15:36       ` Daniel Vetter
  2022-04-05  8:08         ` Tvrtko Ursulin
  0 siblings, 1 reply; 14+ messages in thread
From: Daniel Vetter @ 2022-04-04 15:36 UTC (permalink / raw)
  To: Tvrtko Ursulin; +Cc: Intel-gfx, dri-devel, Christian König

On Mon, Apr 04, 2022 at 10:23:53AM +0100, Tvrtko Ursulin wrote:
> 
> + Dave and Daniel
> 
> Guys, are you okay with merging this via drm-intel-gt-next? It is one new
> file at Documentation/gpu/drm-usage-stats.rst only which is outside i915. It
> has acks from Christian and Rob.

Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> 
> Daniel, series is also fully reviewed and IGT reviewed and ready. Rob also
> demonstrated the approach works for msm when using the vendor agnosstic
> gputop tool I sketched out (see
> 20220225202614.225197-3-robdclark@gmail.com).
> 
> My plan is to merge the i915 support with the common spec and intel_gpu_top
> on the IGT side. Then follow-up with vendor agnostic gputop and later yet
> potentially re-visit the AMD side by re-sending the patch which tweaks the
> fdinfo format there and adds support for relative engine utilisation as
> provided by amdgpu.
> 
> Regards,
> 
> Tvrtko
> 
> On 04/04/2022 10:12, Tvrtko Ursulin wrote:
> > 
> > On 01/04/2022 15:22, Tvrtko Ursulin wrote:
> > > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > > 
> > > Similar to AMD commit
> > > 874442541133 ("drm/amdgpu: Add show_fdinfo() interface"), using the
> > > infrastructure added in previous patches, we add basic client info
> > > and GPU engine utilisation for i915.
> > > 
> > > Example of the output:
> > > 
> > >    pos:    0
> > >    flags:  0100002
> > >    mnt_id: 21
> > >    drm-driver: i915
> > >    drm-pdev:   0000:00:02.0
> > >    drm-client-id:      7
> > >    drm-engine-render:  9288864723 ns
> > >    drm-engine-copy:    2035071108 ns
> > >    drm-engine-video:   0 ns
> > >    drm-engine-video-enhance:   0 ns
> > > 
> > > v2:
> > >   * Update for removal of name and pid.
> > > 
> > > v3:
> > >   * Use drm_driver.name.
> > > 
> > > v4:
> > >   * Added drm-engine-capacity- tag.
> > >   * Fix typo. (Umesh)
> > > 
> > > v5:
> > >   * Don't output engine data before Gen8.
> > > 
> > > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > > Cc: David M Nieto <David.Nieto@amd.com>
> > > Cc: Christian König <christian.koenig@amd.com>
> > > Cc: Daniel Vetter <daniel@ffwll.ch>
> > > Cc: Chris Healy <cphealy@gmail.com>
> > > Acked-by: Christian König <christian.koenig@amd.com>
> > > Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
> > 
> > Forgot to apply an earlier:
> > 
> > Acked-by: Rob Clark <robdclark@gmail.com>
> > 
> > Regards,
> > 
> > Tvrtko
> > 
> > > ---
> > >   Documentation/gpu/drm-usage-stats.rst  |  6 ++
> > >   Documentation/gpu/i915.rst             | 28 +++++++++
> > >   drivers/gpu/drm/i915/i915_driver.c     |  3 +
> > >   drivers/gpu/drm/i915/i915_drm_client.c | 84 ++++++++++++++++++++++++++
> > >   drivers/gpu/drm/i915/i915_drm_client.h |  4 ++
> > >   5 files changed, 125 insertions(+)
> > > 
> > > diff --git a/Documentation/gpu/drm-usage-stats.rst
> > > b/Documentation/gpu/drm-usage-stats.rst
> > > index b8cc28f4da6f..6c9f166a8d6f 100644
> > > --- a/Documentation/gpu/drm-usage-stats.rst
> > > +++ b/Documentation/gpu/drm-usage-stats.rst
> > > @@ -104,3 +104,9 @@ object belong to this client, in the respective
> > > memory region.
> > >   Default unit shall be bytes with optional unit specifiers of 'KiB'
> > > or 'MiB'
> > >   indicating kibi- or mebi-bytes.
> > > +
> > > +===============================
> > > +Driver specific implementations
> > > +===============================
> > > +
> > > +:ref:`i915-usage-stats`
> > > diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
> > > index 0f08693d05cd..54060cd6c419 100644
> > > --- a/Documentation/gpu/i915.rst
> > > +++ b/Documentation/gpu/i915.rst
> > > @@ -697,3 +697,31 @@ The style guide for ``i915_reg.h``.
> > >   .. kernel-doc:: drivers/gpu/drm/i915/i915_reg.h
> > >      :doc: The i915 register macro definition style guide
> > > +
> > > +.. _i915-usage-stats:
> > > +
> > > +i915 DRM client usage stats implementation
> > > +==========================================
> > > +
> > > +The drm/i915 driver implements the DRM client usage stats
> > > specification as
> > > +documented in :ref:`drm-client-usage-stats`.
> > > +
> > > +Example of the output showing the implemented key value pairs and
> > > entirety of
> > > +the currently possible format options:
> > > +
> > > +::
> > > +
> > > +      pos:    0
> > > +      flags:  0100002
> > > +      mnt_id: 21
> > > +      drm-driver: i915
> > > +      drm-pdev:   0000:00:02.0
> > > +      drm-client-id:      7
> > > +      drm-engine-render:  9288864723 ns
> > > +      drm-engine-copy:    2035071108 ns
> > > +      drm-engine-video:   0 ns
> > > +      drm-engine-capacity-video:   2
> > > +      drm-engine-video-enhance:   0 ns
> > > +
> > > +Possible `drm-engine-` key names are: `render`, `copy`, `video` and
> > > +`video-enhance`.
> > > diff --git a/drivers/gpu/drm/i915/i915_driver.c
> > > b/drivers/gpu/drm/i915/i915_driver.c
> > > index b2df273e6d7b..3ffb617d75c9 100644
> > > --- a/drivers/gpu/drm/i915/i915_driver.c
> > > +++ b/drivers/gpu/drm/i915/i915_driver.c
> > > @@ -1745,6 +1745,9 @@ static const struct file_operations
> > > i915_driver_fops = {
> > >       .read = drm_read,
> > >       .compat_ioctl = i915_ioc32_compat_ioctl,
> > >       .llseek = noop_llseek,
> > > +#ifdef CONFIG_PROC_FS
> > > +    .show_fdinfo = i915_drm_client_fdinfo,
> > > +#endif
> > >   };
> > >   static int
> > > diff --git a/drivers/gpu/drm/i915/i915_drm_client.c
> > > b/drivers/gpu/drm/i915/i915_drm_client.c
> > > index 91a8559bebf7..e539f6b23060 100644
> > > --- a/drivers/gpu/drm/i915/i915_drm_client.c
> > > +++ b/drivers/gpu/drm/i915/i915_drm_client.c
> > > @@ -7,7 +7,13 @@
> > >   #include <linux/slab.h>
> > >   #include <linux/types.h>
> > > +#include <uapi/drm/i915_drm.h>
> > > +
> > > +#include <drm/drm_print.h>
> > > +
> > > +#include "gem/i915_gem_context.h"
> > >   #include "i915_drm_client.h"
> > > +#include "i915_file_private.h"
> > >   #include "i915_gem.h"
> > >   #include "i915_utils.h"
> > > @@ -68,3 +74,81 @@ void i915_drm_clients_fini(struct
> > > i915_drm_clients *clients)
> > >       GEM_BUG_ON(!xa_empty(&clients->xarray));
> > >       xa_destroy(&clients->xarray);
> > >   }
> > > +
> > > +#ifdef CONFIG_PROC_FS
> > > +static const char * const uabi_class_names[] = {
> > > +    [I915_ENGINE_CLASS_RENDER] = "render",
> > > +    [I915_ENGINE_CLASS_COPY] = "copy",
> > > +    [I915_ENGINE_CLASS_VIDEO] = "video",
> > > +    [I915_ENGINE_CLASS_VIDEO_ENHANCE] = "video-enhance",
> > > +};
> > > +
> > > +static u64 busy_add(struct i915_gem_context *ctx, unsigned int class)
> > > +{
> > > +    struct i915_gem_engines_iter it;
> > > +    struct intel_context *ce;
> > > +    u64 total = 0;
> > > +
> > > +    for_each_gem_engine(ce, rcu_dereference(ctx->engines), it) {
> > > +        if (ce->engine->uabi_class != class)
> > > +            continue;
> > > +
> > > +        total += intel_context_get_total_runtime_ns(ce);
> > > +    }
> > > +
> > > +    return total;
> > > +}
> > > +
> > > +static void
> > > +show_client_class(struct seq_file *m,
> > > +          struct i915_drm_client *client,
> > > +          unsigned int class)
> > > +{
> > > +    const struct list_head *list = &client->ctx_list;
> > > +    u64 total = atomic64_read(&client->past_runtime[class]);
> > > +    const unsigned int capacity =
> > > +        client->clients->i915->engine_uabi_class_count[class];
> > > +    struct i915_gem_context *ctx;
> > > +
> > > +    rcu_read_lock();
> > > +    list_for_each_entry_rcu(ctx, list, client_link)
> > > +        total += busy_add(ctx, class);
> > > +    rcu_read_unlock();
> > > +
> > > +    seq_printf(m, "drm-engine-%s:\t%llu ns\n",
> > > +           uabi_class_names[class], total);
> > > +
> > > +    if (capacity > 1)
> > > +        seq_printf(m, "drm-engine-capacity-%s:\t%u\n",
> > > +               uabi_class_names[class],
> > > +               capacity);
> > > +}
> > > +
> > > +void i915_drm_client_fdinfo(struct seq_file *m, struct file *f)
> > > +{
> > > +    struct drm_file *file = f->private_data;
> > > +    struct drm_i915_file_private *file_priv = file->driver_priv;
> > > +    struct drm_i915_private *i915 = file_priv->dev_priv;
> > > +    struct i915_drm_client *client = file_priv->client;
> > > +    struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
> > > +    unsigned int i;
> > > +
> > > +    /*
> > > +     *
> > > ******************************************************************
> > > +     * For text output format description please see
> > > drm-usage-stats.rst!
> > > +     *
> > > ******************************************************************
> > > +     */
> > > +
> > > +    seq_printf(m, "drm-driver:\t%s\n", i915->drm.driver->name);
> > > +    seq_printf(m, "drm-pdev:\t%04x:%02x:%02x.%d\n",
> > > +           pci_domain_nr(pdev->bus), pdev->bus->number,
> > > +           PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
> > > +    seq_printf(m, "drm-client-id:\t%u\n", client->id);
> > > +
> > > +    if (GRAPHICS_VER(i915) < 8)
> > > +        return;
> > > +
> > > +    for (i = 0; i < ARRAY_SIZE(uabi_class_names); i++)
> > > +        show_client_class(m, client, i);
> > > +}
> > > +#endif
> > > diff --git a/drivers/gpu/drm/i915/i915_drm_client.h
> > > b/drivers/gpu/drm/i915/i915_drm_client.h
> > > index 191368386ace..5f5b02b01ba0 100644
> > > --- a/drivers/gpu/drm/i915/i915_drm_client.h
> > > +++ b/drivers/gpu/drm/i915/i915_drm_client.h
> > > @@ -59,6 +59,10 @@ static inline void i915_drm_client_put(struct
> > > i915_drm_client *client)
> > >   struct i915_drm_client *i915_drm_client_add(struct
> > > i915_drm_clients *clients);
> > > +#ifdef CONFIG_PROC_FS
> > > +void i915_drm_client_fdinfo(struct seq_file *m, struct file *f);
> > > +#endif
> > > +
> > >   void i915_drm_clients_fini(struct i915_drm_clients *clients);
> > >   #endif /* !__I915_DRM_CLIENT_H__ */

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [Intel-gfx] [CI 8/8] drm/i915: Expose client engine utilisation via fdinfo
  2022-04-04 15:36       ` Daniel Vetter
@ 2022-04-05  8:08         ` Tvrtko Ursulin
  2022-04-06 18:15           ` Rob Clark
  0 siblings, 1 reply; 14+ messages in thread
From: Tvrtko Ursulin @ 2022-04-05  8:08 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: Intel-gfx, Christian König, dri-devel


On 04/04/2022 16:36, Daniel Vetter wrote:
> On Mon, Apr 04, 2022 at 10:23:53AM +0100, Tvrtko Ursulin wrote:
>>
>> + Dave and Daniel
>>
>> Guys, are you okay with merging this via drm-intel-gt-next? It is one new
>> file at Documentation/gpu/drm-usage-stats.rst only which is outside i915. It
>> has acks from Christian and Rob.
> 
> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Thanks, pushed now.

Rob - you can proceed with your driver at your leisure. I will re-send 
the rebased gputop to igt-dev shortly and copy you.

Regards,

Tvrtko

>>
>> Daniel, series is also fully reviewed and IGT reviewed and ready. Rob also
>> demonstrated the approach works for msm when using the vendor agnosstic
>> gputop tool I sketched out (see
>> 20220225202614.225197-3-robdclark@gmail.com).
>>
>> My plan is to merge the i915 support with the common spec and intel_gpu_top
>> on the IGT side. Then follow-up with vendor agnostic gputop and later yet
>> potentially re-visit the AMD side by re-sending the patch which tweaks the
>> fdinfo format there and adds support for relative engine utilisation as
>> provided by amdgpu.
>>
>> Regards,
>>
>> Tvrtko
>>
>> On 04/04/2022 10:12, Tvrtko Ursulin wrote:
>>>
>>> On 01/04/2022 15:22, Tvrtko Ursulin wrote:
>>>> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>>>
>>>> Similar to AMD commit
>>>> 874442541133 ("drm/amdgpu: Add show_fdinfo() interface"), using the
>>>> infrastructure added in previous patches, we add basic client info
>>>> and GPU engine utilisation for i915.
>>>>
>>>> Example of the output:
>>>>
>>>>     pos:    0
>>>>     flags:  0100002
>>>>     mnt_id: 21
>>>>     drm-driver: i915
>>>>     drm-pdev:   0000:00:02.0
>>>>     drm-client-id:      7
>>>>     drm-engine-render:  9288864723 ns
>>>>     drm-engine-copy:    2035071108 ns
>>>>     drm-engine-video:   0 ns
>>>>     drm-engine-video-enhance:   0 ns
>>>>
>>>> v2:
>>>>    * Update for removal of name and pid.
>>>>
>>>> v3:
>>>>    * Use drm_driver.name.
>>>>
>>>> v4:
>>>>    * Added drm-engine-capacity- tag.
>>>>    * Fix typo. (Umesh)
>>>>
>>>> v5:
>>>>    * Don't output engine data before Gen8.
>>>>
>>>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>>> Cc: David M Nieto <David.Nieto@amd.com>
>>>> Cc: Christian König <christian.koenig@amd.com>
>>>> Cc: Daniel Vetter <daniel@ffwll.ch>
>>>> Cc: Chris Healy <cphealy@gmail.com>
>>>> Acked-by: Christian König <christian.koenig@amd.com>
>>>> Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
>>>
>>> Forgot to apply an earlier:
>>>
>>> Acked-by: Rob Clark <robdclark@gmail.com>
>>>
>>> Regards,
>>>
>>> Tvrtko
>>>
>>>> ---
>>>>    Documentation/gpu/drm-usage-stats.rst  |  6 ++
>>>>    Documentation/gpu/i915.rst             | 28 +++++++++
>>>>    drivers/gpu/drm/i915/i915_driver.c     |  3 +
>>>>    drivers/gpu/drm/i915/i915_drm_client.c | 84 ++++++++++++++++++++++++++
>>>>    drivers/gpu/drm/i915/i915_drm_client.h |  4 ++
>>>>    5 files changed, 125 insertions(+)
>>>>
>>>> diff --git a/Documentation/gpu/drm-usage-stats.rst
>>>> b/Documentation/gpu/drm-usage-stats.rst
>>>> index b8cc28f4da6f..6c9f166a8d6f 100644
>>>> --- a/Documentation/gpu/drm-usage-stats.rst
>>>> +++ b/Documentation/gpu/drm-usage-stats.rst
>>>> @@ -104,3 +104,9 @@ object belong to this client, in the respective
>>>> memory region.
>>>>    Default unit shall be bytes with optional unit specifiers of 'KiB'
>>>> or 'MiB'
>>>>    indicating kibi- or mebi-bytes.
>>>> +
>>>> +===============================
>>>> +Driver specific implementations
>>>> +===============================
>>>> +
>>>> +:ref:`i915-usage-stats`
>>>> diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
>>>> index 0f08693d05cd..54060cd6c419 100644
>>>> --- a/Documentation/gpu/i915.rst
>>>> +++ b/Documentation/gpu/i915.rst
>>>> @@ -697,3 +697,31 @@ The style guide for ``i915_reg.h``.
>>>>    .. kernel-doc:: drivers/gpu/drm/i915/i915_reg.h
>>>>       :doc: The i915 register macro definition style guide
>>>> +
>>>> +.. _i915-usage-stats:
>>>> +
>>>> +i915 DRM client usage stats implementation
>>>> +==========================================
>>>> +
>>>> +The drm/i915 driver implements the DRM client usage stats
>>>> specification as
>>>> +documented in :ref:`drm-client-usage-stats`.
>>>> +
>>>> +Example of the output showing the implemented key value pairs and
>>>> entirety of
>>>> +the currently possible format options:
>>>> +
>>>> +::
>>>> +
>>>> +      pos:    0
>>>> +      flags:  0100002
>>>> +      mnt_id: 21
>>>> +      drm-driver: i915
>>>> +      drm-pdev:   0000:00:02.0
>>>> +      drm-client-id:      7
>>>> +      drm-engine-render:  9288864723 ns
>>>> +      drm-engine-copy:    2035071108 ns
>>>> +      drm-engine-video:   0 ns
>>>> +      drm-engine-capacity-video:   2
>>>> +      drm-engine-video-enhance:   0 ns
>>>> +
>>>> +Possible `drm-engine-` key names are: `render`, `copy`, `video` and
>>>> +`video-enhance`.
>>>> diff --git a/drivers/gpu/drm/i915/i915_driver.c
>>>> b/drivers/gpu/drm/i915/i915_driver.c
>>>> index b2df273e6d7b..3ffb617d75c9 100644
>>>> --- a/drivers/gpu/drm/i915/i915_driver.c
>>>> +++ b/drivers/gpu/drm/i915/i915_driver.c
>>>> @@ -1745,6 +1745,9 @@ static const struct file_operations
>>>> i915_driver_fops = {
>>>>        .read = drm_read,
>>>>        .compat_ioctl = i915_ioc32_compat_ioctl,
>>>>        .llseek = noop_llseek,
>>>> +#ifdef CONFIG_PROC_FS
>>>> +    .show_fdinfo = i915_drm_client_fdinfo,
>>>> +#endif
>>>>    };
>>>>    static int
>>>> diff --git a/drivers/gpu/drm/i915/i915_drm_client.c
>>>> b/drivers/gpu/drm/i915/i915_drm_client.c
>>>> index 91a8559bebf7..e539f6b23060 100644
>>>> --- a/drivers/gpu/drm/i915/i915_drm_client.c
>>>> +++ b/drivers/gpu/drm/i915/i915_drm_client.c
>>>> @@ -7,7 +7,13 @@
>>>>    #include <linux/slab.h>
>>>>    #include <linux/types.h>
>>>> +#include <uapi/drm/i915_drm.h>
>>>> +
>>>> +#include <drm/drm_print.h>
>>>> +
>>>> +#include "gem/i915_gem_context.h"
>>>>    #include "i915_drm_client.h"
>>>> +#include "i915_file_private.h"
>>>>    #include "i915_gem.h"
>>>>    #include "i915_utils.h"
>>>> @@ -68,3 +74,81 @@ void i915_drm_clients_fini(struct
>>>> i915_drm_clients *clients)
>>>>        GEM_BUG_ON(!xa_empty(&clients->xarray));
>>>>        xa_destroy(&clients->xarray);
>>>>    }
>>>> +
>>>> +#ifdef CONFIG_PROC_FS
>>>> +static const char * const uabi_class_names[] = {
>>>> +    [I915_ENGINE_CLASS_RENDER] = "render",
>>>> +    [I915_ENGINE_CLASS_COPY] = "copy",
>>>> +    [I915_ENGINE_CLASS_VIDEO] = "video",
>>>> +    [I915_ENGINE_CLASS_VIDEO_ENHANCE] = "video-enhance",
>>>> +};
>>>> +
>>>> +static u64 busy_add(struct i915_gem_context *ctx, unsigned int class)
>>>> +{
>>>> +    struct i915_gem_engines_iter it;
>>>> +    struct intel_context *ce;
>>>> +    u64 total = 0;
>>>> +
>>>> +    for_each_gem_engine(ce, rcu_dereference(ctx->engines), it) {
>>>> +        if (ce->engine->uabi_class != class)
>>>> +            continue;
>>>> +
>>>> +        total += intel_context_get_total_runtime_ns(ce);
>>>> +    }
>>>> +
>>>> +    return total;
>>>> +}
>>>> +
>>>> +static void
>>>> +show_client_class(struct seq_file *m,
>>>> +          struct i915_drm_client *client,
>>>> +          unsigned int class)
>>>> +{
>>>> +    const struct list_head *list = &client->ctx_list;
>>>> +    u64 total = atomic64_read(&client->past_runtime[class]);
>>>> +    const unsigned int capacity =
>>>> +        client->clients->i915->engine_uabi_class_count[class];
>>>> +    struct i915_gem_context *ctx;
>>>> +
>>>> +    rcu_read_lock();
>>>> +    list_for_each_entry_rcu(ctx, list, client_link)
>>>> +        total += busy_add(ctx, class);
>>>> +    rcu_read_unlock();
>>>> +
>>>> +    seq_printf(m, "drm-engine-%s:\t%llu ns\n",
>>>> +           uabi_class_names[class], total);
>>>> +
>>>> +    if (capacity > 1)
>>>> +        seq_printf(m, "drm-engine-capacity-%s:\t%u\n",
>>>> +               uabi_class_names[class],
>>>> +               capacity);
>>>> +}
>>>> +
>>>> +void i915_drm_client_fdinfo(struct seq_file *m, struct file *f)
>>>> +{
>>>> +    struct drm_file *file = f->private_data;
>>>> +    struct drm_i915_file_private *file_priv = file->driver_priv;
>>>> +    struct drm_i915_private *i915 = file_priv->dev_priv;
>>>> +    struct i915_drm_client *client = file_priv->client;
>>>> +    struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
>>>> +    unsigned int i;
>>>> +
>>>> +    /*
>>>> +     *
>>>> ******************************************************************
>>>> +     * For text output format description please see
>>>> drm-usage-stats.rst!
>>>> +     *
>>>> ******************************************************************
>>>> +     */
>>>> +
>>>> +    seq_printf(m, "drm-driver:\t%s\n", i915->drm.driver->name);
>>>> +    seq_printf(m, "drm-pdev:\t%04x:%02x:%02x.%d\n",
>>>> +           pci_domain_nr(pdev->bus), pdev->bus->number,
>>>> +           PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
>>>> +    seq_printf(m, "drm-client-id:\t%u\n", client->id);
>>>> +
>>>> +    if (GRAPHICS_VER(i915) < 8)
>>>> +        return;
>>>> +
>>>> +    for (i = 0; i < ARRAY_SIZE(uabi_class_names); i++)
>>>> +        show_client_class(m, client, i);
>>>> +}
>>>> +#endif
>>>> diff --git a/drivers/gpu/drm/i915/i915_drm_client.h
>>>> b/drivers/gpu/drm/i915/i915_drm_client.h
>>>> index 191368386ace..5f5b02b01ba0 100644
>>>> --- a/drivers/gpu/drm/i915/i915_drm_client.h
>>>> +++ b/drivers/gpu/drm/i915/i915_drm_client.h
>>>> @@ -59,6 +59,10 @@ static inline void i915_drm_client_put(struct
>>>> i915_drm_client *client)
>>>>    struct i915_drm_client *i915_drm_client_add(struct
>>>> i915_drm_clients *clients);
>>>> +#ifdef CONFIG_PROC_FS
>>>> +void i915_drm_client_fdinfo(struct seq_file *m, struct file *f);
>>>> +#endif
>>>> +
>>>>    void i915_drm_clients_fini(struct i915_drm_clients *clients);
>>>>    #endif /* !__I915_DRM_CLIENT_H__ */
> 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [Intel-gfx] [CI 8/8] drm/i915: Expose client engine utilisation via fdinfo
  2022-04-05  8:08         ` Tvrtko Ursulin
@ 2022-04-06 18:15           ` Rob Clark
  0 siblings, 0 replies; 14+ messages in thread
From: Rob Clark @ 2022-04-06 18:15 UTC (permalink / raw)
  To: Tvrtko Ursulin
  Cc: Intel Graphics Development, dri-devel, Christian König

On Tue, Apr 5, 2022 at 1:09 AM Tvrtko Ursulin
<tvrtko.ursulin@linux.intel.com> wrote:
>
>
> On 04/04/2022 16:36, Daniel Vetter wrote:
> > On Mon, Apr 04, 2022 at 10:23:53AM +0100, Tvrtko Ursulin wrote:
> >>
> >> + Dave and Daniel
> >>
> >> Guys, are you okay with merging this via drm-intel-gt-next? It is one new
> >> file at Documentation/gpu/drm-usage-stats.rst only which is outside i915. It
> >> has acks from Christian and Rob.
> >
> > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> Thanks, pushed now.
>
> Rob - you can proceed with your driver at your leisure. I will re-send
> the rebased gputop to igt-dev shortly and copy you.

Thx, I was planning to respin, but trying to figure out where the
drm-usage-stats.rst patch ended up (since I can't add to a file that
isn't there

BR,
-R

> Regards,
>
> Tvrtko
>
> >>
> >> Daniel, series is also fully reviewed and IGT reviewed and ready. Rob also
> >> demonstrated the approach works for msm when using the vendor agnosstic
> >> gputop tool I sketched out (see
> >> 20220225202614.225197-3-robdclark@gmail.com).
> >>
> >> My plan is to merge the i915 support with the common spec and intel_gpu_top
> >> on the IGT side. Then follow-up with vendor agnostic gputop and later yet
> >> potentially re-visit the AMD side by re-sending the patch which tweaks the
> >> fdinfo format there and adds support for relative engine utilisation as
> >> provided by amdgpu.
> >>
> >> Regards,
> >>
> >> Tvrtko
> >>
> >> On 04/04/2022 10:12, Tvrtko Ursulin wrote:
> >>>
> >>> On 01/04/2022 15:22, Tvrtko Ursulin wrote:
> >>>> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> >>>>
> >>>> Similar to AMD commit
> >>>> 874442541133 ("drm/amdgpu: Add show_fdinfo() interface"), using the
> >>>> infrastructure added in previous patches, we add basic client info
> >>>> and GPU engine utilisation for i915.
> >>>>
> >>>> Example of the output:
> >>>>
> >>>>     pos:    0
> >>>>     flags:  0100002
> >>>>     mnt_id: 21
> >>>>     drm-driver: i915
> >>>>     drm-pdev:   0000:00:02.0
> >>>>     drm-client-id:      7
> >>>>     drm-engine-render:  9288864723 ns
> >>>>     drm-engine-copy:    2035071108 ns
> >>>>     drm-engine-video:   0 ns
> >>>>     drm-engine-video-enhance:   0 ns
> >>>>
> >>>> v2:
> >>>>    * Update for removal of name and pid.
> >>>>
> >>>> v3:
> >>>>    * Use drm_driver.name.
> >>>>
> >>>> v4:
> >>>>    * Added drm-engine-capacity- tag.
> >>>>    * Fix typo. (Umesh)
> >>>>
> >>>> v5:
> >>>>    * Don't output engine data before Gen8.
> >>>>
> >>>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> >>>> Cc: David M Nieto <David.Nieto@amd.com>
> >>>> Cc: Christian König <christian.koenig@amd.com>
> >>>> Cc: Daniel Vetter <daniel@ffwll.ch>
> >>>> Cc: Chris Healy <cphealy@gmail.com>
> >>>> Acked-by: Christian König <christian.koenig@amd.com>
> >>>> Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
> >>>
> >>> Forgot to apply an earlier:
> >>>
> >>> Acked-by: Rob Clark <robdclark@gmail.com>
> >>>
> >>> Regards,
> >>>
> >>> Tvrtko
> >>>
> >>>> ---
> >>>>    Documentation/gpu/drm-usage-stats.rst  |  6 ++
> >>>>    Documentation/gpu/i915.rst             | 28 +++++++++
> >>>>    drivers/gpu/drm/i915/i915_driver.c     |  3 +
> >>>>    drivers/gpu/drm/i915/i915_drm_client.c | 84 ++++++++++++++++++++++++++
> >>>>    drivers/gpu/drm/i915/i915_drm_client.h |  4 ++
> >>>>    5 files changed, 125 insertions(+)
> >>>>
> >>>> diff --git a/Documentation/gpu/drm-usage-stats.rst
> >>>> b/Documentation/gpu/drm-usage-stats.rst
> >>>> index b8cc28f4da6f..6c9f166a8d6f 100644
> >>>> --- a/Documentation/gpu/drm-usage-stats.rst
> >>>> +++ b/Documentation/gpu/drm-usage-stats.rst
> >>>> @@ -104,3 +104,9 @@ object belong to this client, in the respective
> >>>> memory region.
> >>>>    Default unit shall be bytes with optional unit specifiers of 'KiB'
> >>>> or 'MiB'
> >>>>    indicating kibi- or mebi-bytes.
> >>>> +
> >>>> +===============================
> >>>> +Driver specific implementations
> >>>> +===============================
> >>>> +
> >>>> +:ref:`i915-usage-stats`
> >>>> diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
> >>>> index 0f08693d05cd..54060cd6c419 100644
> >>>> --- a/Documentation/gpu/i915.rst
> >>>> +++ b/Documentation/gpu/i915.rst
> >>>> @@ -697,3 +697,31 @@ The style guide for ``i915_reg.h``.
> >>>>    .. kernel-doc:: drivers/gpu/drm/i915/i915_reg.h
> >>>>       :doc: The i915 register macro definition style guide
> >>>> +
> >>>> +.. _i915-usage-stats:
> >>>> +
> >>>> +i915 DRM client usage stats implementation
> >>>> +==========================================
> >>>> +
> >>>> +The drm/i915 driver implements the DRM client usage stats
> >>>> specification as
> >>>> +documented in :ref:`drm-client-usage-stats`.
> >>>> +
> >>>> +Example of the output showing the implemented key value pairs and
> >>>> entirety of
> >>>> +the currently possible format options:
> >>>> +
> >>>> +::
> >>>> +
> >>>> +      pos:    0
> >>>> +      flags:  0100002
> >>>> +      mnt_id: 21
> >>>> +      drm-driver: i915
> >>>> +      drm-pdev:   0000:00:02.0
> >>>> +      drm-client-id:      7
> >>>> +      drm-engine-render:  9288864723 ns
> >>>> +      drm-engine-copy:    2035071108 ns
> >>>> +      drm-engine-video:   0 ns
> >>>> +      drm-engine-capacity-video:   2
> >>>> +      drm-engine-video-enhance:   0 ns
> >>>> +
> >>>> +Possible `drm-engine-` key names are: `render`, `copy`, `video` and
> >>>> +`video-enhance`.
> >>>> diff --git a/drivers/gpu/drm/i915/i915_driver.c
> >>>> b/drivers/gpu/drm/i915/i915_driver.c
> >>>> index b2df273e6d7b..3ffb617d75c9 100644
> >>>> --- a/drivers/gpu/drm/i915/i915_driver.c
> >>>> +++ b/drivers/gpu/drm/i915/i915_driver.c
> >>>> @@ -1745,6 +1745,9 @@ static const struct file_operations
> >>>> i915_driver_fops = {
> >>>>        .read = drm_read,
> >>>>        .compat_ioctl = i915_ioc32_compat_ioctl,
> >>>>        .llseek = noop_llseek,
> >>>> +#ifdef CONFIG_PROC_FS
> >>>> +    .show_fdinfo = i915_drm_client_fdinfo,
> >>>> +#endif
> >>>>    };
> >>>>    static int
> >>>> diff --git a/drivers/gpu/drm/i915/i915_drm_client.c
> >>>> b/drivers/gpu/drm/i915/i915_drm_client.c
> >>>> index 91a8559bebf7..e539f6b23060 100644
> >>>> --- a/drivers/gpu/drm/i915/i915_drm_client.c
> >>>> +++ b/drivers/gpu/drm/i915/i915_drm_client.c
> >>>> @@ -7,7 +7,13 @@
> >>>>    #include <linux/slab.h>
> >>>>    #include <linux/types.h>
> >>>> +#include <uapi/drm/i915_drm.h>
> >>>> +
> >>>> +#include <drm/drm_print.h>
> >>>> +
> >>>> +#include "gem/i915_gem_context.h"
> >>>>    #include "i915_drm_client.h"
> >>>> +#include "i915_file_private.h"
> >>>>    #include "i915_gem.h"
> >>>>    #include "i915_utils.h"
> >>>> @@ -68,3 +74,81 @@ void i915_drm_clients_fini(struct
> >>>> i915_drm_clients *clients)
> >>>>        GEM_BUG_ON(!xa_empty(&clients->xarray));
> >>>>        xa_destroy(&clients->xarray);
> >>>>    }
> >>>> +
> >>>> +#ifdef CONFIG_PROC_FS
> >>>> +static const char * const uabi_class_names[] = {
> >>>> +    [I915_ENGINE_CLASS_RENDER] = "render",
> >>>> +    [I915_ENGINE_CLASS_COPY] = "copy",
> >>>> +    [I915_ENGINE_CLASS_VIDEO] = "video",
> >>>> +    [I915_ENGINE_CLASS_VIDEO_ENHANCE] = "video-enhance",
> >>>> +};
> >>>> +
> >>>> +static u64 busy_add(struct i915_gem_context *ctx, unsigned int class)
> >>>> +{
> >>>> +    struct i915_gem_engines_iter it;
> >>>> +    struct intel_context *ce;
> >>>> +    u64 total = 0;
> >>>> +
> >>>> +    for_each_gem_engine(ce, rcu_dereference(ctx->engines), it) {
> >>>> +        if (ce->engine->uabi_class != class)
> >>>> +            continue;
> >>>> +
> >>>> +        total += intel_context_get_total_runtime_ns(ce);
> >>>> +    }
> >>>> +
> >>>> +    return total;
> >>>> +}
> >>>> +
> >>>> +static void
> >>>> +show_client_class(struct seq_file *m,
> >>>> +          struct i915_drm_client *client,
> >>>> +          unsigned int class)
> >>>> +{
> >>>> +    const struct list_head *list = &client->ctx_list;
> >>>> +    u64 total = atomic64_read(&client->past_runtime[class]);
> >>>> +    const unsigned int capacity =
> >>>> +        client->clients->i915->engine_uabi_class_count[class];
> >>>> +    struct i915_gem_context *ctx;
> >>>> +
> >>>> +    rcu_read_lock();
> >>>> +    list_for_each_entry_rcu(ctx, list, client_link)
> >>>> +        total += busy_add(ctx, class);
> >>>> +    rcu_read_unlock();
> >>>> +
> >>>> +    seq_printf(m, "drm-engine-%s:\t%llu ns\n",
> >>>> +           uabi_class_names[class], total);
> >>>> +
> >>>> +    if (capacity > 1)
> >>>> +        seq_printf(m, "drm-engine-capacity-%s:\t%u\n",
> >>>> +               uabi_class_names[class],
> >>>> +               capacity);
> >>>> +}
> >>>> +
> >>>> +void i915_drm_client_fdinfo(struct seq_file *m, struct file *f)
> >>>> +{
> >>>> +    struct drm_file *file = f->private_data;
> >>>> +    struct drm_i915_file_private *file_priv = file->driver_priv;
> >>>> +    struct drm_i915_private *i915 = file_priv->dev_priv;
> >>>> +    struct i915_drm_client *client = file_priv->client;
> >>>> +    struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
> >>>> +    unsigned int i;
> >>>> +
> >>>> +    /*
> >>>> +     *
> >>>> ******************************************************************
> >>>> +     * For text output format description please see
> >>>> drm-usage-stats.rst!
> >>>> +     *
> >>>> ******************************************************************
> >>>> +     */
> >>>> +
> >>>> +    seq_printf(m, "drm-driver:\t%s\n", i915->drm.driver->name);
> >>>> +    seq_printf(m, "drm-pdev:\t%04x:%02x:%02x.%d\n",
> >>>> +           pci_domain_nr(pdev->bus), pdev->bus->number,
> >>>> +           PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
> >>>> +    seq_printf(m, "drm-client-id:\t%u\n", client->id);
> >>>> +
> >>>> +    if (GRAPHICS_VER(i915) < 8)
> >>>> +        return;
> >>>> +
> >>>> +    for (i = 0; i < ARRAY_SIZE(uabi_class_names); i++)
> >>>> +        show_client_class(m, client, i);
> >>>> +}
> >>>> +#endif
> >>>> diff --git a/drivers/gpu/drm/i915/i915_drm_client.h
> >>>> b/drivers/gpu/drm/i915/i915_drm_client.h
> >>>> index 191368386ace..5f5b02b01ba0 100644
> >>>> --- a/drivers/gpu/drm/i915/i915_drm_client.h
> >>>> +++ b/drivers/gpu/drm/i915/i915_drm_client.h
> >>>> @@ -59,6 +59,10 @@ static inline void i915_drm_client_put(struct
> >>>> i915_drm_client *client)
> >>>>    struct i915_drm_client *i915_drm_client_add(struct
> >>>> i915_drm_clients *clients);
> >>>> +#ifdef CONFIG_PROC_FS
> >>>> +void i915_drm_client_fdinfo(struct seq_file *m, struct file *f);
> >>>> +#endif
> >>>> +
> >>>>    void i915_drm_clients_fini(struct i915_drm_clients *clients);
> >>>>    #endif /* !__I915_DRM_CLIENT_H__ */
> >

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2022-04-06 18:15 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-01 14:21 [CI 0/8] Per client GPU utilisation Tvrtko Ursulin
2022-04-01 14:21 ` [CI 1/8] drm/i915: Explicitly track DRM clients Tvrtko Ursulin
2022-04-01 14:21 ` [CI 2/8] drm/i915: Make GEM contexts " Tvrtko Ursulin
2022-04-01 14:22 ` [CI 3/8] drm/i915: Track runtime spent in closed and unreachable GEM contexts Tvrtko Ursulin
2022-04-01 14:22 ` [CI 4/8] drm/i915: Track all user contexts per client Tvrtko Ursulin
2022-04-01 14:22 ` [CI 5/8] drm/i915: Track context current active time Tvrtko Ursulin
2022-04-01 14:22 ` [CI 6/8] drm: Document fdinfo format specification Tvrtko Ursulin
2022-04-01 14:22 ` [CI 7/8] drm/i915: Count engine instances per uabi class Tvrtko Ursulin
2022-04-01 14:22 ` [CI 8/8] drm/i915: Expose client engine utilisation via fdinfo Tvrtko Ursulin
2022-04-04  9:12   ` [Intel-gfx] " Tvrtko Ursulin
2022-04-04  9:23     ` Tvrtko Ursulin
2022-04-04 15:36       ` Daniel Vetter
2022-04-05  8:08         ` Tvrtko Ursulin
2022-04-06 18:15           ` Rob Clark

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox