From: Tony Luck <tony.luck@intel.com>
To: Fenghua Yu <fenghua.yu@intel.com>,
Reinette Chatre <reinette.chatre@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Shaopeng Tan <tan.shaopeng@fujitsu.com>,
Jamie Iles <quic_jiles@quicinc.com>,
James Morse <james.morse@arm.com>,
Babu Moger <babu.moger@amd.com>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
Tony Luck <tony.luck@intel.com>
Subject: [RFC PATCH 4/7] x86/resctrl: Add capability to driver registration to create control files
Date: Thu, 20 Apr 2023 15:06:33 -0700 [thread overview]
Message-ID: <20230420220636.53527-5-tony.luck@intel.com> (raw)
In-Reply-To: <20230420220636.53527-1-tony.luck@intel.com>
Add a control file to each ctrlmon directory. Hook into the mkdir()
functions to add the control file to any new directories that are
created.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
include/linux/resctrl.h | 2 +
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 70 ++++++++++++++++++++++++++
2 files changed, 72 insertions(+)
diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h
index 44dd811cb552..8668480cea51 100644
--- a/include/linux/resctrl.h
+++ b/include/linux/resctrl.h
@@ -217,6 +217,7 @@ struct resctrl_fileinfo {
* @infodir: Name of directory to create in resctrl/info.
* @infofiles: Array of files to create under infodir.
* @rmdir: Callback when a resctrl directory is removed.
+ * @ctrlfiles: Array of files to create in ctrlmon directories.
*/
struct resctrl_driver {
struct list_head list;
@@ -224,6 +225,7 @@ struct resctrl_driver {
char *infodir;
struct resctrl_fileinfo *infofiles;
int (*rmdir)(int oclos, int ormid, int nclos, int nrmid);
+ struct resctrl_fileinfo *ctrlfiles;
};
int resctrl_register_driver(struct resctrl_driver *d);
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 8ca3b17bd671..e2fdd5819336 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -2466,6 +2466,18 @@ static int addfiles(struct kernfs_node *parent, struct resctrl_fileinfo *files,
return 0;
}
+static void rmfiles(struct kernfs_node *parent, struct resctrl_fileinfo *files)
+{
+ struct resctrl_fileinfo *f;
+ struct kernfs_node *kn;
+
+ for (f = files; f->name; f++) {
+ kn = kernfs_find_and_get_ns(parent, f->name, NULL);
+ if (kn)
+ kernfs_remove(kn);
+ }
+}
+
/*
* Add or remove a directory from the resctrl/info directory
*/
@@ -2495,12 +2507,49 @@ static int rdtgroup_update_info_dir(char *name, struct resctrl_fileinfo *files)
return ret;
}
+/*
+ * Create/remove a new control file in all current and future control and
+ * monitor groups.
+ */
+static void rdtgroup_update_ctrl_dir(struct resctrl_fileinfo *files, bool add)
+{
+ struct rdtgroup *rdtgrp;
+
+ if (!add) {
+ list_for_each_entry(rdtgrp, &rdt_all_groups, rdtgroup_list) {
+ struct rdtgroup *crg;
+
+ rmfiles(rdtgrp->kn, files);
+
+ list_for_each_entry(crg, &rdtgrp->mon.crdtgrp_list, mon.crdtgrp_list) {
+ rmfiles(crg->kn, files);
+ }
+ }
+
+ return;
+ }
+
+ list_for_each_entry(rdtgrp, &rdt_all_groups, rdtgroup_list) {
+ unsigned long priv = (rdtgrp->closid << 16) | rdtgrp->mon.rmid;
+ struct rdtgroup *crg;
+
+ addfiles(rdtgrp->kn, files, F_PRIV | F_ACTIVATE, (void *)priv);
+
+ list_for_each_entry(crg, &rdtgrp->mon.crdtgrp_list, mon.crdtgrp_list) {
+ priv = (crg->closid << 16) | crg->mon.rmid;
+ addfiles(crg->kn, files, F_PRIV | F_ACTIVATE, (void *)priv);
+ }
+ }
+}
+
static void driver_up(struct resctrl_driver *d)
{
if (d->mount)
d->mount(true);
if (d->infodir)
rdtgroup_update_info_dir(d->infodir, d->infofiles);
+ if (d->ctrlfiles)
+ rdtgroup_update_ctrl_dir(d->ctrlfiles, true);
}
static void driver_down(struct resctrl_driver *d)
@@ -2509,6 +2558,8 @@ static void driver_down(struct resctrl_driver *d)
d->mount(false);
if (d->infodir)
rdtgroup_update_info_dir(d->infodir, NULL);
+ if (d->ctrlfiles)
+ rdtgroup_update_ctrl_dir(d->ctrlfiles, false);
}
int resctrl_register_driver(struct resctrl_driver *d)
@@ -3375,6 +3426,7 @@ static int rdtgroup_mkdir_mon(struct kernfs_node *parent_kn,
const char *name, umode_t mode)
{
struct rdtgroup *rdtgrp, *prgrp;
+ struct resctrl_driver *d;
int ret;
ret = mkdir_rdt_prepare(parent_kn, name, mode, RDTMON_GROUP, &rdtgrp);
@@ -3384,6 +3436,14 @@ static int rdtgroup_mkdir_mon(struct kernfs_node *parent_kn,
prgrp = rdtgrp->mon.parent;
rdtgrp->closid = prgrp->closid;
+ list_for_each_entry(d, &drivers, list) {
+ unsigned long priv = (rdtgrp->closid << 16) | rdtgrp->mon.rmid;
+
+ if (!d->ctrlfiles)
+ continue;
+ addfiles(rdtgrp->kn, d->ctrlfiles, F_PRIV | F_ACTIVATE, (void *)priv);
+ }
+
/*
* Add the rdtgrp to the list of rdtgrps the parent
* ctrl_mon group has to track.
@@ -3401,6 +3461,7 @@ static int rdtgroup_mkdir_mon(struct kernfs_node *parent_kn,
static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn,
const char *name, umode_t mode)
{
+ struct resctrl_driver *d;
struct rdtgroup *rdtgrp;
struct kernfs_node *kn;
u32 closid;
@@ -3426,6 +3487,15 @@ static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn,
list_add(&rdtgrp->rdtgroup_list, &rdt_all_groups);
+ list_for_each_entry(d, &drivers, list) {
+ unsigned long priv = (rdtgrp->closid << 16) | rdtgrp->mon.rmid;
+
+ if (!d->ctrlfiles)
+ continue;
+
+ addfiles(kn, d->ctrlfiles, F_PRIV | F_ACTIVATE, (void *)priv);
+ }
+
if (rdt_mon_capable) {
/*
* Create an empty mon_groups directory to hold the subset
--
2.39.2
next prev parent reply other threads:[~2023-04-20 22:07 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-20 22:06 [RFC PATCH 0/7] Add driver registration i/f to resctrl Tony Luck
2023-04-20 22:06 ` [RFC PATCH 1/7] x86/resctrl: Add register/unregister functions for driver to hook into resctrl Tony Luck
2023-05-05 23:17 ` Reinette Chatre
2023-04-20 22:06 ` [RFC PATCH 2/7] x86/resctrl: Add an interface to add/remove a new info/directory Tony Luck
2023-04-20 22:06 ` [RFC PATCH 3/7] x86/resctrl: Add driver callback when directories are removed Tony Luck
2023-05-05 23:19 ` Reinette Chatre
2023-04-20 22:06 ` Tony Luck [this message]
2023-05-05 23:20 ` [RFC PATCH 4/7] x86/resctrl: Add capability to driver registration to create control files Reinette Chatre
2023-04-20 22:06 ` [RFC PATCH 5/7] x86/resctrl: Enhance driver registration to hook into schemata files Tony Luck
2023-05-05 23:20 ` Reinette Chatre
2023-04-20 22:06 ` [RFC PATCH 6/7] x86/resctrl: Allow a device to override an existing schemata entry Tony Luck
2023-05-05 23:20 ` Reinette Chatre
2023-04-20 22:06 ` [RFC PATCH 7/7] x86/resctrl: Example resctrl driver Tony Luck
2023-05-05 23:17 ` [RFC PATCH 0/7] Add driver registration i/f to resctrl Reinette Chatre
2023-05-08 18:32 ` Luck, Tony
2023-05-09 21:34 ` Reinette Chatre
2023-05-09 23:35 ` Luck, Tony
2023-05-10 0:07 ` Reinette Chatre
2023-05-10 0:52 ` Luck, Tony
2023-05-11 20:35 ` Luck, Tony
2023-05-12 16:57 ` Reinette Chatre
2023-05-12 20:35 ` Luck, Tony
2023-05-12 21:08 ` Reinette Chatre
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=20230420220636.53527-5-tony.luck@intel.com \
--to=tony.luck@intel.com \
--cc=babu.moger@amd.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=james.morse@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=quic_jiles@quicinc.com \
--cc=reinette.chatre@intel.com \
--cc=tan.shaopeng@fujitsu.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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