From: Wang ShaoBo bobo.shaobowang@huawei.com
hulk inclusion category: feature bugzilla: 34278 CVE: NA
-------------------------------------------------
schemata labels each row with hw_closid, which can be parsed into closid according to fixed rules (LxCODE and MBA are given closid, LxDATA is given to closid + 1), so the maximum number of rdtgroup can be created is also restricted by half if cdp enabled.
The length of Lx Cache domains displayed in schemata is compressed, this is because for specified hardware platform, domains of each resource may be too many to be easily operated for user interaction.
This patch also move parse_cbm() and parse_bw() to mpam_resctrl.c for clarity.
Signed-off-by: Wang ShaoBo bobo.shaobowang@huawei.com Reviewed-by: Xiongfeng Wang wangxiongfeng2@huawei.com Reviewed-by: Cheng Jian cj.chengjian@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com Signed-off-by: Cheng Jian cj.chengjian@huawei.com --- arch/arm64/include/asm/mpam.h | 7 +- arch/arm64/kernel/mpam/mpam_ctrlmon.c | 237 +++++++++----------------- arch/arm64/kernel/mpam/mpam_resctrl.c | 118 ++++++++++++- 3 files changed, 202 insertions(+), 160 deletions(-)
diff --git a/arch/arm64/include/asm/mpam.h b/arch/arm64/include/asm/mpam.h index 6a90cc9661a2..b0bab6153db8 100644 --- a/arch/arm64/include/asm/mpam.h +++ b/arch/arm64/include/asm/mpam.h @@ -251,6 +251,8 @@ struct rdt_domain { struct resctrl_staged_config staged_cfg[CDP_NUM_CONF_TYPE]; };
+#define RESCTRL_SHOW_DOM_MAX_NUM 8 + extern struct mutex resctrl_group_mutex;
extern struct resctrl_resource resctrl_resources_all[]; @@ -336,16 +338,13 @@ struct raw_resctrl_resource { int data_width; const char *format_str; int (*parse_ctrlval)(char *buf, struct raw_resctrl_resource *r, - struct rdt_domain *d); + struct resctrl_staged_config *cfg, hw_closid_t closid);
u16 num_mon; u64 (*mon_read)(struct rdt_domain *d, struct rdtgroup *g); int (*mon_write)(struct rdt_domain *d, struct rdtgroup *g, bool enable); };
-int parse_cbm(char *buf, struct raw_resctrl_resource *r, struct rdt_domain *d); -int parse_bw(char *buf, struct raw_resctrl_resource *r, struct rdt_domain *d); - union mon_data_bits { void *priv; struct { diff --git a/arch/arm64/kernel/mpam/mpam_ctrlmon.c b/arch/arm64/kernel/mpam/mpam_ctrlmon.c index acb4696d48b1..f04b90667095 100644 --- a/arch/arm64/kernel/mpam/mpam_ctrlmon.c +++ b/arch/arm64/kernel/mpam/mpam_ctrlmon.c @@ -149,124 +149,21 @@ static int resctrl_group_update_domains(struct rdtgroup *rdtgrp, return 0; }
-/* - * Check whether a cache bit mask is valid. The SDM says: - * Please note that all (and only) contiguous '1' combinations - * are allowed (e.g. FFFFH, 0FF0H, 003CH, etc.). - * Additionally Haswell requires at least two bits set. - */ -static bool cbm_validate(char *buf, unsigned long *data, struct raw_resctrl_resource *r) -{ - u64 val; - int ret; - - ret = kstrtou64(buf, 16, &val); - if (ret) { - rdt_last_cmd_printf("non-hex character in mask %s\n", buf); - return false; - } - - *data = val; - return true; -} - -/* - * Read one cache bit mask (hex). Check that it is valid for the current - * resource type. - */ -int parse_cbm(char *buf, struct raw_resctrl_resource *r, struct rdt_domain *d) -{ - unsigned long data; - - if (d->have_new_ctrl) { - rdt_last_cmd_printf("duplicate domain %d\n", d->id); - return -EINVAL; - } - - if (!cbm_validate(buf, &data, r)) - return -EINVAL; - - d->new_ctrl = data; - d->have_new_ctrl = true; - - return 0; -} - -/* define bw_min as 5 percentage, that are 5% ~ 100% which cresponding masks: */ -static u32 bw_max_mask[20] = { - 3, /* 3/64: 5% */ - 6, /* 6/64: 10% */ - 10, /* 10/64: 15% */ - 13, /* 13/64: 20% */ - 16, /* 16/64: 25% */ - 19, /* ... */ - 22, - 26, - 29, - 32, - 35, - 38, - 42, - 45, - 48, - 51, - 54, - 58, - 61, - 63 /* 100% */ -}; - -static bool bw_validate(char *buf, unsigned long *data, struct raw_resctrl_resource *r) -{ - unsigned long bw; - int ret, idx; - - ret = kstrtoul(buf, 10, &bw); - if (ret) { - rdt_last_cmd_printf("non-hex character in mask %s\n", buf); - return false; - } - - bw = bw < 5 ? 5 : bw; - bw = bw > 100 ? 100 : bw; - - idx = roundup(bw, 5) / 5 - 1; - - *data = bw_max_mask[idx]; - return true; -} - -int parse_bw(char *buf, struct raw_resctrl_resource *r, struct rdt_domain *d) -{ - unsigned long data; - - if (d->have_new_ctrl) { - rdt_last_cmd_printf("duplicate domain %d\n", d->id); - return -EINVAL; - } - - if (!bw_validate(buf, &data, r)) - return -EINVAL; - - d->new_ctrl = data; - d->have_new_ctrl = true; - - return 0; -} - /* * For each domain in this resource we expect to find a series of: * id=mask * separated by ";". The "id" is in decimal, and must match one of * the "id"s for this resource. */ -static int parse_line(char *line, struct resctrl_resource *r) +static int parse_line(char *line, struct resctrl_resource *r, + enum resctrl_conf_type t, u32 closid) { - struct raw_resctrl_resource *rr = (struct raw_resctrl_resource *)r->res; - char *dom = NULL, *id; + struct raw_resctrl_resource *rr = r->res; + char *dom = NULL; + char *id; struct rdt_domain *d; unsigned long dom_id; - + hw_closid_t hw_closid;
next: if (!line || line[0] == '\0') @@ -280,7 +177,8 @@ static int parse_line(char *line, struct resctrl_resource *r) dom = strim(dom); list_for_each_entry(d, &r->domains, list) { if (d->id == dom_id) { - if (rr->parse_ctrlval(dom, (struct raw_resctrl_resource *)&r->res, d)) + resctrl_cdp_map(clos, closid, t, hw_closid); + if (rr->parse_ctrlval(dom, rr, &d->staged_cfg[t], hw_closid)) return -EINVAL; goto next; } @@ -288,40 +186,29 @@ static int parse_line(char *line, struct resctrl_resource *r) return -EINVAL; }
-static int update_domains(struct resctrl_resource *r, struct rdtgroup *g) +static int +resctrl_group_parse_schema_resource(char *resname, char *tok, u32 closid) { - struct raw_resctrl_resource *rr; - struct rdt_domain *d; - int partid = g->closid; - - rr = (struct raw_resctrl_resource *)r->res; - list_for_each_entry(d, &r->domains, list) { - if (d->have_new_ctrl && d->new_ctrl != d->ctrl_val[partid]) { - d->ctrl_val[partid] = d->new_ctrl; - rr->msr_update(r, d, NULL, partid); - } - } - - return 0; -} - -static int resctrl_group_parse_resource(char *resname, char *tok, int closid) -{ - struct mpam_resctrl_res *res; struct resctrl_resource *r; - struct raw_resctrl_resource *rr; + struct resctrl_schema *s; + enum resctrl_conf_type t;
- for_each_supported_resctrl_exports(res) { - r = &res->resctrl_res; + list_for_each_entry(s, &resctrl_all_schema, list) { + r = s->res; + + if (!r) + continue;
if (r->alloc_enabled) { - rr = (struct raw_resctrl_resource *)r->res; - if (!strcmp(resname, r->name) && closid < - mpam_sysprops_num_partid()) - return parse_line(tok, r); + if (!strcmp(resname, s->name) && + closid < mpam_sysprops_num_partid()) { + t = conf_name_to_conf_type(s->name); + return parse_line(tok, r, t, closid); + } } } rdt_last_cmd_printf("unknown/unsupported resource name '%s'\n", resname); + return -EINVAL; }
@@ -330,10 +217,13 @@ ssize_t resctrl_group_schemata_write(struct kernfs_open_file *of, { struct rdtgroup *rdtgrp; struct rdt_domain *dom; - struct mpam_resctrl_res *res; struct resctrl_resource *r; + struct mpam_resctrl_res *res; + enum resctrl_conf_type conf_type; + struct resctrl_staged_config *cfg; char *tok, *resname; - int closid, ret = 0; + u32 closid; + int ret = 0;
/* Valid input requires a trailing newline */ if (nbytes == 0 || buf[nbytes - 1] != '\n') @@ -345,6 +235,7 @@ ssize_t resctrl_group_schemata_write(struct kernfs_open_file *of, resctrl_group_kn_unlock(of->kn); return -ENOENT; } + rdt_last_cmd_clear();
closid = rdtgrp->closid; @@ -353,8 +244,13 @@ ssize_t resctrl_group_schemata_write(struct kernfs_open_file *of, r = &res->resctrl_res;
if (r->alloc_enabled) { - list_for_each_entry(dom, &r->domains, list) + list_for_each_entry(dom, &r->domains, list) { dom->have_new_ctrl = false; + for_each_conf_type(conf_type) { + cfg = &dom->staged_cfg[conf_type]; + cfg->have_new_ctrl = false; + } + } } }
@@ -370,16 +266,15 @@ ssize_t resctrl_group_schemata_write(struct kernfs_open_file *of, ret = -EINVAL; goto out; } - ret = resctrl_group_parse_resource(resname, tok, closid); + ret = resctrl_group_parse_schema_resource(resname, tok, closid); if (ret) goto out; }
for_each_supported_resctrl_exports(res) { r = &res->resctrl_res; - if (r->alloc_enabled) { - ret = update_domains(r, rdtgrp); + ret = resctrl_group_update_domains(rdtgrp, r); if (ret) goto out; } @@ -390,42 +285,73 @@ ssize_t resctrl_group_schemata_write(struct kernfs_open_file *of, return ret ?: nbytes; }
-static void show_doms(struct seq_file *s, struct resctrl_resource *r, int partid) +/** + * MPAM resources such as L2 may have too many domains for arm64, + * at this time we should rearrange this display for brevity and + * harmonious interaction. + * + * Before rearrangement: L2:0=ff;1=ff;2=fc;3=ff;4=f;....;255=ff + * After rearrangement: L2:S;2=fc;S;4=f;S + * Those continuous fully sharable domains will be combined into + * a single "S" simply. + */ +static void show_doms(struct seq_file *s, struct resctrl_resource *r, + char *schema_name, int partid) { - struct raw_resctrl_resource *rr = (struct raw_resctrl_resource *)r->res; + struct raw_resctrl_resource *rr = r->res; struct rdt_domain *dom; bool sep = false; + bool rg = false; + bool prev_auto_fill = false; + u32 reg_val; + + if (r->dom_num > RESCTRL_SHOW_DOM_MAX_NUM) + rg = true;
- 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) { + reg_val = rr->msr_read(dom, partid); + + if (rg && reg_val == r->default_ctrl && + prev_auto_fill == true) + continue; + if (sep) seq_puts(s, ";"); - seq_printf(s, rr->format_str, dom->id, max_data_width, - rr->msr_read(dom, partid)); + if (rg && reg_val == r->default_ctrl) { + prev_auto_fill = true; + seq_puts(s, "S"); + } else { + seq_printf(s, rr->format_str, dom->id, + max_data_width, reg_val); + } sep = true; } seq_puts(s, "\n"); }
int resctrl_group_schemata_show(struct kernfs_open_file *of, - struct seq_file *s, void *v) + struct seq_file *s, void *v) { struct rdtgroup *rdtgrp; - struct mpam_resctrl_res *res; struct resctrl_resource *r; - struct raw_resctrl_resource *rr; + struct resctrl_schema *rs; int ret = 0; + hw_closid_t hw_closid; u32 partid;
rdtgrp = resctrl_group_kn_lock_live(of->kn); if (rdtgrp) { - partid = rdtgrp->closid; - for_each_supported_resctrl_exports(res) { - r = &res->resctrl_res; + list_for_each_entry(rs, &resctrl_all_schema, list) { + r = rs->res; + if (!r) + continue; if (r->alloc_enabled) { - rr = (struct raw_resctrl_resource *)r->res; + resctrl_cdp_map(clos, rdtgrp->closid, + rs->conf_type, hw_closid); + partid = hw_closid_val(hw_closid); if (partid < mpam_sysprops_num_partid()) - show_doms(s, r, partid); + show_doms(s, r, rs->name, partid); } } } else { @@ -711,6 +637,7 @@ int resctrl_mkdir_ctrlmon_mondata(struct kernfs_node *parent_kn, rdt_last_cmd_puts("kernfs subdir error\n"); free_mon(ret); } + return ret; }
diff --git a/arch/arm64/kernel/mpam/mpam_resctrl.c b/arch/arm64/kernel/mpam/mpam_resctrl.c index aa7a3d1402ec..2508bf666742 100644 --- a/arch/arm64/kernel/mpam/mpam_resctrl.c +++ b/arch/arm64/kernel/mpam/mpam_resctrl.c @@ -133,6 +133,11 @@ static inline bool is_mon_dyn(u32 mon) return (mon == mpam_resctrl_max_mon_num()) ? true : false; }
+static int parse_cbm(char *buf, struct raw_resctrl_resource *r, + struct resctrl_staged_config *cfg, hw_closid_t hw_closid); +static int parse_bw(char *buf, struct raw_resctrl_resource *r, + struct resctrl_staged_config *cfg, hw_closid_t hw_closid); + struct raw_resctrl_resource raw_resctrl_resources_all[] = { [RDT_RESOURCE_L3] = { .msr_update = common_wrmsr, @@ -169,6 +174,116 @@ mpam_get_raw_resctrl_resource(enum resctrl_resource_level level) return &raw_resctrl_resources_all[level]; }
+/* + * Check whether a cache bit mask is valid. for arm64 MPAM, + * it seems that there are no restrictions according to MPAM + * spec expect for requiring at least one bit. + */ +static bool cbm_validate(char *buf, unsigned long *data, + struct raw_resctrl_resource *r) +{ + u64 val; + int ret; + + ret = kstrtou64(buf, 16, &val); + if (ret) { + rdt_last_cmd_printf("non-hex character in mask %s\n", buf); + return false; + } + + *data = val; + return true; +} + +/* + * Read one cache bit mask (hex). Check that it is valid for the current + * resource type. + */ +static int +parse_cbm(char *buf, struct raw_resctrl_resource *r, + struct resctrl_staged_config *cfg, hw_closid_t hw_closid) +{ + unsigned long data; + + if (cfg->have_new_ctrl) { + rdt_last_cmd_printf("duplicate domain\n"); + return -EINVAL; + } + + if (!cbm_validate(buf, &data, r)) + return -EINVAL; + + cfg->new_ctrl = data; + cfg->have_new_ctrl = true; + cfg->hw_closid = hw_closid; + + return 0; +} + +/* define bw_min as 5 percentage, that are 5% ~ 100% which cresponding masks: */ +static u32 bw_max_mask[20] = { + 3, /* 3/64: 5% */ + 6, /* 6/64: 10% */ + 10, /* 10/64: 15% */ + 13, /* 13/64: 20% */ + 16, /* 16/64: 25% */ + 19, /* ... */ + 22, + 26, + 29, + 32, + 35, + 38, + 42, + 45, + 48, + 51, + 54, + 58, + 61, + 63 /* 100% */ +}; + +static bool bw_validate(char *buf, unsigned long *data, + struct raw_resctrl_resource *r) +{ + unsigned long bw; + int ret; + + ret = kstrtoul(buf, 10, &bw); + if (ret) { + rdt_last_cmd_printf("non-hex character in mask %s\n", buf); + return false; + } + + bw = bw < 5 ? 5 : bw; + bw = bw > 100 ? 100 : bw; + *data = roundup(bw, 5); + + return true; +} + +static int +parse_bw(char *buf, struct raw_resctrl_resource *r, + struct resctrl_staged_config *cfg, hw_closid_t hw_closid) +{ + unsigned long data; + + if (cfg->have_new_ctrl) { + rdt_last_cmd_printf("duplicate domain\n"); + return -EINVAL; + } + + if (!bw_validate(buf, &data, r)) + return -EINVAL; + + cfg->new_ctrl = data; + cfg->have_new_ctrl = true; + cfg->hw_closid = hw_closid; + + return 0; +} + static void common_wrmsr(struct resctrl_resource *r, struct rdt_domain *d, struct list_head *opt_list, int partid) @@ -1307,7 +1422,8 @@ mpam_update_from_resctrl_cfg(struct mpam_resctrl_res *res, mpam_set_feature(mpam_feat_mbw_part, &mpam_cfg->valid); } else { /* .. the number of fractions we can represent */ - mpam_cfg->mbw_max = resctrl_cfg; + mpam_cfg->mbw_max = bw_max_mask[(resctrl_cfg / 5 - 1) % + ARRAY_SIZE(bw_max_mask)];
mpam_set_feature(mpam_feat_mbw_max, &mpam_cfg->valid); }