x86/resctrl: Move the schemata names into struct resctrl_schema

resctrl 'info' directories and schema parsing use the schema name.
This lives in the struct rdt_resource, and is specified by the
architecture code.

Once the CDP resources are merged, there will only be one resource (and
one name) in use by two schemata. To allow the CDP CODE/DATA property to
be the type of configuration the schema uses, the name should also be
per-schema.

Add a name field to struct resctrl_schema, and use this wherever
the schema name is exposed (or read from) user-space. Calculating
max_name_width for padding the schemata file also moves as this is
visible to user-space. As the names in struct rdt_resource already
include the CDP information, schemata_list_create() copies them.

schemata_list_create() includes the length of the CDP suffix when
calculating max_name_width in preparation for CDP resources being
merged.

Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Jamie Iles <jamie@nuviainc.com>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Tested-by: Babu Moger <babu.moger@amd.com>
Link: https://lkml.kernel.org/r/20210728170637.25610-13-james.morse@arm.com

diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
index 87b5aa7683ee077118da09da69a2d0bd9670a922..755118a9ef389bd18fe3de906560a1d9b28924e5 100644 (file)
--- a/arch/x86/kernel/cpu/resctrl/core.c
+++ b/arch/x86/kernel/cpu/resctrl/core.c
@@ -782,13 +782,8 @@ static int resctrl_offline_cpu(unsigned int cpu)
 static __init void rdt_init_padding(void)
 {
        struct rdt_resource *r;
-       int cl;
 
        for_each_alloc_capable_rdt_resource(r) {
-               cl = strlen(r->name);
-               if (cl > max_name_width)
-                       max_name_width = cl;
-
                if (r->data_width > max_data_width)
                        max_data_width = r->data_width;
        }

diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
index 0ee1ded5b8ff2c946f7884a6c1bf9c276b333805..104b285f8a60c39c40dffc495c3266a31779cc00 100644 (file)
--- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
+++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
@@ -290,11 +290,9 @@ static int rdtgroup_parse_resource(char *resname, char *tok,
                                   struct rdtgroup *rdtgrp)
 {
        struct resctrl_schema *s;
-       struct rdt_resource *r;
 
        list_for_each_entry(s, &resctrl_schema_all, list) {
-               r = s->res;
-               if (!strcmp(resname, r->name) && rdtgrp->closid < s->num_closid)
+               if (!strcmp(resname, s->name) && rdtgrp->closid < s->num_closid)
                        return parse_line(tok, s, rdtgrp);
        }
        rdt_last_cmd_printf("Unknown or unsupported resource name '%s'\n", resname);
@@ -388,7 +386,7 @@ static void show_doms(struct seq_file *s, struct resctrl_schema *schema, int clo
        bool sep = false;
        u32 ctrl_val;
 
-       seq_printf(s, "%*s:", max_name_width, r->name);
+       seq_printf(s, "%*s:", max_name_width, schema->name);
        list_for_each_entry(dom, &r->domains, list) {
                hw_dom = resctrl_to_arch_dom(dom);
                if (sep)
@@ -408,7 +406,6 @@ int rdtgroup_schemata_show(struct kernfs_open_file *of,
 {
        struct resctrl_schema *schema;
        struct rdtgroup *rdtgrp;
-       struct rdt_resource *r;
        int ret = 0;
        u32 closid;
 
@@ -416,8 +413,7 @@ int rdtgroup_schemata_show(struct kernfs_open_file *of,
        if (rdtgrp) {
                if (rdtgrp->mode == RDT_MODE_PSEUDO_LOCKSETUP) {
                        list_for_each_entry(schema, &resctrl_schema_all, list) {
-                               r = schema->res;
-                               seq_printf(s, "%s:uninitialized\n", r->name);
+                               seq_printf(s, "%s:uninitialized\n", schema->name);
                        }
                } else if (rdtgrp->mode == RDT_MODE_PSEUDO_LOCKED) {
                        if (!rdtgrp->plr->d) {

diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index cc9dacd734388f2d5c9f07fe5a78d44b3a2f6f47..1f8c8d79d00b228d9f3ef676da2d03aad522b758 100644 (file)
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -1439,7 +1439,7 @@ static int rdtgroup_size_show(struct kernfs_open_file *of,
                        ret = -ENODEV;
                } else {
                        seq_printf(s, "%*s:", max_name_width,
-                                  rdtgrp->plr->s->res->name);
+                                  rdtgrp->plr->s->name);
                        size = rdtgroup_cbm_to_size(rdtgrp->plr->s->res,
                                                    rdtgrp->plr->d,
                                                    rdtgrp->plr->cbm);
@@ -1451,7 +1451,7 @@ static int rdtgroup_size_show(struct kernfs_open_file *of,
        list_for_each_entry(schema, &resctrl_schema_all, list) {
                r = schema->res;
                sep = false;
-               seq_printf(s, "%*s:", max_name_width, r->name);
+               seq_printf(s, "%*s:", max_name_width, schema->name);
                list_for_each_entry(d, &r->domains, list) {
                        hw_dom = resctrl_to_arch_dom(d);
                        if (sep)
@@ -1823,7 +1823,7 @@ static int rdtgroup_create_info_dir(struct kernfs_node *parent_kn)
        list_for_each_entry(s, &resctrl_schema_all, list) {
                r = s->res;
                fflags =  r->fflags | RF_CTRL_INFO;
-               ret = rdtgroup_mkdir_info_resdir(s, r->name, fflags);
+               ret = rdtgroup_mkdir_info_resdir(s, s->name, fflags);
                if (ret)
                        goto out_destroy;
        }
@@ -2141,6 +2141,7 @@ static int schemata_list_create(void)
 {
        struct resctrl_schema *s;
        struct rdt_resource *r;
+       int ret, cl;
 
        for_each_alloc_enabled_rdt_resource(r) {
                s = kzalloc(sizeof(*s), GFP_KERNEL);
@@ -2151,6 +2152,26 @@ static int schemata_list_create(void)
                s->conf_type = resctrl_to_arch_res(r)->conf_type;
                s->num_closid = resctrl_arch_get_num_closid(r);
 
+               ret = snprintf(s->name, sizeof(s->name), r->name);
+               if (ret >= sizeof(s->name)) {
+                       kfree(s);
+                       return -EINVAL;
+               }
+
+               cl = strlen(s->name);
+
+               /*
+                * If CDP is supported by this resource, but not enabled,
+                * include the suffix. This ensures the tabular format of the
+                * schemata file does not change between mounts of the
+                * filesystem.
+                */
+               if (r->cdp_capable && !resctrl_arch_get_cdp_enabled(r->rid))
+                       cl += 4;
+
+               if (cl > max_name_width)
+                       max_name_width = cl;
+
                INIT_LIST_HEAD(&s->list);
                list_add(&s->list, &resctrl_schema_all);
        }
@@ -2784,7 +2805,7 @@ static int __init_one_rdt_domain(struct rdt_domain *d, struct resctrl_schema *s,
         */
        tmp_cbm = d->new_ctrl;
        if (bitmap_weight(&tmp_cbm, r->cache.cbm_len) < r->cache.min_cbm_bits) {
-               rdt_last_cmd_printf("No space on %s:%d\n", r->name, d->id);
+               rdt_last_cmd_printf("No space on %s:%d\n", s->name, d->id);
                return -ENOSPC;
        }
        d->have_new_ctrl = true;

diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h
index 4b30571fbc8ed3da1f96dd529aa33b476533aa90..e482ce790ce28a66d148417a5bd42220f8573d29 100644 (file)
--- a/include/linux/resctrl.h
+++ b/include/linux/resctrl.h
@@ -171,6 +171,7 @@ struct rdt_resource {
  * struct resctrl_schema - configuration abilities of a resource presented to
  *                        user-space
  * @list:      Member of resctrl_schema_all.
+ * @name:      The name to use in the "schemata" file.
  * @conf_type: Whether this schema is specific to code/data.
  * @res:       The resource structure exported by the architecture to describe
  *             the hardware that is configured by this schema.
@@ -180,6 +181,7 @@ struct rdt_resource {
  */
 struct resctrl_schema {
        struct list_head                list;
+       char                            name[8];
        enum resctrl_conf_type          conf_type;
        struct rdt_resource             *res;
        u32                             num_closid;