From: Brian Welty <brian.welty@intel.com>
To: "Brian Welty" <brian.welty@intel.com>,
cgroups@vger.kernel.org, "Tejun Heo" <tj@kernel.org>,
dri-devel@lists.freedesktop.org,
"David Airlie" <airlied@linux.ie>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Christian König" <christian.koenig@amd.com>,
"Kenny Ho" <Kenny.Ho@amd.com>,
amd-gfx@lists.freedesktop.org,
"Chris Wilson" <chris@chris-wilson.co.uk>,
"Tvrtko Ursulin" <tvrtko.ursulin@linux.intel.com>,
intel-gfx@lists.freedesktop.org,
"Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
"Eero Tamminen" <eero.t.tamminen@intel.com>
Subject: [RFC PATCH 4/9] drmcg: Add skeleton seq_show and write for drmcg files
Date: Tue, 26 Jan 2021 13:46:21 -0800 [thread overview]
Message-ID: <20210126214626.16260-5-brian.welty@intel.com> (raw)
In-Reply-To: <20210126214626.16260-1-brian.welty@intel.com>
Add basic .seq_show and .write functions for use with DRM cgroup control
files. This is based on original work from Kenny Ho and extracted from
patches [1] and [2]. Has been simplified to remove having different file
types and functions for each.
[1] https://lists.freedesktop.org/archives/dri-devel/2020-February/254986.html
[2] https://lists.freedesktop.org/archives/dri-devel/2020-February/254990.html
Co-developed-by: Kenny Ho <Kenny.Ho@amd.com>
Signed-off-by: Brian Welty <brian.welty@intel.com>
---
include/drm/drm_cgroup.h | 5 ++
kernel/cgroup/drm.c | 102 +++++++++++++++++++++++++++++++++++++++
2 files changed, 107 insertions(+)
diff --git a/include/drm/drm_cgroup.h b/include/drm/drm_cgroup.h
index 43caf1b6a0de..12526def9fbf 100644
--- a/include/drm/drm_cgroup.h
+++ b/include/drm/drm_cgroup.h
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: MIT
* Copyright 2019 Advanced Micro Devices, Inc.
+ * Copyright © 2021 Intel Corporation
*/
#ifndef __DRM_CGROUP_H__
#define __DRM_CGROUP_H__
@@ -15,6 +16,10 @@ struct drm_device;
struct drmcg_props {
};
+enum drmcg_res_type {
+ __DRMCG_TYPE_LAST,
+};
+
#ifdef CONFIG_CGROUP_DRM
void drmcg_bind(struct drm_minor (*(*acq_dm)(unsigned int minor_id)),
diff --git a/kernel/cgroup/drm.c b/kernel/cgroup/drm.c
index 836929c27de8..aece11faa0bc 100644
--- a/kernel/cgroup/drm.c
+++ b/kernel/cgroup/drm.c
@@ -5,6 +5,7 @@
*/
#include <linux/bitmap.h>
#include <linux/mutex.h>
+#include <linux/seq_file.h>
#include <linux/slab.h>
#include <linux/cgroup.h>
#include <linux/cgroup_drm.h>
@@ -12,6 +13,7 @@
#include <drm/drm_drv.h>
#include <drm/drm_device.h>
#include <drm/drm_cgroup.h>
+#include <drm/drm_ioctl.h>
static struct drmcg *root_drmcg __read_mostly;
@@ -222,6 +224,106 @@ drmcg_css_alloc(struct cgroup_subsys_state *parent_css)
return &drmcg->css;
}
+static int drmcg_apply_value(struct drmcg_device_resource *ddr,
+ enum drmcg_res_type type, char *buf)
+{
+ int ret = 0;
+ unsigned long val;
+
+ switch (type) {
+ default:
+ break;
+ }
+
+ return ret;
+}
+
+static int drmcg_seq_show_fn(int id, void *ptr, void *data)
+{
+ struct drm_minor *minor = ptr;
+ struct seq_file *sf = data;
+ struct drmcg *drmcg = css_to_drmcg(seq_css(sf));
+ enum drmcg_res_type type = seq_cft(sf)->private;
+ struct drmcg_device_resource *ddr;
+
+ if (minor->type != DRM_MINOR_PRIMARY)
+ return 0;
+
+ ddr = drmcg->dev_resources[minor->index];
+ if (ddr == NULL)
+ return 0;
+
+ seq_printf(sf, "%d:%d ", DRM_MAJOR, minor->index);
+ switch (type) {
+ default:
+ seq_puts(sf, "\n");
+ break;
+ }
+
+ return 0;
+}
+
+static int drmcg_seq_show(struct seq_file *sf, void *v)
+{
+ return drm_minor_for_each(&drmcg_seq_show_fn, sf);
+}
+
+static ssize_t drmcg_write(struct kernfs_open_file *of, char *buf,
+ size_t nbytes, loff_t off)
+{
+ struct drmcg *drmcg = css_to_drmcg(of_css(of));
+ enum drmcg_res_type type = of_cft(of)->private;
+ char *cft_name = of_cft(of)->name;
+ char *limits = strstrip(buf);
+ struct drmcg_device_resource *ddr;
+ struct drm_minor *dm;
+ char *line;
+ char sattr[256];
+ int minor, ret = 0;
+
+ while (!ret && limits != NULL) {
+ line = strsep(&limits, "\n");
+
+ if (sscanf(line,
+ __stringify(DRM_MAJOR)":%u %255[^\t\n]",
+ &minor, sattr) != 2) {
+ pr_err("drmcg: error parsing %s ", cft_name);
+ pr_cont_cgroup_name(drmcg->css.cgroup);
+ pr_cont("\n");
+
+ continue;
+ }
+
+ mutex_lock(&drmcg_mutex);
+ if (acquire_drm_minor)
+ dm = acquire_drm_minor(minor);
+ else
+ dm = NULL;
+ mutex_unlock(&drmcg_mutex);
+
+ if (IS_ERR_OR_NULL(dm)) {
+ pr_err("drmcg: invalid minor %d for %s ",
+ minor, cft_name);
+ pr_cont_cgroup_name(drmcg->css.cgroup);
+ pr_cont("\n");
+
+ continue;
+ }
+
+ mutex_lock(&dm->dev->drmcg_mutex);
+ ddr = drmcg->dev_resources[minor];
+ ret = drmcg_apply_value(ddr, type, sattr);
+ mutex_unlock(&dm->dev->drmcg_mutex);
+
+ mutex_lock(&drmcg_mutex);
+ if (put_drm_dev)
+ put_drm_dev(dm->dev); /* release from acquire_drm_minor */
+ mutex_unlock(&drmcg_mutex);
+ }
+
+ return ret ?: nbytes;
+}
+
struct cftype files[] = {
{ } /* terminate */
};
--
2.20.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2021-01-26 21:45 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 21:46 [RFC PATCH 0/9] cgroup support for GPU devices Brian Welty
2021-01-26 21:46 ` [RFC PATCH 1/9] cgroup: Introduce cgroup for drm subsystem Brian Welty
2021-01-26 21:46 ` [RFC PATCH 2/9] drm, cgroup: Bind drm and cgroup subsystem Brian Welty
2021-01-26 21:46 ` [RFC PATCH 3/9] drm, cgroup: Initialize drmcg properties Brian Welty
2021-01-26 21:46 ` Brian Welty [this message]
2021-01-26 21:46 ` [RFC PATCH 5/9] drmcg: Add support for device memory accounting via page counter Brian Welty
2021-01-26 21:46 ` [RFC PATCH 6/9] drmcg: Add memory.total file Brian Welty
2021-01-26 21:46 ` [RFC PATCH 7/9] drmcg: Add initial support for tracking gpu time usage Brian Welty
2021-02-03 13:25 ` Joonas Lahtinen
2021-02-04 2:23 ` Brian Welty
2021-01-26 21:46 ` [RFC PATCH 8/9] drm/gem: Associate GEM objects with drm cgroup Brian Welty
2021-02-09 10:54 ` Daniel Vetter
2021-02-10 7:52 ` Thomas Zimmermann
2021-02-10 12:45 ` Daniel Vetter
2021-02-10 22:00 ` Brian Welty
2021-02-11 15:34 ` Daniel Vetter
2021-03-06 0:44 ` Brian Welty
2021-03-18 10:16 ` Daniel Vetter
2021-03-18 19:20 ` Brian Welty
2021-05-10 15:36 ` Daniel Vetter
2021-05-10 16:06 ` Tamminen, Eero T
2021-01-26 21:46 ` [RFC PATCH 9/9] drm/i915: Use memory cgroup for enforcing device memory limit Brian Welty
2021-01-29 2:45 ` [RFC PATCH 0/9] cgroup support for GPU devices Xingyou Chen
2021-01-29 3:00 ` Xingyou Chen
2021-02-01 23:21 ` Brian Welty
2021-02-03 10:18 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210126214626.16260-5-brian.welty@intel.com \
--to=brian.welty@intel.com \
--cc=Kenny.Ho@amd.com \
--cc=airlied@linux.ie \
--cc=amd-gfx@lists.freedesktop.org \
--cc=cgroups@vger.kernel.org \
--cc=chris@chris-wilson.co.uk \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=eero.t.tamminen@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=joonas.lahtinen@linux.intel.com \
--cc=tj@kernel.org \
--cc=tvrtko.ursulin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox