| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20230420220636.53527-6-tony.luck@intel.com>
Date: Thu, 20 Apr 2023 15:06:34 -0700
From: Tony Luck <tony.luck@...el.com>
To: Fenghua Yu <fenghua.yu@...el.com>,
Reinette Chatre <reinette.chatre@...el.com>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>, Borislav Petkov <bp@...en8.de>,
Dave Hansen <dave.hansen@...ux.intel.com>,
"H. Peter Anvin" <hpa@...or.com>,
Shaopeng Tan <tan.shaopeng@...itsu.com>,
Jamie Iles <quic_jiles@...cinc.com>,
James Morse <james.morse@....com>,
Babu Moger <babu.moger@....com>
Cc: x86@...nel.org, linux-kernel@...r.kernel.org,
Tony Luck <tony.luck@...el.com>
Subject: [RFC PATCH 5/7] x86/resctrl: Enhance driver registration to hook into schemata files
Add a new configuration type "DRIVER" for lines in the schemata files
with a show() and update() callback functions to the driver to maintain
these lines.
Signed-off-by: Tony Luck <tony.luck@...el.com>
---
include/linux/resctrl.h | 6 ++++++
arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 17 ++++++++++++++---
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 16 ++++++++++++++++
3 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h
index 8668480cea51..691805214f41 100644
--- a/include/linux/resctrl.h
+++ b/include/linux/resctrl.h
@@ -23,11 +23,13 @@ int proc_resctrl_show(struct seq_file *m,
* @CDP_NONE: No prioritisation, both code and data are controlled or monitored.
* @CDP_CODE: Configuration applies to instruction fetches.
* @CDP_DATA: Configuration applies to reads and writes.
+ * @DRIVER: Resource managed by driver.
*/
enum resctrl_conf_type {
CDP_NONE,
CDP_CODE,
CDP_DATA,
+ DRIVER,
};
#define CDP_NUM_TYPES (CDP_DATA + 1)
@@ -201,6 +203,8 @@ struct resctrl_schema {
char name[8];
enum resctrl_conf_type conf_type;
struct rdt_resource *res;
+ void (*show)(struct seq_file *s, int closid);
+ int (*update)(char *s, int closid);
u32 num_closid;
};
@@ -218,6 +222,7 @@ struct resctrl_fileinfo {
* @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.
+ * @schema: Driver supplied to manage a line in schemata file.
*/
struct resctrl_driver {
struct list_head list;
@@ -226,6 +231,7 @@ struct resctrl_driver {
struct resctrl_fileinfo *infofiles;
int (*rmdir)(int oclos, int ormid, int nclos, int nrmid);
struct resctrl_fileinfo *ctrlfiles;
+ struct resctrl_schema schema;
};
int resctrl_register_driver(struct resctrl_driver *d);
diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
index b44c487727d4..7a59d6eab576 100644
--- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
+++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
@@ -356,8 +356,12 @@ static int rdtgroup_parse_resource(char *resname, char *tok,
struct resctrl_schema *s;
list_for_each_entry(s, &resctrl_schema_all, list) {
- if (!strcmp(resname, s->name) && rdtgrp->closid < s->num_closid)
- return parse_line(tok, s, rdtgrp);
+ if (!strcmp(resname, s->name) && rdtgrp->closid < s->num_closid) {
+ if (s->conf_type == DRIVER)
+ return s->update(tok, rdtgrp->closid);
+ else
+ return parse_line(tok, s, rdtgrp);
+ }
}
rdt_last_cmd_printf("Unknown or unsupported resource name '%s'\n", resname);
return -EINVAL;
@@ -419,10 +423,11 @@ ssize_t rdtgroup_schemata_write(struct kernfs_open_file *of,
r = s->res;
/*
+ * Resources controlled by a driver are updated by that driver.
* Writes to mba_sc resources update the software controller,
* not the control MSR.
*/
- if (is_mba_sc(r))
+ if (s->conf_type == DRIVER || is_mba_sc(r))
continue;
ret = resctrl_arch_update_domains(r, rdtgrp->closid);
@@ -464,6 +469,12 @@ static void show_doms(struct seq_file *s, struct resctrl_schema *schema, int clo
u32 ctrl_val;
seq_printf(s, "%*s:", max_name_width, schema->name);
+
+ if (schema->conf_type == DRIVER) {
+ schema->show(s, closid);
+ return;
+ }
+
list_for_each_entry(dom, &r->domains, list) {
if (sep)
seq_puts(s, ";");
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index e2fdd5819336..cc2292a7435b 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -2043,6 +2043,8 @@ static int rdtgroup_create_info_dir(struct kernfs_node *parent_kn)
/* loop over enabled controls, these are all alloc_capable */
list_for_each_entry(s, &resctrl_schema_all, list) {
+ if (s->conf_type == DRIVER)
+ continue;
r = s->res;
fflags = r->fflags | RF_CTRL_INFO;
ret = rdtgroup_mkdir_info_resdir(s, s->name, fflags);
@@ -2390,6 +2392,9 @@ static int schemata_list_add(struct rdt_resource *r, enum resctrl_conf_type type
case CDP_NONE:
suffix = "";
break;
+ case DRIVER:
+ kfree(s);
+ return -EINVAL;
}
ret = snprintf(s->name, sizeof(s->name), "%s%s", r->name, suffix);
@@ -2567,6 +2572,9 @@ int resctrl_register_driver(struct resctrl_driver *d)
mutex_lock(&rdtgroup_mutex);
list_add(&d->list, &drivers);
+ if (d->schema.name[0])
+ list_add(&d->schema.list, &resctrl_schema_all);
+
if (resctrl_is_mounted)
driver_up(d);
mutex_unlock(&rdtgroup_mutex);
@@ -2578,8 +2586,12 @@ EXPORT_SYMBOL_GPL(resctrl_register_driver);
void resctrl_unregister_driver(struct resctrl_driver *d)
{
mutex_lock(&rdtgroup_mutex);
+
list_del(&d->list);
+ if (d->schema.name[0])
+ list_del(&d->schema.list);
+
if (resctrl_is_mounted)
driver_down(d);
mutex_unlock(&rdtgroup_mutex);
@@ -2591,6 +2603,8 @@ static void schemata_list_destroy(void)
struct resctrl_schema *s, *tmp;
list_for_each_entry_safe(s, tmp, &resctrl_schema_all, list) {
+ if (s->conf_type == DRIVER)
+ continue;
list_del(&s->list);
kfree(s);
}
@@ -3285,6 +3299,8 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp)
rdt_staged_configs_clear();
list_for_each_entry(s, &resctrl_schema_all, list) {
+ if (s->conf_type == DRIVER)
+ continue;
r = s->res;
if (r->rid == RDT_RESOURCE_MBA ||
r->rid == RDT_RESOURCE_SMBA) {
--
2.39.2
Powered by blists - more mailing lists