[PATCH v2 06/11] drm, cgroup: Add GEM buffer allocation count stats

Kenny Ho
2020-02-26T19:01:47Z

gpu.buffer.count.stats
A read-only flat-keyed file which exists on all cgroups. Each
entry is keyed by the drm device's major:minor.

Total number of GEM buffer allocated.

Change-Id: Iad29bdf44390dbcee07b1e72ea0ff811aa3b9dcd
Signed-off-by: Kenny Ho <Kenny.Ho-5C7GfCeVMHo@public.gmane.org>
---
Documentation/admin-guide/cgroup-v2.rst | 6 ++++++
include/linux/cgroup_drm.h | 3 +++
kernel/cgroup/drm.c | 22 +++++++++++++++++++---
3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst
index 6199cc9a978f..065f2b52da57 100644
--- a/Documentation/admin-guide/cgroup-v2.rst
+++ b/Documentation/admin-guide/cgroup-v2.rst
@@ -2081,6 +2081,12 @@ GPU Interface Files

Largest (high water mark) GEM buffer allocated in bytes.

+ gpu.buffer.count.stats
+ A read-only flat-keyed file which exists on all cgroups. Each
+ entry is keyed by the drm device's major:minor.
+
+ Total number of GEM buffer allocated.
+
GEM Buffer Ownership
~~~~~~~~~~~~~~~~~~~~

diff --git a/include/linux/cgroup_drm.h b/include/linux/cgroup_drm.h
index d90807627213..103868d972d0 100644
--- a/include/linux/cgroup_drm.h
+++ b/include/linux/cgroup_drm.h
@@ -14,6 +14,7 @@
enum drmcg_res_type {
DRMCG_TYPE_BO_TOTAL,
DRMCG_TYPE_BO_PEAK,
+ DRMCG_TYPE_BO_COUNT,
__DRMCG_TYPE_LAST,
};

@@ -27,6 +28,8 @@ struct drmcg_device_resource {
s64 bo_stats_total_allocated;

s64 bo_stats_peak_allocated;
+
+ s64 bo_stats_count_allocated;
};

/**
diff --git a/kernel/cgroup/drm.c b/kernel/cgroup/drm.c
index 68b23693418b..5a700833a304 100644
--- a/kernel/cgroup/drm.c
+++ b/kernel/cgroup/drm.c
@@ -280,6 +280,9 @@ static void drmcg_print_stats(struct drmcg_device_resource *ddr,
case DRMCG_TYPE_BO_PEAK:
seq_printf(sf, "%lld\n", ddr->bo_stats_peak_allocated);
break;
+ case DRMCG_TYPE_BO_COUNT:
+ seq_printf(sf, "%lld\n", ddr->bo_stats_count_allocated);
+ break;
default:
seq_puts(sf, "\n");
break;
@@ -334,6 +337,12 @@ struct cftype files[] = {
.private = DRMCG_CTF_PRIV(DRMCG_TYPE_BO_PEAK,
DRMCG_FTYPE_STATS),
},
+ {
+ .name = "buffer.count.stats",
+ .seq_show = drmcg_seq_show,
+ .private = DRMCG_CTF_PRIV(DRMCG_TYPE_BO_COUNT,
+ DRMCG_FTYPE_STATS),
+ },
{ } /* terminate */
};

@@ -385,6 +394,8 @@ void drmcg_chg_bo_alloc(struct drmcg *drmcg, struct drm_device *dev,

if (ddr->bo_stats_peak_allocated < (s64)size)
ddr->bo_stats_peak_allocated = (s64)size;
+
+ ddr->bo_stats_count_allocated++;
}
mutex_unlock(&dev->drmcg_mutex);
}
@@ -402,15 +413,20 @@ EXPORT_SYMBOL(drmcg_chg_bo_alloc);
void drmcg_unchg_bo_alloc(struct drmcg *drmcg, struct drm_device *dev,
size_t size)
{
+ struct drmcg_device_resource *ddr;
int devIdx = dev->primary->index;

if (drmcg == NULL)
return;

mutex_lock(&dev->drmcg_mutex);
- for ( ; drmcg != NULL; drmcg = drmcg_parent(drmcg))
- drmcg->dev_resources[devIdx]->bo_stats_total_allocated
- -= (s64)size;
+ for ( ; drmcg != NULL; drmcg = drmcg_parent(drmcg)) {
+ ddr = drmcg->dev_resources[devIdx];
+
+ ddr->bo_stats_total_allocated -= (s64)size;
+
+ ddr->bo_stats_count_allocated--;
+ }
mutex_unlock(&dev->drmcg_mutex);
}
EXPORT_SYMBOL(drmcg_unchg_bo_alloc);
--
2.25.0