Skip to content

Commit

Permalink
drm/i915: Expose per-engine client busyness
Browse files Browse the repository at this point in the history
Expose per-client and per-engine busyness under the previously added sysfs
client root.

The new files are one per-engine instance and located under the 'busy'
directory. Each contains a monotonically increasing nano-second resolution
times each client's jobs were executing on the GPU.

This enables userspace to create a top-like tool for GPU utilization:

==========================================================================
intel-gpu-top -  935/ 935 MHz;    0% RC6; 14.73 Watts;     1097 irqs/s

      IMC reads:     1401 MiB/s
     IMC writes:        4 MiB/s

          ENGINE      BUSY                                 MI_SEMA MI_WAIT
     Render/3D/0   63.73% |███████████████████           |      3%      0%
       Blitter/0    9.53% |██▊                           |      6%      0%
         Video/0   39.32% |███████████▊                  |     16%      0%
         Video/1   15.62% |████▋                         |      0%      0%
  VideoEnhance/0    0.00% |                              |      0%      0%

  PID            NAME     RCS          BCS          VCS         VECS
 4084        gem_wsim |█████▌     ||█          ||           ||           |
 4086        gem_wsim |█▌         ||           ||███        ||           |
==========================================================================

v2: Use intel_context_engine_get_busy_time.
v3: New directory structure.
v4: Rebase.
v5: sysfs_attr_init.
v6: Small tidy in i915_gem_add_client.
v7: Rebase to be engine class based.
v8:
 * Always enable stats.
 * Walk all client contexts.
v9:
 * Skip unsupported engine classes. (Chris)
 * Use scheduler caps. (Chris)
v10:
 * Use pphwsp runtime only.

Link: https://patchwork.freedesktop.org/series/71182/ # intel_gpu_top
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>
Link: https://patchwork.freedesktop.org/patch/msgid/20210123153733.18139-8-chris@chris-wilson.co.uk
Link: https://patchwork.freedesktop.org/patch/msgid/20210124153136.19124-8-chris@chris-wilson.co.uk
  • Loading branch information
Tvrtko Ursulin authored and Chris Wilson committed Jan 24, 2021
1 parent c209da9 commit 35a8827
Show file tree
Hide file tree
Showing 2 changed files with 110 additions and 1 deletion.
101 changes: 100 additions & 1 deletion drivers/gpu/drm/i915/i915_drm_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@

#include <drm/drm_print.h>

#include <uapi/drm/i915_drm.h>

#include "gem/i915_gem_context.h"
#include "gt/intel_engine_user.h"

#include "i915_drm_client.h"
#include "i915_drv.h"
#include "i915_gem.h"
Expand Down Expand Up @@ -55,6 +60,95 @@ show_client_pid(struct device *kdev, struct device_attribute *attr, char *buf)
return ret;
}

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 ssize_t
show_busy(struct device *kdev, struct device_attribute *attr, char *buf)
{
struct i915_engine_busy_attribute *i915_attr =
container_of(attr, typeof(*i915_attr), attr);
unsigned int class = i915_attr->engine_class;
const struct i915_drm_client *client = i915_attr->client;
const struct list_head *list = &client->ctx_list;
u64 total = atomic64_read(&client->past_runtime[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();

return sysfs_emit(buf, "%llu\n", total);
}

static const char * const uabi_class_names[] = {
[I915_ENGINE_CLASS_RENDER] = "0",
[I915_ENGINE_CLASS_COPY] = "1",
[I915_ENGINE_CLASS_VIDEO] = "2",
[I915_ENGINE_CLASS_VIDEO_ENHANCE] = "3",
};

static int __client_register_sysfs_busy(struct i915_drm_client *client)
{
struct i915_drm_clients *clients = client->clients;
unsigned int i;
int ret = 0;

if (!(clients->i915->caps.scheduler & I915_SCHEDULER_CAP_ENGINE_BUSY_STATS))
return 0;

client->busy_root = kobject_create_and_add("busy", client->root);
if (!client->busy_root)
return -ENOMEM;

for (i = 0; i < ARRAY_SIZE(uabi_class_names); i++) {
struct i915_engine_busy_attribute *i915_attr =
&client->attr.busy[i];
struct device_attribute *attr = &i915_attr->attr;

if (!intel_engine_lookup_user(clients->i915, i, 0))
continue;

i915_attr->client = client;
i915_attr->engine_class = i;

sysfs_attr_init(&attr->attr);

attr->attr.name = uabi_class_names[i];
attr->attr.mode = 0444;
attr->show = show_busy;

ret = sysfs_create_file(client->busy_root, &attr->attr);
if (ret)
goto out;
}

out:
if (ret)
kobject_put(client->busy_root);

return ret;
}

static void __client_unregister_sysfs_busy(struct i915_drm_client *client)
{
kobject_put(fetch_and_zero(&client->busy_root));
}

static int __client_register_sysfs(struct i915_drm_client *client)
{
const struct {
Expand Down Expand Up @@ -90,9 +184,12 @@ static int __client_register_sysfs(struct i915_drm_client *client)

ret = sysfs_create_file(client->root, &attr->attr);
if (ret)
break;
goto out;
}

ret = __client_register_sysfs_busy(client);

out:
if (ret)
kobject_put(client->root);

Expand All @@ -101,6 +198,8 @@ static int __client_register_sysfs(struct i915_drm_client *client)

static void __client_unregister_sysfs(struct i915_drm_client *client)
{
__client_unregister_sysfs_busy(client);

kobject_put(fetch_and_zero(&client->root));
}

Expand Down
10 changes: 10 additions & 0 deletions drivers/gpu/drm/i915/i915_drm_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ struct i915_drm_clients {
struct kobject *root;
};

struct i915_drm_client;

struct i915_engine_busy_attribute {
struct device_attribute attr;
struct i915_drm_client *client;
unsigned int engine_class;
};

struct i915_drm_client_name {
struct rcu_head rcu;
struct i915_drm_client *client;
Expand All @@ -54,9 +62,11 @@ struct i915_drm_client {
struct i915_drm_clients *clients;

struct kobject *root;
struct kobject *busy_root;
struct {
struct device_attribute pid;
struct device_attribute name;
struct i915_engine_busy_attribute busy[MAX_ENGINE_CLASS + 1];
} attr;

/**
Expand Down

0 comments on commit 35a8827

Please sign in to comment.