From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 0f4c524c39b330a55fc4d9f5a368b43a0fb6e937 openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/include/asm/resctrl.h | 2 ++ arch/arm64/kernel/mpam.c | 2 ++ arch/arm64/kernel/mpam_ctrlmon.c | 60 ++++++++++++++++++++++++++++---- arch/arm64/kernel/mpam_mon.c | 13 ++++++- 4 files changed, 69 insertions(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/resctrl.h b/arch/arm64/include/asm/resctrl.h index ffebafa85839..0a0a12b17ab3 100644 --- a/arch/arm64/include/asm/resctrl.h +++ b/arch/arm64/include/asm/resctrl.h @@ -55,6 +55,8 @@ int resctrl_group_schemata_show(struct kernfs_open_file *of, r < resctrl_resources_all + MPAM_NUM_RESOURCES; \ r++) \ +int mpam_get_mon_config(struct resctrl_resource *r); + int mkdir_mondata_all(struct kernfs_node *parent_kn, struct resctrl_group *prgrp, struct kernfs_node **dest_kn); diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index 56188953f954..eeed3b63da4f 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -338,6 +338,8 @@ static __init bool get_rdt_mon_resources(void) { bool ret = true; + mpam_get_mon_config(&resctrl_resources_all[MPAM_RESOURCE_CACHE]); + mpam_get_mon_config(&resctrl_resources_all[MPAM_RESOURCE_MC]); return ret; } diff --git a/arch/arm64/kernel/mpam_ctrlmon.c b/arch/arm64/kernel/mpam_ctrlmon.c index 78bc26272340..8d93da01d5b5 100644 --- a/arch/arm64/kernel/mpam_ctrlmon.c +++ b/arch/arm64/kernel/mpam_ctrlmon.c @@ -256,7 +256,7 @@ int resctrl_group_schemata_show(struct kernfs_open_file *of, * use pmg as monitor id * just use match_pardid only. */ -static u64 mbwu_read(struct rdt_domain *d, struct rdtgroup *g) +static inline u64 mbwu_read(struct rdt_domain *d, struct rdtgroup *g) { u32 pmg = g->mon.rmid; @@ -264,7 +264,7 @@ static u64 mbwu_read(struct rdt_domain *d, struct rdtgroup *g) return mpam_readl(d->base + MSMON_MBWU); } -static u64 csu_read(struct rdt_domain *d, struct rdtgroup *g) +static inline u64 csu_read(struct rdt_domain *d, struct rdtgroup *g) { u32 pmg = g->mon.rmid; @@ -272,23 +272,66 @@ static u64 csu_read(struct rdt_domain *d, struct rdtgroup *g) return mpam_readl(d->base + MSMON_CSU); } +static inline char *kernfs_node_name(struct kernfs_open_file *of) +{ + return (char *)(of ? of->kn->name : NULL); +} + +static inline void put_resource_name(char *res) +{ + kfree(res); +} + +/* + * pick resource name from mon data name + * eg. from mon_L3_01 we got L3 + * */ +static inline char *get_resource_name(char *name) +{ + char *s, *p, *res; + + if (!name) + return NULL; + + s = name + 4; /* skip "mon_" prefix */ + p = strrchr(name, '_'); + res = kmemdup_nul(s, p - s, GFP_KERNEL); + if (!res) + res = NULL; + + return res; +} + int resctrl_group_mondata_show(struct seq_file *m, void *arg) { struct kernfs_open_file *of = m->private; struct rdtgroup *rdtgrp; struct rdt_domain *d; int ret = 0; + char *resname = get_resource_name(kernfs_node_name(of)); + + if (!resname) + return -ENOMEM; rdtgrp = resctrl_group_kn_lock_live(of->kn); d = of->kn->priv; + if (rdtgrp) /* for debug */ - seq_printf(m, "group: partid: %d, pmg: %d", - rdtgrp->closid, rdtgrp->mon.rmid); + seq_printf(m, "resource: %s, group: partid: %d, pmg: %d\n", + resname, rdtgrp->closid, rdtgrp->mon.rmid); + else + seq_printf(m, "resource: %s: need partid and pmg here\n", + resname); + + if (d) + seq_printf(m, "domain: id %d: cpu_list %s, base %016llx\n", + d->id, d->cpus_list, (u64)d->base); /* show monitor data */ + put_resource_name(resname); resctrl_group_kn_unlock(of->kn); return ret; } @@ -342,10 +385,9 @@ static int mkdir_mondata_subdir(struct kernfs_node *parent_kn, #if 1 struct kernfs_node *kn; char name[32]; - int ret; + int ret = 0; sprintf(name, "mon_%s_%02d", r->name, d->id); - kn = __kernfs_create_file(parent_kn, name, 0444, GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, 0, &kf_mondata_ops, d, NULL, NULL); @@ -354,6 +396,7 @@ static int mkdir_mondata_subdir(struct kernfs_node *parent_kn, ret = resctrl_group_kn_set_ugid(kn); if (ret) { + pr_info("%s: create name %s, error ret %d\n", __func__, name, ret); kernfs_remove(kn); return ret; } @@ -442,10 +485,13 @@ mongroup_create_dir(struct kernfs_node *parent_kn, struct resctrl_group *prgrp, struct kernfs_node *kn; int ret; + pr_info("%s: create dir %s\n", __func__, name); /* create the directory */ kn = kernfs_create_dir(parent_kn, name, parent_kn->mode, prgrp); - if (IS_ERR(kn)) + if (IS_ERR(kn)) { + pr_info("%s: create dir %s, error\n", __func__, name); return PTR_ERR(kn); + } if (dest_kn) *dest_kn = kn; diff --git a/arch/arm64/kernel/mpam_mon.c b/arch/arm64/kernel/mpam_mon.c index ebf8980e072b..503d97da82ad 100644 --- a/arch/arm64/kernel/mpam_mon.c +++ b/arch/arm64/kernel/mpam_mon.c @@ -51,8 +51,11 @@ int alloc_pmg(void) { u32 pmg = ffs(pmg_free_map); - if (pmg == 0) + if (pmg == 0) { + pr_info("%s: no pmg available\n"); return -ENOSPC; + } + pmg--; pmg_free_map &= ~(1 << pmg); @@ -79,3 +82,11 @@ void free_rmid(u32 pmg) { free_pmg(pmg); } + +int mpam_get_mon_config(struct resctrl_resource *r) +{ + r->mon_capable = true; + r->mon_enabled = true; + + return 0; +} -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit f2a58a19ec564be358b5010cba28417e8115cff2 openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/kernel/mpam.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index eeed3b63da4f..5883b9b2fedb 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -822,8 +822,9 @@ static void show_resctrl_tasks(struct rdtgroup *r, struct seq_file *s) for_each_process_thread(p, t) { if ((r->type == RDTCTRL_GROUP && t->closid == r->closid) || (r->type == RDTMON_GROUP && t->rmid == r->mon.rmid)) - seq_printf(s, "%d: partid = %d, pmg = %d\n", - t->pid, t->closid, t->rmid); + seq_printf(s, "%d: partid = %d, pmg = %d, (group: partid %d, pmg %d)\n", + t->pid, t->closid, t->rmid, + r->closid, r->mon.rmid); } rcu_read_unlock(); } -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 594105ff55056b64db305e59019da273fe8677aa openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/include/asm/mpam.h | 4 ++++ arch/arm64/kernel/mpam.c | 28 +++++++++++++++++++++++++ arch/arm64/kernel/mpam_ctrlmon.c | 36 +++++++++++++------------------- 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/arch/arm64/include/asm/mpam.h b/arch/arm64/include/asm/mpam.h index 8dc8f24e879b..f9f1a961db57 100644 --- a/arch/arm64/include/asm/mpam.h +++ b/arch/arm64/include/asm/mpam.h @@ -328,6 +328,7 @@ struct raw_resctrl_resource { int (*parse_ctrlval) (char *buf, struct raw_resctrl_resource *r, struct rdt_domain *d); int num_pmg; + u64 (*mon_read) (struct rdt_domain *d, struct rdtgroup *g); }; int parse_cbm(char *buf, struct raw_resctrl_resource *r, struct rdt_domain *d); @@ -342,4 +343,7 @@ union mon_data_bits { } u; }; +struct rdt_domain *mpam_find_domain(struct resctrl_resource *r, int id, + struct list_head **pos); + #endif /* _ASM_ARM64_MPAM_H */ diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index 5883b9b2fedb..eb488ab407eb 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -165,6 +165,9 @@ bw_wrmsr(struct rdt_domain *d, int partid); u64 cat_rdmsr(struct rdt_domain *d, int partid); u64 bw_rdmsr(struct rdt_domain *d, int partid); +static u64 mbwu_read(struct rdt_domain *d, struct rdtgroup *g); +static u64 csu_read(struct rdt_domain *d, struct rdtgroup *g); + #define domain_init(id) LIST_HEAD_INIT(resctrl_resources_all[id].domains) struct raw_resctrl_resource raw_resctrl_resources_all[] = { @@ -173,18 +176,21 @@ struct raw_resctrl_resource raw_resctrl_resources_all[] = { .msr_read = cat_rdmsr, .parse_ctrlval = parse_cbm, .format_str = "%d=%0*x", + .mon_read = csu_read, }, [MPAM_RESOURCE_CACHE] = { .msr_update = cat_wrmsr, .msr_read = cat_rdmsr, .parse_ctrlval = parse_cbm, .format_str = "%d=%0*x", + .mon_read = csu_read, }, [MPAM_RESOURCE_MC] = { .msr_update = bw_wrmsr, .msr_read = bw_rdmsr, .parse_ctrlval = parse_cbm, /* [FIXME] add parse_bw() helper */ .format_str = "%d=%0*x", + .mon_read = mbwu_read, }, }; @@ -247,6 +253,28 @@ u64 bw_rdmsr(struct rdt_domain *d, int partid) return MBW_MAX_GET(max); } +/* + * [FIXME] + * use pmg as monitor id + * just use match_pardid only. + */ +static u64 mbwu_read(struct rdt_domain *d, struct rdtgroup *g) +{ + u32 pmg = g->mon.rmid; + + mpam_writel(pmg, d->base + MSMON_CFG_MON_SEL); + return mpam_readl(d->base + MSMON_MBWU); +} + +static u64 csu_read(struct rdt_domain *d, struct rdtgroup *g) +{ + u32 pmg = g->mon.rmid; + + mpam_writel(pmg, d->base + MSMON_CFG_MON_SEL); + return mpam_readl(d->base + MSMON_CSU); +} + + /* * Trivial allocator for CLOSIDs. Since h/w only supports a small number, * we can keep a bitmap of free CLOSIDs in a single integer. diff --git a/arch/arm64/kernel/mpam_ctrlmon.c b/arch/arm64/kernel/mpam_ctrlmon.c index 032313421a98..23ec86c3501d 100644 --- a/arch/arm64/kernel/mpam_ctrlmon.c +++ b/arch/arm64/kernel/mpam_ctrlmon.c @@ -251,27 +251,6 @@ int resctrl_group_schemata_show(struct kernfs_open_file *of, return ret; } -/* - * [FIXME] - * use pmg as monitor id - * just use match_pardid only. - */ -static inline u64 mbwu_read(struct rdt_domain *d, struct rdtgroup *g) -{ - u32 pmg = g->mon.rmid; - - mpam_writel(pmg, d->base + MSMON_CFG_MON_SEL); - return mpam_readl(d->base + MSMON_MBWU); -} - -static inline u64 csu_read(struct rdt_domain *d, struct rdtgroup *g) -{ - u32 pmg = g->mon.rmid; - - mpam_writel(pmg, d->base + MSMON_CFG_MON_SEL); - return mpam_readl(d->base + MSMON_CSU); -} - static inline char *kernfs_node_name(struct kernfs_open_file *of) { return (char *)(of ? of->kn->name : NULL); @@ -306,9 +285,13 @@ int resctrl_group_mondata_show(struct seq_file *m, void *arg) { struct kernfs_open_file *of = m->private; struct rdtgroup *rdtgrp; + struct rdt_domain *d; + struct resctrl_resource *r; + struct raw_resctrl_resource *rr; union mon_data_bits md; int ret = 0; char *resname = get_resource_name(kernfs_node_name(of)); + u64 usage; if (!resname) return -ENOMEM; @@ -330,7 +313,18 @@ int resctrl_group_mondata_show(struct seq_file *m, void *arg) rdtgrp->mon.rmid ); + r = &resctrl_resources_all[md.u.rid]; + rr = r->res; + /* show monitor data */ + d = mpam_find_domain(r, md.u.domid, NULL); + if (IS_ERR(d)) { + pr_warn("Could't find domain id %d\n", md.u.domid); + return -ENOENT; + } + + usage = rr->mon_read(d, rdtgrp); + seq_printf(m, "%llu\n", usage); put_resource_name(resname); resctrl_group_kn_unlock(of->kn); -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 71a5096363780cb9d6bec6fda2d387e37219a4f9 openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/include/asm/mpam_resource.h | 5 +++ arch/arm64/kernel/mpam.c | 44 ++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/mpam_resource.h b/arch/arm64/include/asm/mpam_resource.h index b634209f21a5..efc660974d69 100644 --- a/arch/arm64/include/asm/mpam_resource.h +++ b/arch/arm64/include/asm/mpam_resource.h @@ -49,6 +49,11 @@ #define HAS_MSMON BIT(30) /* MPAMF_IDR */ +#define MPAMF_IDR_PMG_MAX_MASK ((BIT(8) - 1) << 16) +#define MPAMF_IDR_PARTID_MAX_MASK (BIT(16) - 1) +#define MPAMF_IDR_PMG_MAX_GET(v) ((v & MPAMF_IDR_PMG_MAX_MASK) >> 16) +#define MPAMF_IDR_PARTID_MAX_GET(v) (v & MPAMF_IDR_PARTID_MAX_MASK) + /* TODO */ #define CPBM_WD_MASK 0xFFFF diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index adce5d3508e1..542fd7fe8ce6 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -691,8 +691,30 @@ int cpus_ctrl_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask, return 0; } +static int resctrl_num_partid_show(struct kernfs_open_file *of, + struct seq_file *seq, void *v) +{ + struct resctrl_resource *r = of->kn->parent->priv; + struct raw_resctrl_resource *rr = (struct raw_resctrl_resource *)r->res; + + seq_printf(seq, "%d\n", rr->num_partid); + + return 0; +} + +static int resctrl_num_pmg_show(struct kernfs_open_file *of, + struct seq_file *seq, void *v) +{ + struct resctrl_resource *r = of->kn->parent->priv; + struct raw_resctrl_resource *rr = (struct raw_resctrl_resource *)r->res; + + seq_printf(seq, "%d\n", rr->num_pmg); + + return 0; +} + int cpus_mon_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask, - cpumask_var_t tmpmask) + cpumask_var_t tmpmask) { return 0; } @@ -908,6 +930,20 @@ static int resctrl_group_tasks_show(struct kernfs_open_file *of, /* rdtgroup information files for one cache resource. */ static struct rftype res_specific_files[] = { + { + .name = "num_partids", + .mode = 0444, + .kf_ops = &resctrl_group_kf_single_ops, + .seq_show = resctrl_num_partid_show, + .fflags = RF_CTRL_INFO, + }, + { + .name = "num_pmgs", + .mode = 0444, + .kf_ops = &resctrl_group_kf_single_ops, + .seq_show = resctrl_num_pmg_show, + .fflags = RF_MON_INFO, + }, { .name = "last_cmd_status", .mode = 0444, @@ -983,6 +1019,7 @@ static void mpam_domains_init(struct resctrl_resource *r) struct list_head *add_pos = NULL, *l; struct rdt_domain *d; struct raw_resctrl_resource *rr = (struct raw_resctrl_resource *)r->res; + u32 val; char *types[] = {"MPAM_RESOURCE_SMMU", "MPAM_RESOURCE_CACHE", "MPAM_RESOURCE_MC"}; @@ -1015,7 +1052,10 @@ static void mpam_domains_init(struct resctrl_resource *r) d->base = n->base; cpumask_copy(&d->cpu_mask, &n->cpu_mask); rr->default_ctrl = n->default_ctrl; - rr->num_partid = 32; + + val = mpam_readl(d->base + MPAMF_IDR); + rr->num_partid = MPAMF_IDR_PARTID_MAX_GET(val); + rr->num_pmg = MPAMF_IDR_PMG_MAX_GET(val); d->cpus_list = n->cpus_list; -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 6330b3511142934199dfbd9d273e2c5a13c59a23 openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/kernel/mpam.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index b83fd581fca7..4261c64f2a12 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -406,8 +406,10 @@ static __init bool get_rdt_mon_resources(void) static __init bool get_resctrl_resources(void) { - if (!cpus_have_const_cap(ARM64_HAS_MPAM)) + if (!cpus_have_const_cap(ARM64_HAS_MPAM)) { + pr_info("This cpu don't support MPAM feature: pfr0: %016llx\n", read_sysreg_s(SYS_ID_AA64PFR0_EL1)); return false; + } rdt_alloc_capable = get_rdt_alloc_resources(); rdt_mon_capable = get_rdt_mon_resources(); -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 49b25cbf20fb67a0dcedd863246ea6b312f6fd12 openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/include/asm/mpam.h | 18 ++- arch/arm64/kernel/mpam.c | 193 +++++++++++++++++++++++++++---- arch/arm64/kernel/mpam_ctrlmon.c | 47 ++++++-- arch/arm64/kernel/mpam_mon.c | 33 +++++- fs/resctrlfs.c | 10 +- 5 files changed, 268 insertions(+), 33 deletions(-) diff --git a/arch/arm64/include/asm/mpam.h b/arch/arm64/include/asm/mpam.h index b4c7d68b24a4..4b800abe45f9 100644 --- a/arch/arm64/include/asm/mpam.h +++ b/arch/arm64/include/asm/mpam.h @@ -127,12 +127,14 @@ enum rdt_group_type { * @parent: parent rdtgrp * @crdtgrp_list: child rdtgroup node list * @rmid: rmid for this rdtgroup + * @mon: monnitor id */ struct mongroup { struct kernfs_node *mon_data_kn; struct rdtgroup *parent; struct list_head crdtgrp_list; u32 rmid; + u32 mon; int init; }; @@ -164,7 +166,8 @@ struct rdtgroup { extern int max_name_width, max_data_width; /* rdtgroup.flags */ -#define RDT_DELETED 1 +#define RDT_DELETED BIT(0) +#define RDT_CTRLMON BIT(1) /** * struct rdt_domain - group of cpus sharing an RDT resource @@ -327,8 +330,9 @@ struct raw_resctrl_resource { int (*parse_ctrlval) (char *buf, struct raw_resctrl_resource *r, struct rdt_domain *d); int num_pmg; + int num_mon; u64 (*mon_read) (struct rdt_domain *d, struct rdtgroup *g); - int (*mon_write) (struct rdt_domain *d, struct rdtgroup *g, u32 match); + 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); @@ -346,4 +350,14 @@ union mon_data_bits { struct rdt_domain *mpam_find_domain(struct resctrl_resource *r, int id, struct list_head **pos); +int resctrl_group_alloc_mon(struct rdtgroup *grp); + +void mon_init(void); +int alloc_mon(void); +void free_mon(u32 mon); + +int resctrl_mkdir_ctrlmon_mondata(struct kernfs_node *parent_kn, + struct rdtgroup *prgrp, + struct kernfs_node **dest_kn); + #endif /* _ASM_ARM64_MPAM_H */ diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index 4261c64f2a12..c172a41488b7 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -168,8 +168,8 @@ u64 bw_rdmsr(struct rdt_domain *d, int partid); static u64 mbwu_read(struct rdt_domain *d, struct rdtgroup *g); static u64 csu_read(struct rdt_domain *d, struct rdtgroup *g); -static int mbwu_write(struct rdt_domain *d, struct rdtgroup *g, u32 match); -static int csu_write(struct rdt_domain *d, struct rdtgroup *g, u32 match); +static int mbwu_write(struct rdt_domain *d, struct rdtgroup *g, bool enable); +static int csu_write(struct rdt_domain *d, struct rdtgroup *g, bool enable); #define domain_init(id) LIST_HEAD_INIT(resctrl_resources_all[id].domains) @@ -266,43 +266,55 @@ u64 bw_rdmsr(struct rdt_domain *d, int partid) */ static u64 mbwu_read(struct rdt_domain *d, struct rdtgroup *g) { - u32 pmg = g->mon.rmid; + u32 mon = g->mon.mon; - mpam_writel(pmg, d->base + MSMON_CFG_MON_SEL); + mpam_writel(mon, d->base + MSMON_CFG_MON_SEL); return mpam_readl(d->base + MSMON_MBWU); } static u64 csu_read(struct rdt_domain *d, struct rdtgroup *g) { - u32 pmg = g->mon.rmid; + u32 mon = g->mon.mon; - mpam_writel(pmg, d->base + MSMON_CFG_MON_SEL); + mpam_writel(mon, d->base + MSMON_CFG_MON_SEL); return mpam_readl(d->base + MSMON_CSU); } -static int mbwu_write(struct rdt_domain *d, struct rdtgroup *g, u32 match) +static int mbwu_write(struct rdt_domain *d, struct rdtgroup *g, bool enable) { - u32 pmg = g->mon.rmid; - u32 partid = g->closid; - u32 flt = MSMON_CFG_FLT_SET(pmg, partid); - u32 ctl = MSMON_CFG_MBWU_CTL_SET(match); + u32 mon, pmg, partid, flt, ctl = 0; + + if (enable) { + mon = g->mon.mon; + pmg = g->mon.rmid; + partid = g->closid; + flt = MSMON_CFG_FLT_SET(pmg, partid); + ctl = MSMON_CFG_MBWU_CTL_SET(MSMON_MATCH_PMG|MSMON_MATCH_PARTID); + + mpam_writel(mon, d->base + MSMON_CFG_MON_SEL); + mpam_writel(flt, d->base + MSMON_CFG_MBWU_FLT); + } - mpam_writel(pmg, d->base + MSMON_CFG_MON_SEL); - mpam_writel(flt, d->base + MSMON_CFG_MBWU_FLT); mpam_writel(ctl, d->base + MSMON_CFG_MBWU_CTL); return 0; } -static int csu_write(struct rdt_domain *d, struct rdtgroup *g, u32 match) +static int csu_write(struct rdt_domain *d, struct rdtgroup *g, bool enable) { - u32 pmg = g->mon.rmid; - u32 partid = g->closid; - u32 flt = MSMON_CFG_FLT_SET(pmg, partid); - u32 ctl = MSMON_CFG_CSU_CTL_SET(match); + u32 mon, pmg, partid, flt, ctl = 0; + + if (enable) { + mon = g->mon.mon; + pmg = g->mon.rmid; + partid = g->closid; + flt = MSMON_CFG_FLT_SET(pmg, partid); + ctl = MSMON_CFG_CSU_CTL_SET(MSMON_MATCH_PMG|MSMON_MATCH_PARTID); + + mpam_writel(mon, d->base + MSMON_CFG_MON_SEL); + mpam_writel(flt, d->base + MSMON_CFG_CSU_FLT); + } - mpam_writel(pmg, d->base + MSMON_CFG_MON_SEL); - mpam_writel(flt, d->base + MSMON_CFG_CSU_FLT); mpam_writel(ctl, d->base + MSMON_CFG_CSU_CTL); return 0; @@ -933,6 +945,139 @@ static int resctrl_group_tasks_show(struct kernfs_open_file *of, return ret; } +int resctrl_ctrlmon_enable(struct kernfs_node *parent_kn, + struct resctrl_group *prgrp, + struct kernfs_node **dest_kn) +{ + int ret; + + pr_info("%s: out of monitors: ret %d, MON_GROUP %d\n", + __func__, prgrp->type, RDTMON_GROUP); + /* only for RDTCTRL_GROUP */ + if (prgrp->type == RDTMON_GROUP) + return 0; + + ret = alloc_mon(); + if (ret < 0) { + rdt_last_cmd_puts("out of monitors\n"); + pr_info("out of monitors: ret %d\n", ret); + return ret; + } + prgrp->mon.mon = ret; + prgrp->mon.rmid = 0; + + pr_info("%s: prev dest_kn %016llx, closid %d, flags %d, type %d, rmid %d, mon %d\n", + __func__, (u64)*dest_kn, prgrp->closid, prgrp->flags, prgrp->type, + prgrp->mon.rmid, prgrp->mon.mon); + + ret = mkdir_mondata_all(parent_kn, prgrp, dest_kn); + if (ret) { + rdt_last_cmd_puts("kernfs subdir error\n"); + free_mon(ret); + } + + pr_info("%s: post dest_kn %016llx, closid %d, flags %d, type %d, rmid %d, mon %d\n", + __func__, (u64)*dest_kn, prgrp->closid, prgrp->flags, prgrp->type, + prgrp->mon.rmid, prgrp->mon.mon); + + return ret; +} + +int resctrl_ctrlmon_disable(struct kernfs_node *kn_mondata, + struct resctrl_group *prgrp) +{ + struct resctrl_resource *r; + struct raw_resctrl_resource *rr; + struct rdt_domain *dom; + int ret, mon = prgrp->mon.mon; + + /* only for RDTCTRL_GROUP */ + if (prgrp->type == RDTMON_GROUP) + return 0; + + /* disable monitor before free mon */ + for_each_resctrl_resource(r) { + if (r->mon_enabled) { + rr = (struct raw_resctrl_resource *)r->res; + + list_for_each_entry(dom, &r->domains, list) { + rr->mon_write(dom, prgrp, false); + } + } + } + + free_mon(mon); + + pr_info("%s: prev kn_mondta %016llx, closid %d, flags %d, type %d, rmid %d, mon %d\n", + __func__, (u64)kn_mondata, prgrp->closid, prgrp->flags, prgrp->type, + prgrp->mon.rmid, prgrp->mon.mon); + + kernfs_remove(kn_mondata); + + pr_info("%s: post kn_mondta %016llx, closid %d, flags %d, type %d, rmid %d, mon %d\n", + __func__, (u64)kn_mondata, prgrp->closid, prgrp->flags, prgrp->type, + prgrp->mon.rmid, prgrp->mon.mon); + + return ret; +} + +static ssize_t resctrl_group_ctrlmon_write(struct kernfs_open_file *of, + char *buf, size_t nbytes, loff_t off) +{ + struct rdtgroup *rdtgrp; + int ret = 0; + int ctrlmon; + + if (kstrtoint(strstrip(buf), 0, &ctrlmon) || ctrlmon < 0) + return -EINVAL; + rdtgrp = resctrl_group_kn_lock_live(of->kn); + rdt_last_cmd_clear(); + + pr_info("%s: prev of->kn %016llx, closid %d, flags %d, type %d, rmid %d, mon %d\n", + __func__, (u64)of->kn, rdtgrp->closid, rdtgrp->flags, rdtgrp->type, + rdtgrp->mon.rmid, rdtgrp->mon.mon); + + if (rdtgrp) { + if ((rdtgrp->flags & RDT_CTRLMON) && !ctrlmon) { + /* [FIXME] disable & remove mon_data dir */ + rdtgrp->flags &= ~RDT_CTRLMON; + resctrl_ctrlmon_disable(rdtgrp->mon.mon_data_kn, rdtgrp); + } else if (!(rdtgrp->flags & RDT_CTRLMON) && ctrlmon) { + rdtgrp->flags |= RDT_CTRLMON; + resctrl_ctrlmon_enable(rdtgrp->kn, rdtgrp, + &rdtgrp->mon.mon_data_kn); + } else { + ret = -ENOENT; + } + } else { + ret = -ENOENT; + } + + pr_info("%s: post of->kn %016llx, closid %d, flags %d, type %d, rmid %d, mon %d\n", + __func__, (u64)of->kn, rdtgrp->closid, rdtgrp->flags, rdtgrp->type, + rdtgrp->mon.rmid, rdtgrp->mon.mon); + + resctrl_group_kn_unlock(of->kn); + + return ret ?: nbytes; +} + +static int resctrl_group_ctrlmon_show(struct kernfs_open_file *of, + struct seq_file *s, void *v) +{ + struct rdtgroup *rdtgrp; + int ret = 0; + + rdtgrp = resctrl_group_kn_lock_live(of->kn); + if (rdtgrp) + seq_printf(s, "%d", !!(rdtgrp->flags & RDT_CTRLMON)); + else + ret = -ENOENT; + resctrl_group_kn_unlock(of->kn); + + return ret; +} + /* rdtgroup information files for one cache resource. */ static struct rftype res_specific_files[] = { { @@ -989,6 +1134,14 @@ static struct rftype res_specific_files[] = { .seq_show = resctrl_group_schemata_show, .fflags = RF_CTRL_BASE, }, + { + .name = "ctrlmon", + .mode = 0644, + .kf_ops = &resctrl_group_kf_single_ops, + .write = resctrl_group_ctrlmon_write, + .seq_show = resctrl_group_ctrlmon_show, + .fflags = RF_CTRL_BASE, + }, }; struct rdt_domain *mpam_find_domain(struct resctrl_resource *r, int id, diff --git a/arch/arm64/kernel/mpam_ctrlmon.c b/arch/arm64/kernel/mpam_ctrlmon.c index 70a4b57b4851..1e5b2a2d2cfc 100644 --- a/arch/arm64/kernel/mpam_ctrlmon.c +++ b/arch/arm64/kernel/mpam_ctrlmon.c @@ -128,9 +128,6 @@ static int update_domains(struct resctrl_resource *r, struct rdtgroup *g) d->ctrl_val[partid] = d->new_ctrl; rr->msr_update(d, partid); } - - /* only match partid for monitoring this whole group */ - rr->mon_write(d, g, MSMON_MATCH_PARTID); } return 0; @@ -307,14 +304,15 @@ int resctrl_group_mondata_show(struct seq_file *m, void *arg) } md.priv = of->kn->priv; - pr_info("%s: resname %s, rid %d, domid %d, partid %d, pmg %d, (group: partid %d, pmg %d)\n", + pr_info("%s: resname %s, rid %d, domid %d, partid %d, pmg %d, (group: partid %d, pmg %d, mon %d)\n", __func__, resname, md.u.rid, md.u.domid, md.u.partid, md.u.pmg, rdtgrp->closid, - rdtgrp->mon.rmid + rdtgrp->mon.rmid, + rdtgrp->mon.mon ); r = &resctrl_resources_all[md.u.rid]; @@ -409,9 +407,8 @@ static int mkdir_mondata_subdir(struct kernfs_node *parent_kn, } - /* set mon id for mon_groups */ - if (prgrp->type == RDTMON_GROUP) - rr->mon_write(d, prgrp, MSMON_MATCH_PMG); + /* [FIXME] Could we remove the MATCH_* param ? */ + rr->mon_write(d, prgrp, true); return ret; #if 0 @@ -583,3 +580,37 @@ int mkdir_mondata_all(struct kernfs_node *parent_kn, kernfs_remove(kn); return ret; } + +int resctrl_mkdir_ctrlmon_mondata(struct kernfs_node *parent_kn, + struct resctrl_group *prgrp, + struct kernfs_node **dest_kn) +{ + int ret; + + /* disalbe monitor by default for mpam. */ + if (prgrp->type == RDTCTRL_GROUP) + return 0; + + ret = alloc_mon(); + if (ret < 0) { + rdt_last_cmd_puts("out of monitors\n"); + return ret; + } + prgrp->mon.mon = ret; + + ret = alloc_mon_id(); + if (ret < 0) { + rdt_last_cmd_puts("out of PMGs\n"); + free_mon(prgrp->mon.mon); + return ret; + } + + prgrp->mon.rmid = ret; + + ret = mkdir_mondata_all(parent_kn, prgrp, dest_kn); + if (ret) { + rdt_last_cmd_puts("kernfs subdir error\n"); + free_mon(ret); + } + return ret; +} diff --git a/arch/arm64/kernel/mpam_mon.c b/arch/arm64/kernel/mpam_mon.c index 38fe89268eca..ae946b2ee681 100644 --- a/arch/arm64/kernel/mpam_mon.c +++ b/arch/arm64/kernel/mpam_mon.c @@ -36,11 +36,13 @@ bool rdt_mon_capable; static int pmg_free_map; - +void mon_init(void); void pmg_init(void) { int pmg_max = 16; + mon_init(); + pmg_free_map = BIT_MASK(pmg_max) - 1; /* pmg 0 is always reserved for the default group */ @@ -65,6 +67,35 @@ void free_pmg(u32 pmg) pmg_free_map |= 1 << pmg; } +static int mon_free_map; +void mon_init(void) +{ + // [FIXME] hard code for max mon. + int mon_max = 8; + + mon_free_map = BIT_MASK(mon_max) - 1; + + /* pmg 0 is always reserved for the default group */ + mon_free_map &= ~1; +} + +int alloc_mon(void) +{ + u32 mon = ffs(mon_free_map); + + if (mon == 0) + return -ENOSPC; + + mon--; + mon_free_map &= ~(1 << mon); + + return mon; +} + +void free_mon(u32 mon) +{ + mon_free_map |= 1 << mon; +} /* * As of now the RMIDs allocation is global. diff --git a/fs/resctrlfs.c b/fs/resctrlfs.c index 0ffe8b15f5df..6f5c5f112717 100644 --- a/fs/resctrlfs.c +++ b/fs/resctrlfs.c @@ -554,6 +554,9 @@ static int mkdir_resctrl_prepare(struct kernfs_node *parent_kn, } if (resctrl_mon_capable) { +#ifdef CONFIG_ARM64 + resctrl_mkdir_ctrlmon_mondata(kn, rdtgrp, &rdtgrp->mon.mon_data_kn); +#else ret = alloc_mon_id(); if (ret < 0) { rdt_last_cmd_puts("out of RMIDs\n"); @@ -566,6 +569,7 @@ static int mkdir_resctrl_prepare(struct kernfs_node *parent_kn, rdt_last_cmd_puts("kernfs subdir error\n"); goto out_idfree; } +#endif } kernfs_activate(kn); @@ -574,8 +578,10 @@ static int mkdir_resctrl_prepare(struct kernfs_node *parent_kn, */ return 0; +#ifndef CONFIG_ARM64 out_idfree: free_mon_id(rdtgrp->mon.rmid); +#endif out_destroy: kernfs_remove(rdtgrp->kn); out_free_rgrp: @@ -740,7 +746,7 @@ static void resctrl_group_rm_mon(struct resctrl_group *rdtgrp, cpumask_or(tmpmask, tmpmask, &rdtgrp->cpu_mask); update_closid_rmid(tmpmask, NULL); - rdtgrp->flags = RDT_DELETED; + rdtgrp->flags |= RDT_DELETED; free_mon_id(rdtgrp->mon.rmid); /* @@ -789,7 +795,7 @@ static void resctrl_group_rm_ctrl(struct resctrl_group *rdtgrp, cpumask_var_t tm cpumask_or(tmpmask, tmpmask, &rdtgrp->cpu_mask); update_closid_rmid(tmpmask, NULL); - rdtgrp->flags = RDT_DELETED; + rdtgrp->flags |= RDT_DELETED; resctrl_id_free(rdtgrp->closid); free_mon_id(rdtgrp->mon.rmid); -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 4521ac5c2b7e550d7053a17a1c97a63cc9b72265 openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- fs/resctrlfs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/resctrlfs.c b/fs/resctrlfs.c index 87167893009f..785ff1031ada 100644 --- a/fs/resctrlfs.c +++ b/fs/resctrlfs.c @@ -737,6 +737,10 @@ static void resctrl_group_rm_mon(struct resctrl_group *rdtgrp, struct resctrl_group *prdtgrp = rdtgrp->mon.parent; int cpu; +#ifdef CONFIG_ARM64 /* [FIXME] arch specific code */ + free_mon(rdtgrp->mon.mon); +#endif + /* Give any tasks back to the parent group */ resctrl_move_group_tasks(rdtgrp, prdtgrp, tmpmask); -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit e80ed034915c97dc93eeab047d7ed521bd845137 openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA root@(none)$ pwd /sys/fs/resctrl/info root@(none)$ grep . */* L3/num_partids:32 L3_MON/num_monitors:8 L3_MON/num_pmgs:4 MB/num_partids:16 MB_MON/num_monitors:16 MB_MON/num_pmgs:4 Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/include/asm/mpam_resource.h | 4 ++++ arch/arm64/kernel/mpam.c | 26 ++++++++++++++++++++++++++ arch/arm64/kernel/mpam_ctrlmon.c | 5 +++++ 3 files changed, 35 insertions(+) diff --git a/arch/arm64/include/asm/mpam_resource.h b/arch/arm64/include/asm/mpam_resource.h index efc660974d69..0b442cb96171 100644 --- a/arch/arm64/include/asm/mpam_resource.h +++ b/arch/arm64/include/asm/mpam_resource.h @@ -54,6 +54,10 @@ #define MPAMF_IDR_PMG_MAX_GET(v) ((v & MPAMF_IDR_PMG_MAX_MASK) >> 16) #define MPAMF_IDR_PARTID_MAX_GET(v) (v & MPAMF_IDR_PARTID_MAX_MASK) +/* MPAMF_x_IDR */ +#define NUM_MON_MASK (BIT(16) - 1) +#define MPAMF_IDR_NUM_MON(v) ((v) & NUM_MON_MASK) + /* TODO */ #define CPBM_WD_MASK 0xFFFF diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index c172a41488b7..3884f1320084 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -730,6 +730,17 @@ static int resctrl_num_pmg_show(struct kernfs_open_file *of, return 0; } +static int resctrl_num_mon_show(struct kernfs_open_file *of, + struct seq_file *seq, void *v) +{ + struct resctrl_resource *r = of->kn->parent->priv; + struct raw_resctrl_resource *rr = (struct raw_resctrl_resource *)r->res; + + seq_printf(seq, "%d\n", rr->num_mon); + + return 0; +} + int cpus_mon_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask, cpumask_var_t tmpmask) { @@ -1094,6 +1105,13 @@ static struct rftype res_specific_files[] = { .seq_show = resctrl_num_pmg_show, .fflags = RF_MON_INFO, }, + { + .name = "num_monitors", + .mode = 0444, + .kf_ops = &resctrl_group_kf_single_ops, + .seq_show = resctrl_num_mon_show, + .fflags = RF_MON_INFO, + }, { .name = "last_cmd_status", .mode = 0444, @@ -1215,6 +1233,14 @@ static void mpam_domains_init(struct resctrl_resource *r) rr->num_partid = MPAMF_IDR_PARTID_MAX_GET(val); rr->num_pmg = MPAMF_IDR_PMG_MAX_GET(val); + if (r->rid == MPAM_RESOURCE_CACHE) { + val = mpam_readl(d->base + MPAMF_CSUMON_IDR); + rr->num_mon = MPAMF_IDR_NUM_MON(val); + } else if (r->rid == MPAM_RESOURCE_MC) { + val = mpam_readl(d->base + MPAMF_MBWUMON_IDR); + rr->num_mon = MPAMF_IDR_NUM_MON(val); + } + d->cpus_list = n->cpus_list; d->ctrl_val = kmalloc_array(rr->num_partid, sizeof(*d->ctrl_val), GFP_KERNEL); diff --git a/arch/arm64/kernel/mpam_ctrlmon.c b/arch/arm64/kernel/mpam_ctrlmon.c index 1e5b2a2d2cfc..b6bf0b86c1a4 100644 --- a/arch/arm64/kernel/mpam_ctrlmon.c +++ b/arch/arm64/kernel/mpam_ctrlmon.c @@ -566,6 +566,11 @@ int mkdir_mondata_all(struct kernfs_node *parent_kn, */ for_each_resctrl_resource(r) { if (r->mon_enabled) { + /* HHA does not support monitor by pmg */ + if ((prgrp->type == RDTMON_GROUP) && + (r->rid == MPAM_RESOURCE_MC)) + continue; + ret = mkdir_mondata_subdir_alldom(kn, r, prgrp); if (ret) goto out_destroy; -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit cc5438495b75be42efd1d46ac7949d49d4d9e8f8 openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/kernel/mpam_mon.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/kernel/mpam_mon.c b/arch/arm64/kernel/mpam_mon.c index d976d8613c2c..4e5f64fda50a 100644 --- a/arch/arm64/kernel/mpam_mon.c +++ b/arch/arm64/kernel/mpam_mon.c @@ -87,9 +87,6 @@ void mon_init(void) } mon_free_map = BIT_MASK(num_mon) - 1; - - /* pmg 0 is always reserved for the default group */ - mon_free_map &= ~1; } int alloc_mon(void) -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit ab327e2d0b98757dd16c127697a9d659ddd8488b openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/kernel/mpam.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index 6383c7d60135..d14693e139bb 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -1221,6 +1221,14 @@ static void mpam_domains_init(struct resctrl_resource *r) rr->num_mon = MPAMF_IDR_NUM_MON(val); } + pr_info("%s: type: %s; alloc = %d %d; mon = %d %d\n", + __func__, types[n->type], + r->alloc_capable, + r->alloc_enabled, + r->mon_capable, + r->mon_enabled + ); + d->cpus_list = n->cpus_list; d->ctrl_val = kmalloc_array(rr->num_partid, sizeof(*d->ctrl_val), GFP_KERNEL); -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 5d46645b4e4f3786c083f6d9af0e92f9f87adda2 openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/kernel/mpam.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index 9cc9b2a232a9..260490dad226 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -1283,6 +1283,9 @@ static int __init mpam_late_init(void) if (!cpus_have_const_cap(ARM64_HAS_MPAM)) return -ENODEV; + rdt_alloc_capable = 1; + rdt_mon_capable = 1; + mpam_init_padding(); ret = mpam_nodes_init(); -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 903aa1a596ee1a4122fb24bba206f818cce19399 openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/include/asm/mpam_resource.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/mpam_resource.h b/arch/arm64/include/asm/mpam_resource.h index 4150d706090e..630362eb91b1 100644 --- a/arch/arm64/include/asm/mpam_resource.h +++ b/arch/arm64/include/asm/mpam_resource.h @@ -83,8 +83,8 @@ #define MSMON_CFG_CSU_CTL_SET(m) (BIT(31)|(m)) /* [FIXME] hard code for hardlim */ -#define MBW_MAX_SET(v) (MBW_MAX_HARDLIM|((v) << (15 - BWA_WD))) -#define MBW_MAX_GET(v) (((v) & MBW_MAX_MASK) >> (15 - BWA_WD)) +#define MBW_MAX_SET(v) (MBW_MAX_HARDLIM|((v) << (16 - BWA_WD))) +#define MBW_MAX_GET(v) (((v) & MBW_MAX_MASK) >> (16 - BWA_WD)) /* * emulate the mpam nodes * These should be reported by ACPI MPAM Table. -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 34c0582d2a207eea0bbf740fb67a782c95a452b7 openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/include/asm/mpam.h | 1 + arch/arm64/kernel/mpam.c | 7 ++-- arch/arm64/kernel/mpam_ctrlmon.c | 62 ++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/mpam.h b/arch/arm64/include/asm/mpam.h index 4b800abe45f9..9f6b94ea1ce2 100644 --- a/arch/arm64/include/asm/mpam.h +++ b/arch/arm64/include/asm/mpam.h @@ -336,6 +336,7 @@ struct raw_resctrl_resource { }; 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; diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index a33a01285d81..fc30dcbbeac3 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -207,8 +207,8 @@ struct raw_resctrl_resource raw_resctrl_resources_all[] = { [MPAM_RESOURCE_MC] = { .msr_update = bw_wrmsr, .msr_read = bw_rdmsr, - .parse_ctrlval = parse_cbm, /* [FIXME] add parse_bw() helper */ - .format_str = "%d=%0*x", + .parse_ctrlval = parse_bw, /* [FIXME] add parse_bw() helper */ + .format_str = "%d=%0*d", .mon_read = mbwu_read, .mon_write = mbwu_write, }, @@ -270,7 +270,8 @@ u64 bw_rdmsr(struct rdt_domain *d, int partid) mpam_writel(partid, d->base + MPAMCFG_PART_SEL); max = mpam_readl(d->base + MPAMCFG_MBW_MAX); - return MBW_MAX_GET(max); + max = MBW_MAX_GET(max); + return roundup((max * 100) / 64, 5); } /* diff --git a/arch/arm64/kernel/mpam_ctrlmon.c b/arch/arm64/kernel/mpam_ctrlmon.c index b6bf0b86c1a4..3fa095cfce7e 100644 --- a/arch/arm64/kernel/mpam_ctrlmon.c +++ b/arch/arm64/kernel/mpam_ctrlmon.c @@ -82,6 +82,68 @@ int parse_cbm(char *buf, struct raw_resctrl_resource *r, struct rdt_domain *d) 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 -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit bfc39ac1347a9b74d7cda3470870499507b905bd openEuler-1.0 hulk inclusion category: feature bugzilla: 5510 CVE: NA Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/kernel/mpam.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index fc30dcbbeac3..5324534c521b 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -73,7 +73,7 @@ struct mpam_node mpam_node_all[] = { .name = "L3T0", .type = MPAM_RESOURCE_CACHE, .addr = 0x90390000, - .cpus_list = "0", + .cpus_list = "0-3", .default_ctrl = 0x7fff, }, @@ -82,7 +82,7 @@ struct mpam_node mpam_node_all[] = { .name = "L3T1", .type = MPAM_RESOURCE_CACHE, .addr = 0x903a0000, - .cpus_list = "1", + .cpus_list = "4-7", .default_ctrl = 0x7fff, }, @@ -91,7 +91,7 @@ struct mpam_node mpam_node_all[] = { .name = "L3T2", .type = MPAM_RESOURCE_CACHE, .addr = 0x903b0000, - .cpus_list = "2", + .cpus_list = "8-11", .default_ctrl = 0x7fff, }, @@ -100,16 +100,42 @@ struct mpam_node mpam_node_all[] = { .name = "L3T3", .type = MPAM_RESOURCE_CACHE, .addr = 0x903c0000, - .cpus_list = "3", + .cpus_list = "12-15", .default_ctrl = 0x7fff, }, +#if 0 // run emu we run 6 clusters 24 cores + { + .name = "L3T4", + .type = MPAM_RESOURCE_CACHE, + .addr = 0x903d0000, + .cpus_list = "16-19", + }, + { + .name = "L3T5", + .type = MPAM_RESOURCE_CACHE, + .addr = 0x903e0000, + .cpus_list = "20-23", + }, + { + .name = "L3T6", + .type = MPAM_RESOURCE_CACHE, + .addr = 0x903f0000, + .cpus_list = "24-27", + }, + { + .name = "L3T7", + .type = MPAM_RESOURCE_CACHE, + .addr = 0x90400000, + .cpus_list = "28-31", + }, { .name = "L3TALL", .type = MPAM_RESOURCE_CACHE, .addr = 0x90B90000, - .cpus_list = "0-3", + .cpus_list = "0-23", .default_ctrl = 0x7fff, }, +#endif /* P0 DIE 0: HHA0 */ { @@ -126,7 +152,6 @@ struct mpam_node mpam_node_all[] = { .addr = 0x90420000, .cpus_list = "0-3", }, - { .name = "HHALL", .type = MPAM_RESOURCE_MC, -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 03af0f59e6647af5f9bae3f7fcab2e744f3397af openEuler-1.0 hulk inclusion category: bugfix bugzilla: 9512 CVE: NA Delete redundant line in arch/arm64/kernel/Makefile. No function changed. Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/kernel/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 6bf2389d0648..96a9cfe8a6ad 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -58,7 +58,6 @@ arm64-obj-$(CONFIG_CRASH_CORE) += crash_core.o arm64-obj-$(CONFIG_ARM_SDE_INTERFACE) += sdei.o arm64-obj-$(CONFIG_ARM64_SSBD) += ssbd.o arm64-obj-$(CONFIG_SDEI_WATCHDOG) += watchdog_sdei.o -arm64-obj-$(CONFIG_MPAM) += mpam.o mpam_ctrlmon.o mpam_mon.o arm64-obj-$(CONFIG_MPAM) += mpam.o mpam_ctrlmon.o mpam_mon.o mpam_resource.o obj-y += $(arm64-obj-y) vdso/ probes/ -- 2.31.0

From: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; commit c87a306a34319313fdd6b041b494f3a64104a514 openEuler-1.0 hulk inclusion category: bugfix bugzilla: NA CVE: NA ---------------------------------------- Fix the compile warning fs/resctrlfs.c: In function ‘resctrl_mount’: fs/resctrlfs.c:358:1: warning: label ‘out_mongrp’ defined but not used [-Wunused-label] out_mongrp: Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- fs/resctrlfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/resctrlfs.c b/fs/resctrlfs.c index 6d685371181b..386f49062b28 100644 --- a/fs/resctrlfs.c +++ b/fs/resctrlfs.c @@ -355,8 +355,8 @@ static struct dentry *resctrl_mount(struct file_system_type *fs_type, #ifndef CONFIG_ARM64 /* [FIXME] arch specific code */ if (resctrl_mon_capable) kernfs_remove(kn_mondata); -#endif out_mongrp: +#endif if (resctrl_mon_capable) kernfs_remove(kn_mongrp); out_info: -- 2.31.0

From: Hongbo Yao &lt;yaohongbo(a)huawei.com&gt; commit 9ba320fe8a5cc019cf53bf45a89ae3e123404045 openEuler-1.0 euler inclusion category: bugfix bugzilla: 13254 CVE: NA --------------------------- Two aspects need to change: 1. Change the function "resctrl_ctrlmon_disable" from int to void and delete unuse variable. 2. Change the code that refrences a null return value.Dereferencing "rdtgrp", which is known to be "NULL". Signed-off-by: Hongbo Yao &lt;yaohongbo(a)huawei.com&gt; Reviewed-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/kernel/mpam.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index 623e9f8d6d8e..d18868d0b296 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -946,17 +946,17 @@ int resctrl_ctrlmon_enable(struct kernfs_node *parent_kn, return ret; } -int resctrl_ctrlmon_disable(struct kernfs_node *kn_mondata, +void resctrl_ctrlmon_disable(struct kernfs_node *kn_mondata, struct resctrl_group *prgrp) { struct resctrl_resource *r; struct raw_resctrl_resource *rr; struct rdt_domain *dom; - int ret, mon = prgrp->mon.mon; + int mon = prgrp->mon.mon; /* only for RDTCTRL_GROUP */ if (prgrp->type == RDTMON_GROUP) - return 0; + return; /* disable monitor before free mon */ for_each_resctrl_resource(r) { @@ -981,7 +981,7 @@ int resctrl_ctrlmon_disable(struct kernfs_node *kn_mondata, __func__, (u64)kn_mondata, prgrp->closid, prgrp->flags, prgrp->type, prgrp->mon.rmid, prgrp->mon.mon); - return ret; + return; } static ssize_t resctrl_group_ctrlmon_write(struct kernfs_open_file *of, @@ -996,22 +996,23 @@ static ssize_t resctrl_group_ctrlmon_write(struct kernfs_open_file *of, rdtgrp = resctrl_group_kn_lock_live(of->kn); rdt_last_cmd_clear(); + if (!rdtgrp) { + ret = -ENOENT; + goto unlock; + } + pr_info("%s: prev of->kn %016llx, closid %d, flags %d, type %d, rmid %d, mon %d\n", __func__, (u64)of->kn, rdtgrp->closid, rdtgrp->flags, rdtgrp->type, rdtgrp->mon.rmid, rdtgrp->mon.mon); - if (rdtgrp) { - if ((rdtgrp->flags & RDT_CTRLMON) && !ctrlmon) { - /* [FIXME] disable & remove mon_data dir */ - rdtgrp->flags &= ~RDT_CTRLMON; - resctrl_ctrlmon_disable(rdtgrp->mon.mon_data_kn, rdtgrp); - } else if (!(rdtgrp->flags & RDT_CTRLMON) && ctrlmon) { - rdtgrp->flags |= RDT_CTRLMON; - resctrl_ctrlmon_enable(rdtgrp->kn, rdtgrp, - &rdtgrp->mon.mon_data_kn); - } else { - ret = -ENOENT; - } + if ((rdtgrp->flags & RDT_CTRLMON) && !ctrlmon) { + /* [FIXME] disable & remove mon_data dir */ + rdtgrp->flags &= ~RDT_CTRLMON; + resctrl_ctrlmon_disable(rdtgrp->mon.mon_data_kn, rdtgrp); + } else if (!(rdtgrp->flags & RDT_CTRLMON) && ctrlmon) { + rdtgrp->flags |= RDT_CTRLMON; + resctrl_ctrlmon_enable(rdtgrp->kn, rdtgrp, + &rdtgrp->mon.mon_data_kn); } else { ret = -ENOENT; } @@ -1020,8 +1021,8 @@ static ssize_t resctrl_group_ctrlmon_write(struct kernfs_open_file *of, __func__, (u64)of->kn, rdtgrp->closid, rdtgrp->flags, rdtgrp->type, rdtgrp->mon.rmid, rdtgrp->mon.mon); +unlock: resctrl_group_kn_unlock(of->kn); - return ret ?: nbytes; } -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 3b6b6c44cff2bfc2b2a16b712cd22696bb7064f4 openEuler-1.0 hulk inclusion category: bugfix bugzilla: 14212 CVE: NA The base address is hard code in current version. P1's base address changed from 0x4000xxxxxxxx to 0x200000xxxxxx. We need adjust it, or failed to enable mpam. Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/kernel/mpam.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index eb9e38284bc7..bd94cd31c2fa 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -74,8 +74,8 @@ char *mpam_types_str[] = { * ------------------------------------ * 01 | 0 | P0 TB | 0x000098xxxxxx * 03 | 1 | P0 TA | 0x000090xxxxxx - * 05 | 2 | P1 TB | 0x400098xxxxxx - * 07 | 3 | P2 TA | 0x400090xxxxxx + * 05 | 2 | P1 TB | 0x200098xxxxxx + * 07 | 3 | P2 TA | 0x200090xxxxxx * * AFF2: MPIDR.AFF2 */ @@ -92,13 +92,13 @@ char *mpam_types_str[] = { struct mpam_node mpam_node_all[] = { MPAM_NODE(L3TALL0, MPAM_RESOURCE_CACHE, 0x000098ULL, 0xB9), MPAM_NODE(L3TALL1, MPAM_RESOURCE_CACHE, 0x000090ULL, 0xB9), - MPAM_NODE(L3TALL2, MPAM_RESOURCE_CACHE, 0x400098ULL, 0xB9), - MPAM_NODE(L3TALL3, MPAM_RESOURCE_CACHE, 0x400090ULL, 0xB9), + MPAM_NODE(L3TALL2, MPAM_RESOURCE_CACHE, 0x200098ULL, 0xB9), + MPAM_NODE(L3TALL3, MPAM_RESOURCE_CACHE, 0x200090ULL, 0xB9), MPAM_NODE(HHAALL0, MPAM_RESOURCE_MC, 0x000098ULL, 0xC1), MPAM_NODE(HHAALL1, MPAM_RESOURCE_MC, 0x000090ULL, 0xC1), - MPAM_NODE(HHAALL2, MPAM_RESOURCE_MC, 0x400098ULL, 0xC1), - MPAM_NODE(HHAALL3, MPAM_RESOURCE_MC, 0x400090ULL, 0xC1), + MPAM_NODE(HHAALL2, MPAM_RESOURCE_MC, 0x200098ULL, 0xC1), + MPAM_NODE(HHAALL3, MPAM_RESOURCE_MC, 0x200090ULL, 0xC1), }; int mpam_nodes_init(void) -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit ad4a9b6fb56642d36c76abbeae62dc4e9a66b154 openEuler-1.0 hulk inclusion category: bugfix bugzilla: 14212 CVE: NA Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/kernel/mpam.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index d0b4f6ab70ad..a83b43c9dcaa 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -101,6 +101,21 @@ struct mpam_node mpam_node_all[] = { MPAM_NODE(HHAALL3, MPAM_RESOURCE_MC, 0x200090ULL, 0xC1), }; +void mpam_nodes_unmap(void) +{ + int i; + size_t num_nodes = ARRAY_SIZE(mpam_node_all); + struct mpam_node *n; + + for (i = 0; i < num_nodes; i++) { + n = &mpam_node_all[i]; + if (n->base) { + iounmap(n->base); + n->base = NULL; + } + } +} + int mpam_nodes_init(void) { int i, ret = 0; @@ -111,6 +126,10 @@ int mpam_nodes_init(void) n = &mpam_node_all[i]; ret |= cpulist_parse(n->cpus_list, &n->cpu_mask); n->base = ioremap(n->addr, 0x10000); + if (!n->base) { + mpam_nodes_unmap(); + return -ENOMEM; + } } return ret; -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 940daa14bacddc602a4de4da51ccfb4c3e7c1997 openEuler-1.0 hulk inclusion category: bugfix bugzilla: 14212 CVE: NA We just support L3 & Memory bandwidth on this version, so remove unsported resource type. Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/kernel/mpam.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index c38c13bde995..a9dab7eb7b77 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -172,14 +172,6 @@ static int csu_write(struct rdt_domain *d, struct rdtgroup *g, bool enable); #define domain_init(id) LIST_HEAD_INIT(resctrl_resources_all[id].domains) struct raw_resctrl_resource raw_resctrl_resources_all[] = { - [MPAM_RESOURCE_SMMU] = { - .msr_update = cat_wrmsr, - .msr_read = cat_rdmsr, - .parse_ctrlval = parse_cbm, - .format_str = "%d=%0*x", - .mon_read = csu_read, - .mon_write = csu_write, - }, [MPAM_RESOURCE_CACHE] = { .msr_update = cat_wrmsr, .msr_read = cat_rdmsr, @@ -199,14 +191,6 @@ struct raw_resctrl_resource raw_resctrl_resources_all[] = { }; struct resctrl_resource resctrl_resources_all[] = { - [MPAM_RESOURCE_SMMU] = { - .rid = MPAM_RESOURCE_SMMU, - .name = "SMMU", - .domains = domain_init(MPAM_RESOURCE_SMMU), - .res = &raw_resctrl_resources_all[MPAM_RESOURCE_SMMU], - .fflags = RFTYPE_RES_SMMU, - .alloc_enabled = 1, - }, [MPAM_RESOURCE_CACHE] = { .rid = MPAM_RESOURCE_CACHE, .name = "L3", -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 42778d9f5f82ee51eb3aef8eca610081a4c4cee0 openEuler-1.0 hulk inclusion category: bugfix bugzilla: 14212 CVE: NA Previously hard coded for num of partids, now get them through the system registers. Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/kernel/mpam.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index dae2303b2449..44ba7ea4fda3 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -322,9 +322,17 @@ static int closid_free_map; void closid_init(void) { - int resctrl_min_closid = 32; + struct resctrl_resource *r; + struct raw_resctrl_resource *rr; + int num_closid = INT_MAX; - closid_free_map = BIT_MASK(resctrl_min_closid) - 1; + for_each_resctrl_resource(r) { + if (r->alloc_enabled) { + rr = r->res; + num_closid = min(num_closid, rr->num_partid); + } + } + closid_free_map = BIT_MASK(num_closid) - 1; /* CLOSID 0 is always reserved for the default group */ closid_free_map &= ~1; -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 7f8eab4775417d705a8076fa243457a1427ae5b4 openEuler-1.0 hulk inclusion category: bugfix bugzilla: 14212 CVE: NA Clean up unnecessary debug message, warnings and unused functions. Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/include/asm/mpam.h | 2 - arch/arm64/kernel/Makefile | 2 +- arch/arm64/kernel/mpam.c | 101 ++---------------------------- arch/arm64/kernel/mpam_ctrlmon.c | 26 -------- arch/arm64/kernel/mpam_mon.c | 2 - arch/arm64/kernel/mpam_resource.c | 14 ----- 6 files changed, 7 insertions(+), 140 deletions(-) delete mode 100644 arch/arm64/kernel/mpam_resource.c diff --git a/arch/arm64/include/asm/mpam.h b/arch/arm64/include/asm/mpam.h index 9f6b94ea1ce2..102bdc6bcde9 100644 --- a/arch/arm64/include/asm/mpam.h +++ b/arch/arm64/include/asm/mpam.h @@ -227,8 +227,6 @@ void free_rmid(u32 rmid); int resctrl_group_mondata_show(struct seq_file *m, void *arg); void rmdir_mondata_subdir_allrdtgrp(struct resctrl_resource *r, unsigned int dom_id); -void mkdir_mondata_subdir_allrdtgrp(struct resctrl_resource *r, - struct rdt_domain *d); void closid_init(void); int closid_alloc(void); diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 96a9cfe8a6ad..c6b1ed993891 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -58,7 +58,7 @@ arm64-obj-$(CONFIG_CRASH_CORE) += crash_core.o arm64-obj-$(CONFIG_ARM_SDE_INTERFACE) += sdei.o arm64-obj-$(CONFIG_ARM64_SSBD) += ssbd.o arm64-obj-$(CONFIG_SDEI_WATCHDOG) += watchdog_sdei.o -arm64-obj-$(CONFIG_MPAM) += mpam.o mpam_ctrlmon.o mpam_mon.o mpam_resource.o +arm64-obj-$(CONFIG_MPAM) += mpam.o mpam_ctrlmon.o mpam_mon.o obj-y += $(arm64-obj-y) vdso/ probes/ obj-m += $(arm64-obj-m) diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index 96284aa925b0..b886282756c2 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -135,26 +135,6 @@ int mpam_nodes_init(void) return ret; } -void mpam_nodes_show(void) -{ - int i, cpu; - size_t num_nodes = ARRAY_SIZE(mpam_node_all); - struct mpam_node *n; - - char *types[] = {"MPAM_RESOURCE_SMMU", "MPAM_RESOURCE_CACHE", "MPAM_RESOURCE_MC"}; - - for (i = 0; i < num_nodes; i++) { - n = &mpam_node_all[i]; - pr_cont("%s: type: %s; addr = %016llx; base = %016llx; cpus_list = %s; cpus: ", - __func__, types[n->type], n->addr, (u64)n->base, n->cpus_list); - - for_each_cpu(cpu, &n->cpu_mask) { - pr_cont("%d, ", cpu); - } - pr_cont("\n"); - } -} - static void cat_wrmsr(struct rdt_domain *d, int partid); static void @@ -364,7 +344,6 @@ static int mpam_online_cpu(unsigned int cpu) /* [FIXME] remove related resource when cpu offline */ static int mpam_offline_cpu(unsigned int cpu) { - pr_info("offline cpu\n"); return 0; } @@ -404,7 +383,6 @@ void post_resctrl_mount(void) static int reset_all_ctrls(struct resctrl_resource *r) { - pr_info("%s\n", __func__); return 0; } @@ -425,11 +403,7 @@ void release_rdtgroupfs_options(void) int parse_rdtgroupfs_options(char *data) { - int ret = 0; - - pr_err("Invalid mount option\n"); - - return ret; + return 0; } /* @@ -706,7 +680,8 @@ static int resctrl_num_mon_show(struct kernfs_open_file *of, int cpus_mon_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask, cpumask_var_t tmpmask) { - return 0; + pr_info("unsupported on mon_groups, please use ctrlmon groups\n"); + return -EINVAL; } static ssize_t resctrl_group_cpus_write(struct kernfs_open_file *of, @@ -925,8 +900,6 @@ int resctrl_ctrlmon_enable(struct kernfs_node *parent_kn, { int ret; - pr_info("%s: out of monitors: ret %d, MON_GROUP %d\n", - __func__, prgrp->type, RDTMON_GROUP); /* only for RDTCTRL_GROUP */ if (prgrp->type == RDTMON_GROUP) return 0; @@ -940,20 +913,12 @@ int resctrl_ctrlmon_enable(struct kernfs_node *parent_kn, prgrp->mon.mon = ret; prgrp->mon.rmid = 0; - pr_info("%s: prev dest_kn %016llx, closid %d, flags %d, type %d, rmid %d, mon %d\n", - __func__, (u64)*dest_kn, prgrp->closid, prgrp->flags, prgrp->type, - prgrp->mon.rmid, prgrp->mon.mon); - ret = mkdir_mondata_all(parent_kn, prgrp, dest_kn); if (ret) { rdt_last_cmd_puts("kernfs subdir error\n"); free_mon(ret); } - pr_info("%s: post dest_kn %016llx, closid %d, flags %d, type %d, rmid %d, mon %d\n", - __func__, (u64)*dest_kn, prgrp->closid, prgrp->flags, prgrp->type, - prgrp->mon.rmid, prgrp->mon.mon); - return ret; } @@ -981,17 +946,8 @@ void resctrl_ctrlmon_disable(struct kernfs_node *kn_mondata, } free_mon(mon); - - pr_info("%s: prev kn_mondta %016llx, closid %d, flags %d, type %d, rmid %d, mon %d\n", - __func__, (u64)kn_mondata, prgrp->closid, prgrp->flags, prgrp->type, - prgrp->mon.rmid, prgrp->mon.mon); - kernfs_remove(kn_mondata); - pr_info("%s: post kn_mondta %016llx, closid %d, flags %d, type %d, rmid %d, mon %d\n", - __func__, (u64)kn_mondata, prgrp->closid, prgrp->flags, prgrp->type, - prgrp->mon.rmid, prgrp->mon.mon); - return; } @@ -1012,10 +968,6 @@ static ssize_t resctrl_group_ctrlmon_write(struct kernfs_open_file *of, goto unlock; } - pr_info("%s: prev of->kn %016llx, closid %d, flags %d, type %d, rmid %d, mon %d\n", - __func__, (u64)of->kn, rdtgrp->closid, rdtgrp->flags, rdtgrp->type, - rdtgrp->mon.rmid, rdtgrp->mon.mon); - if ((rdtgrp->flags & RDT_CTRLMON) && !ctrlmon) { /* [FIXME] disable & remove mon_data dir */ rdtgrp->flags &= ~RDT_CTRLMON; @@ -1029,10 +981,6 @@ static ssize_t resctrl_group_ctrlmon_write(struct kernfs_open_file *of, ret = -ENOENT; } - pr_info("%s: post of->kn %016llx, closid %d, flags %d, type %d, rmid %d, mon %d\n", - __func__, (u64)of->kn, rdtgrp->closid, rdtgrp->flags, rdtgrp->type, - rdtgrp->mon.rmid, rdtgrp->mon.mon); - unlock: resctrl_group_kn_unlock(of->kn); return ret ?: nbytes; @@ -1169,33 +1117,23 @@ static void mpam_domains_destroy(struct resctrl_resource *r) static void mpam_domains_init(struct resctrl_resource *r) { - int i, cpu, id = 0; + int i, id = 0; size_t num_nodes = ARRAY_SIZE(mpam_node_all); struct mpam_node *n; - struct list_head *add_pos = NULL, *l; + struct list_head *add_pos = NULL; struct rdt_domain *d; struct raw_resctrl_resource *rr = (struct raw_resctrl_resource *)r->res; u32 val; - char *types[] = {"MPAM_RESOURCE_SMMU", "MPAM_RESOURCE_CACHE", "MPAM_RESOURCE_MC"}; - for (i = 0; i < num_nodes; i++) { n = &mpam_node_all[i]; if (r->rid != n->type) continue; - pr_cont("%s: type: %s; addr = %016llx; base = %016llx; cpus_list = %s; cpus: ", - __func__, types[n->type], n->addr, (u64)n->base, n->cpus_list); - - for_each_cpu(cpu, &n->cpu_mask) { - pr_cont("%d, ", cpu); - } - pr_cont("\n"); - d = mpam_find_domain(r, id, &add_pos); if (IS_ERR(d)) { mpam_domains_destroy(r); - pr_warn("Could't find cache id for cpu %d\n", cpu); + pr_warn("Could't find cache id %d\n", id); return; } @@ -1235,14 +1173,6 @@ static void mpam_domains_init(struct resctrl_resource *r) rr->num_mon = MPAMF_IDR_NUM_MON(val); } - pr_info("%s: type: %s; alloc = %d %d; mon = %d %d\n", - __func__, types[n->type], - r->alloc_capable, - r->alloc_enabled, - r->mon_capable, - r->mon_enabled - ); - r->alloc_capable = 1; r->alloc_enabled = 1; r->mon_capable = 1; @@ -1263,25 +1193,9 @@ static void mpam_domains_init(struct resctrl_resource *r) id++; } - - /* - * for debug - */ - list_for_each(l, &r->domains) { - d = list_entry(l, struct rdt_domain, list); - - pr_cont("domain: %d; type: %s; base = %016llx; cpus_list = %s; cpus: ", - d->id, types[r->rid], (u64)d->base, d->cpus_list); - - for_each_cpu(cpu, &d->cpu_mask) { - pr_cont("%d, ", cpu); - } - pr_cont("\n"); - } } int __read_mostly mpam_enabled; - static int __init mpam_setup(char *str) { mpam_enabled = 1; @@ -1311,9 +1225,6 @@ static int __init mpam_late_init(void) return ret; } - /* for debug */ - mpam_nodes_show(); - mpam_domains_init(&resctrl_resources_all[MPAM_RESOURCE_CACHE]); mpam_domains_init(&resctrl_resources_all[MPAM_RESOURCE_MC]); diff --git a/arch/arm64/kernel/mpam_ctrlmon.c b/arch/arm64/kernel/mpam_ctrlmon.c index 839bd4d76d5a..ae6afc90a256 100644 --- a/arch/arm64/kernel/mpam_ctrlmon.c +++ b/arch/arm64/kernel/mpam_ctrlmon.c @@ -433,32 +433,6 @@ static int mkdir_mondata_subdir(struct kernfs_node *parent_kn, return ret; } -/* - * Add all subdirectories of mon_data for "ctrl_mon" groups - * and "monitor" groups with given domain id. - */ -void mkdir_mondata_subdir_allrdtgrp(struct resctrl_resource *r, - struct rdt_domain *d) -{ - struct kernfs_node *parent_kn; - struct resctrl_group *prgrp, *crgrp; - struct list_head *head; - - if (!r->mon_enabled) - return; - - list_for_each_entry(prgrp, &resctrl_all_groups, resctrl_group_list) { - parent_kn = prgrp->mon.mon_data_kn; - mkdir_mondata_subdir(parent_kn, d, r, prgrp); - - head = &prgrp->mon.crdtgrp_list; - list_for_each_entry(crgrp, head, mon.crdtgrp_list) { - parent_kn = crgrp->mon.mon_data_kn; - mkdir_mondata_subdir(parent_kn, d, r, crgrp); - } - } -} - static int mkdir_mondata_subdir_alldom(struct kernfs_node *parent_kn, struct resctrl_resource *r, struct resctrl_group *prgrp) diff --git a/arch/arm64/kernel/mpam_mon.c b/arch/arm64/kernel/mpam_mon.c index 9bc081635e93..407da95ae927 100644 --- a/arch/arm64/kernel/mpam_mon.c +++ b/arch/arm64/kernel/mpam_mon.c @@ -67,8 +67,6 @@ int alloc_pmg(void) void free_pmg(u32 pmg) { - WARN_ON(!pmg); - pmg_free_map |= 1 << pmg; } diff --git a/arch/arm64/kernel/mpam_resource.c b/arch/arm64/kernel/mpam_resource.c deleted file mode 100644 index 9cdda91ecb67..000000000000 --- a/arch/arm64/kernel/mpam_resource.c +++ /dev/null @@ -1,14 +0,0 @@ -#include <linux/io.h> -#include <linux/module.h> -#include <linux/interrupt.h> -#include <linux/platform_device.h> -#include <linux/delay.h> -#include <linux/of.h> -#include <linux/of_irq.h> -#include <linux/of_address.h> -#include <linux/kthread.h> -#include <linux/resctrlfs.h> - -#include <asm/mpam_resource.h> -#include <asm/mpam.h> - -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 549c5bb273d929955ef0aa74b807294ffb440435 openEuler-1.0 hulk inclusion category: cleanup bugzilla: 14389 CVE: NA Cleanup debuging code for sysreg{read,write}, and {read,write}l. This code is not compiled in current version, and function changed. There is no change for md5 checking: md5sum arch/arm64/kernel/mpam*.o Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/include/asm/mpam.h | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/arch/arm64/include/asm/mpam.h b/arch/arm64/include/asm/mpam.h index 102bdc6bcde9..de00c141065f 100644 --- a/arch/arm64/include/asm/mpam.h +++ b/arch/arm64/include/asm/mpam.h @@ -244,45 +244,10 @@ static inline int __resctrl_group_show_options(struct seq_file *seq) void post_resctrl_mount(void); -#ifdef MPAM_SYS_REG_DEBUG -static inline u64 mpam_read_sysreg_s(u64 reg, char *name) -{ - pr_info("cpu %2d (cur: %s(%d)): read_sysreg_s: %s (addr %016llx)\n", - smp_processor_id(), current->comm, current->pid, name, reg); - return 0; -} -#else #define mpam_read_sysreg_s(reg, name) read_sysreg_s(reg) -#endif - -#ifdef MPAM_SYS_REG_DEBUG -static inline u64 mpam_write_sysreg_s(u64 v, u64 reg, char *name) -{ - pr_info("cpu %2d (cur %s(%d)): write_sysreg_s: %s (addr %016llx), value %016llx\n", - smp_processor_id(), current->comm, current->pid, name, reg, v); - return 0; -} -#else #define mpam_write_sysreg_s(v, r, n) write_sysreg_s(v, r) -#endif - -#ifdef MPAM_SYS_REG_DEBUG -static inline u32 mpam_readl(const volatile void __iomem *addr) -{ - return pr_info("readl: %016llx\n", (u64)addr); -} -#else #define mpam_readl(addr) readl(addr) -#endif - -#ifdef MPAM_SYS_REG_DEBUG -static inline u32 mpam_writel(u64 v, const volatile void __iomem *addr) -{ - return pr_info("writel: %016llx to %016llx\n", v, (u64)addr); -} -#else #define mpam_writel(v, addr) writel(v, addr) -#endif /** * struct msr_param - set a range of MSRs from a domain -- 2.31.0

From: Wang ShaoBo &lt;bobo.shaobowang(a)huawei.com&gt; commit 83d800c00cb54ab782813ada68f73bda14cc97cb openEuler-1.0 hulk inclusion category: bugfix bugzilla: 21073 CVE: NA -------------------------------------------------------------------- MSMON_CFG_MON_SEL should be set when mpam driver attempt to write/read, fix the problem by filling MSMON_CFG_MON_SEL with according mon ID. Signed-off-by: Wang ShaoBo &lt;bobo.shaobowang(a)huawei.com&gt; Reviewed-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/kernel/mpam.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index b886282756c2..07a7dc65c42e 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -247,14 +247,14 @@ static int mbwu_write(struct rdt_domain *d, struct rdtgroup *g, bool enable) { u32 mon, pmg, partid, flt, ctl = 0; + mon = g->mon.mon; + mpam_writel(mon, d->base + MSMON_CFG_MON_SEL); if (enable) { - mon = g->mon.mon; pmg = g->mon.rmid; partid = g->closid; flt = MSMON_CFG_FLT_SET(pmg, partid); ctl = MSMON_CFG_MBWU_CTL_SET(MSMON_MATCH_PMG|MSMON_MATCH_PARTID); - mpam_writel(mon, d->base + MSMON_CFG_MON_SEL); mpam_writel(flt, d->base + MSMON_CFG_MBWU_FLT); } @@ -267,14 +267,14 @@ static int csu_write(struct rdt_domain *d, struct rdtgroup *g, bool enable) { u32 mon, pmg, partid, flt, ctl = 0; + mon = g->mon.mon; + mpam_writel(mon, d->base + MSMON_CFG_MON_SEL); if (enable) { - mon = g->mon.mon; pmg = g->mon.rmid; partid = g->closid; flt = MSMON_CFG_FLT_SET(pmg, partid); ctl = MSMON_CFG_CSU_CTL_SET(MSMON_MATCH_PMG|MSMON_MATCH_PARTID); - mpam_writel(mon, d->base + MSMON_CFG_MON_SEL); mpam_writel(flt, d->base + MSMON_CFG_CSU_FLT); } -- 2.31.0

From: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; commit 2f517747bd295fa801cb283240baf19b96a37299 openEuler-1.0 hulk inclusion category: bugfix bugzilla: 16633 CVE: NA Rewrite the source file's licence of mpam feature. Signed-off-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Reviewed-by: Hanjun Guo &lt;guohanjun(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/include/asm/mpam_resource.h | 3 +-- arch/arm64/include/asm/mpam_sched.h | 1 + arch/arm64/kernel/mpam.c | 20 +++++++++++++------- arch/arm64/kernel/mpam_ctrlmon.c | 19 +++++++++++++------ arch/arm64/kernel/mpam_mon.c | 17 ++++++++++------- fs/resctrlfs.c | 16 +++++++++++----- 6 files changed, 49 insertions(+), 27 deletions(-) diff --git a/arch/arm64/include/asm/mpam_resource.h b/arch/arm64/include/asm/mpam_resource.h index 0ae205d250bc..beadd2c64c31 100644 --- a/arch/arm64/include/asm/mpam_resource.h +++ b/arch/arm64/include/asm/mpam_resource.h @@ -1,5 +1,4 @@ -/* mpam resource: like L3, memory */ - +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_ARM64_MPAM_RESOURCE_H #define _ASM_ARM64_MPAM_RESOURCE_H diff --git a/arch/arm64/include/asm/mpam_sched.h b/arch/arm64/include/asm/mpam_sched.h index 14638793e53e..f0552e6dc9bc 100644 --- a/arch/arm64/include/asm/mpam_sched.h +++ b/arch/arm64/include/asm/mpam_sched.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_ARM64_MPAM_SCHED_H #define _ASM_ARM64_MPAM_SCHED_H diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index 0067e21a65b0..9cd8ebc75872 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -1,13 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ /* - * Resource Director Technology(RDT) - * - Cache Allocation code. + * Common code for ARM v8 MPAM * * Copyright (C) 2016 Intel Corporation + * Copyright (C) 2018-2019 Huawei Technologies Co., Ltd * * Authors: - * Fenghua Yu &lt;fenghua.yu(a)intel.com&gt; - * Tony Luck &lt;tony.luck(a)intel.com&gt; - * Vikas Shivappa &lt;vikas.shivappa(a)intel.com&gt; + * Fenghua Yu &lt;fenghua.yu(a)intel.com&gt; + * Tony Luck &lt;tony.luck(a)intel.com&gt; + * Vikas Shivappa &lt;vikas.shivappa(a)intel.com&gt; + * Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; + * + * Code was partially borrowed from arch/x86/kernel/cpu/intel_rdt*. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -18,8 +22,10 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * - * More information about RDT be found in the Intel (R) x86 Architecture - * Software Developer Manual June 2016, volume 3, section 17.17. + * More information about MPAM be found in the Arm Architecture Reference + * Manual. + * + * https://static.docs.arm.com/ddi0598/a/DDI0598_MPAM_supp_armv8a.pdf */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt diff --git a/arch/arm64/kernel/mpam_ctrlmon.c b/arch/arm64/kernel/mpam_ctrlmon.c index 86e50fd19309..c9d306a93b24 100644 --- a/arch/arm64/kernel/mpam_ctrlmon.c +++ b/arch/arm64/kernel/mpam_ctrlmon.c @@ -1,12 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ /* - * Resource Director Technology(RDT) - * - Cache Allocation code. + * Common code for ARM v8 MPAM + * - allocation and monitor management * * Copyright (C) 2016 Intel Corporation + * Copyright (C) 2018-2019 Huawei Technologies Co., Ltd * * Authors: - * Fenghua Yu &lt;fenghua.yu(a)intel.com&gt; - * Tony Luck &lt;tony.luck(a)intel.com&gt; + * Fenghua Yu &lt;fenghua.yu(a)intel.com&gt; + * Tony Luck &lt;tony.luck(a)intel.com&gt; + * Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; + * + * Code was partially borrowed from arch/x86/kernel/cpu/intel_rdt*. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -17,8 +22,10 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * - * More information about RDT be found in the Intel (R) x86 Architecture - * Software Developer Manual June 2016, volume 3, section 17.17. + * More information about MPAM be found in the Arm Architecture Reference + * Manual. + * + * https://static.docs.arm.com/ddi0598/a/DDI0598_MPAM_supp_armv8a.pdf */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt diff --git a/arch/arm64/kernel/mpam_mon.c b/arch/arm64/kernel/mpam_mon.c index 407da95ae927..4ff0f7e1f9d2 100644 --- a/arch/arm64/kernel/mpam_mon.c +++ b/arch/arm64/kernel/mpam_mon.c @@ -1,14 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0+ /* - * Resource Director Technology(RDT) - * - Monitoring code + * Common code for ARM v8 MPAM * * Copyright (C) 2017 Intel Corporation + * Copyright (C) 2018-2019 Huawei Technologies Co., Ltd * * Author: - * Vikas Shivappa &lt;vikas.shivappa(a)intel.com&gt; + * Vikas Shivappa &lt;vikas.shivappa(a)intel.com&gt; + * Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; * - * This replaces the cqm.c based on perf but we reuse a lot of - * code and datastructures originally from Peter Zijlstra and Matt Fleming. + * Code was partially borrowed from arch/x86/kernel/cpu/intel_rdt*. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -19,8 +20,10 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * - * More information about RDT be found in the Intel (R) x86 Architecture - * Software Developer Manual June 2016, volume 3, section 17.17. + * More information about MPAM be found in the Arm Architecture Reference + * Manual. + * + * https://static.docs.arm.com/ddi0598/a/DDI0598_MPAM_supp_armv8a.pdf */ #include <linux/module.h> diff --git a/fs/resctrlfs.c b/fs/resctrlfs.c index 2bba5b7d5a9f..4ae00a60efcd 100644 --- a/fs/resctrlfs.c +++ b/fs/resctrlfs.c @@ -1,10 +1,14 @@ // SPDX-License-Identifier: GPL-2.0 /* - * User interface for Resource Alloction in Resource Director Technology(RDT) + * User interface for ARM v8 MPAM * - * Copyright (C) 2016 Intel Corporation + * Copyright (C) 2018-2019 Huawei Technologies Co., Ltd * - * Author: Fenghua Yu &lt;fenghua.yu(a)intel.com&gt; + * Author: + * Fenghua Yu &lt;fenghua.yu(a)intel.com&gt; + * Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; + * + * Code was partially borrowed from arch/x86/kernel/cpu/intel_rdt*. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -15,8 +19,10 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * - * More information about RDT be found in the Intel (R) x86 Architecture - * Software Developer Manual. + * More information about MPAM be found in the Arm Architecture Reference + * Manual. + * + * https://static.docs.arm.com/ddi0598/a/DDI0598_MPAM_supp_armv8a.pdf */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -- 2.31.0

From: James Morse &lt;james.morse(a)arm.com&gt; commit 3ec28b81de7f3d17f0f253d4ec0f7e6c068cc0c8 openEuler-1.0 hulk inclusion category: feature bugzilla: 28055 CVE: NA ------------------------------ The MPAM table holds a PPTT-offset that describes a cache. Add a helper acpi_pptt_validate_cache_node(), which checks this offset really is in the PPTT, on a node boundary, and that node really is a cache. With this the MPAM probe code can go poking through struct cacheinfo looking for a level with a matching firmware_node. Signed-off-by: James Morse &lt;james.morse(a)arm.com&gt; Signed-off-by: Wang ShaoBo &lt;bobo.shaobowang(a)huawei.com&gt; Reviewed-By: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- drivers/acpi/pptt.c | 38 ++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 4 ++++ 2 files changed, 42 insertions(+) diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c index 750295c486b7..f0aa0b4d721a 100644 --- a/drivers/acpi/pptt.c +++ b/drivers/acpi/pptt.c @@ -280,6 +280,44 @@ static struct acpi_pptt_processor *acpi_find_processor_node(struct acpi_table_he return NULL; } +/** + * acpi_validate_cache_node() - Given an offset in the table, check this is + * a cache node. + * Used for cross-table pointers. + * + * Return the cache pointer for a valid cache, or NULL. + */ +struct acpi_pptt_cache * +acpi_pptt_validate_cache_node(struct acpi_table_header *table_hdr, u32 offset) +{ + struct acpi_subtable_header *entry, *cache; + unsigned long table_end; + + if ((offset < sizeof(*table_hdr)) || (offset >= table_hdr->length)) + return NULL; + + table_end = (unsigned long)table_hdr + table_hdr->length; + entry = ACPI_ADD_PTR(struct acpi_subtable_header, table_hdr, + sizeof(struct acpi_table_pptt)); + + cache = ACPI_ADD_PTR(struct acpi_subtable_header, table_hdr, offset); + + /* Walk every node to check offset is on a node boundary */ + while ((unsigned long)(entry + 1) < table_end) { + if (entry->length == 0) { + pr_err("Invalid zero length subtable\n"); + break; + } + if ((entry->type == ACPI_PPTT_TYPE_CACHE) && (entry == cache)) + return (struct acpi_pptt_cache *)entry; + + entry = ACPI_ADD_PTR(struct acpi_subtable_header, entry, + entry->length); + } + + return NULL; +} + static int acpi_find_cache_levels(struct acpi_table_header *table_hdr, u32 acpi_cpu_id) diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 2ed8bbe56bf4..63fb5bcb1a65 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -664,6 +664,10 @@ static inline u64 acpi_arch_get_root_pointer(void) } #endif +struct acpi_pptt_cache * +acpi_pptt_validate_cache_node(struct acpi_table_header *table_hdr, + u32 offset); + #else /* !CONFIG_ACPI */ #define acpi_disabled 1 -- 2.31.0

From: Wang ShaoBo &lt;bobo.shaobowang(a)huawei.com&gt; commit 96c482e9dffa956ef525277fb2f9035be4bcb432 openEuler-1.0 hulk inclusion category: feature bugzilla: 28055 CVE: NA ------------------------------ According to James's implementation: http://www.linux-arm.org/git?p=linux- jm.git;a=commit;h=413eb4281b072e1ee60f88b814f2a418358f2155, "ACPI / PPTT: cacheinfo: Label caches based on fw_token". For resctrl ABI, cache node labeled by min_physid of leaf cpu node can not be good recognized, for this, we use to label each cache node by numa node id, it can be acquired by leaf cpu node with min_physid. But there also has some problems when doing this, with current MPAM ACPI Description 1.0, we haven't enough information to label those cache node when using partition mode, we hope fixing that when getting unified des- cription. Signed-off-by: Wang ShaoBo &lt;bobo.shaobowang(a)huawei.com&gt; Reviewed-By: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/include/asm/acpi.h | 4 +++ drivers/acpi/pptt.c | 55 +++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index ffe3c2659c8b..8433cfa18b9b 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -103,6 +103,10 @@ static inline u32 get_acpi_id_for_cpu(unsigned int cpu) static inline void arch_fix_phys_package_id(int num, u32 slot) { } void __init acpi_init_cpus(void); +void acpi_pptt_find_min_physid_cpu_node(struct acpi_table_header *table_hdr, + struct acpi_pptt_processor *cpu_node, + phys_cpuid_t *min_physid, + struct acpi_pptt_processor **min_cpu_node); int apei_claim_sea(struct pt_regs *regs); #else static inline void acpi_init_cpus(void) { } diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c index 190765300349..d99cfb5feb9f 100644 --- a/drivers/acpi/pptt.c +++ b/drivers/acpi/pptt.c @@ -430,6 +430,61 @@ static struct acpi_pptt_cache *acpi_find_cache_node(struct acpi_table_header *ta return found; } +/** + * acpi_pptt_min_physid_from_cpu_node() - Recursivly find @min_physid for all + * leaf CPUs below @cpu_node. + * @table_hdr: Pointer to the head of the PPTT table + * @cpu_node: The point in the toplogy to start the walk + * @min_physid: The min_physid to update with leaf CPUs. + * @min_cpu_node: The min_cpu_node to update with leaf CPUs. + */ +void acpi_pptt_find_min_physid_cpu_node(struct acpi_table_header *table_hdr, + struct acpi_pptt_processor *cpu_node, + phys_cpuid_t *min_physid, + struct acpi_pptt_processor **min_cpu_node) +{ + bool leaf = true; + u32 acpi_processor_id; + phys_cpuid_t cpu_node_phys_id; + struct acpi_subtable_header *iter; + struct acpi_pptt_processor *iter_node = NULL; + u32 target_node = ACPI_PTR_DIFF(cpu_node, table_hdr); + u32 proc_sz = sizeof(struct acpi_pptt_processor *); + unsigned long table_end = (unsigned long)table_hdr + table_hdr->length; + + /* + * Walk the PPTT, looking for nodes that reference cpu_node + * as parent. + */ + iter = ACPI_ADD_PTR(struct acpi_subtable_header, table_hdr, + sizeof(struct acpi_table_pptt)); + + while ((unsigned long)iter + proc_sz < table_end) { + iter_node = (struct acpi_pptt_processor *)iter; + + if (iter->type == ACPI_PPTT_TYPE_PROCESSOR && + iter_node->parent == target_node) { + leaf = false; + acpi_pptt_find_min_physid_cpu_node(table_hdr, iter_node, + min_physid, min_cpu_node); + } + + if (iter->length == 0) + return; + iter = ACPI_ADD_PTR(struct acpi_subtable_header, iter, + iter->length); + } + + acpi_processor_id = cpu_node->acpi_processor_id; + cpu_node_phys_id = acpi_id_to_phys_cpuid(acpi_processor_id); + if (!invalid_phys_cpuid(cpu_node_phys_id) && + *min_physid > cpu_node_phys_id && + leaf == true) { + *min_physid = cpu_node_phys_id; + *min_cpu_node = cpu_node; + } +} + /** * update_cache_properties() - Update cacheinfo for the given processor * @this_leaf: Kernel cache info structure being updated -- 2.31.0

From: Wang ShaoBo &lt;bobo.shaobowang(a)huawei.com&gt; commit f6a8821420ba16503a0b62f8798916310937340d openEuler-1.0 hulk inclusion category: feature bugzilla: 28055 CVE: NA ------------------------------ Renaming mpam_late_init() in arch/arm64/kernel/mpam.c to mpam_init(), traveling each MPAM ACPI cache / memory node and adding them to a list, with that, we use the numa node id it belongs to label cache node and proximity_domain to label memory node, once it ends, call mpam_init() to initialize all like before. Code was partially borrowed from James's: http://www.linux-arm.org/git?p=linux-jm.git;a=commit;h=10fe7d6363ae96b 25f584d4a91f9d0f2fd5faf3b,"ACPI / MPAM: Parse the (draft) MPAM table [dead]" v3->v5: mpam.c in drivers/acpi/arm64 should not be compiled when MPAM disabled, so we should add CONFIG_ACPI_MPAM macro and make CONFIG_MPAM select it. Not only that, as mpam init procedure is strong correlated to ACPI for Now (follow-up might be dependent on device tree), and CONFIG_ ACPI is not always selected under configuration, we should make CONFIG_ MPAM depends on CONFIG_ACPI before selecting CONFIG_ACPI_MPAM. Signed-off-by: Wang ShaoBo &lt;bobo.shaobowang(a)huawei.com&gt; Reviewed-By: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/Kconfig | 2 + arch/arm64/include/asm/mpam_resource.h | 15 +- arch/arm64/include/asm/mpam_sched.h | 8 +- arch/arm64/kernel/mpam.c | 246 ++++++++++++++++++------ drivers/acpi/arm64/Kconfig | 3 + drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/mpam.c | 249 +++++++++++++++++++++++++ 7 files changed, 468 insertions(+), 56 deletions(-) create mode 100644 drivers/acpi/arm64/mpam.c diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index f7a8d2743b61..72b3faecd648 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -795,7 +795,9 @@ config HOTPLUG_CPU config MPAM bool "Support Memory Partitioning and Monitoring" default n + depends on ACPI select RESCTRL_AARCH64 + select ACPI_MPAM if ACPI help Memory Partitioning and Monitoring. More exactly Memory system performance resource Partitioning and Monitoring diff --git a/arch/arm64/include/asm/mpam_resource.h b/arch/arm64/include/asm/mpam_resource.h index beadd2c64c31..ab90596c9194 100644 --- a/arch/arm64/include/asm/mpam_resource.h +++ b/arch/arm64/include/asm/mpam_resource.h @@ -95,6 +95,8 @@ */ struct mpam_node { + /* for label mpam_node instance*/ + u32 component_id; /* MPAM node header */ u8 type; /* MPAM_SMMU, MPAM_CACHE, MPAM_MC */ u64 addr; @@ -105,8 +107,19 @@ struct mpam_node { /* for debug */ char *cpus_list; char *name; + struct list_head list; }; -int mpam_nodes_init(void); +int __init mpam_force_init(void); + +int __init mpam_nodes_discovery_start(void); + +void __init mpam_nodes_discovery_failed(void); + +int __init mpam_nodes_discovery_complete(void); + +int mpam_create_cache_node(u32 component_id, phys_addr_t hwpage_address); + +int mpam_create_memory_node(u32 component_id, phys_addr_t hwpage_address); #endif /* _ASM_ARM64_MPAM_RESOURCE_H */ diff --git a/arch/arm64/include/asm/mpam_sched.h b/arch/arm64/include/asm/mpam_sched.h index f0552e6dc9bc..350296157087 100644 --- a/arch/arm64/include/asm/mpam_sched.h +++ b/arch/arm64/include/asm/mpam_sched.h @@ -40,7 +40,13 @@ static inline void mpam_sched_in(void) __mpam_sched_in(); } -extern int __read_mostly mpam_enabled; +enum mpam_enable_type { + enable_denied = 0, + enable_default, + enable_acpi, +}; + +extern enum mpam_enable_type __read_mostly mpam_enabled; #else diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index 9cd8ebc75872..4007a31b5249 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -67,12 +67,6 @@ int max_name_width, max_data_width; */ bool rdt_alloc_capable; -char *mpam_types_str[] = { - "MPAM_RESOURCE_SMMU", - "MPAM_RESOURCE_CACHE", - "MPAM_RESOURCE_MC", -}; - /* * Hi1620 2P Base Address Map * @@ -86,35 +80,30 @@ char *mpam_types_str[] = { * AFF2: MPIDR.AFF2 */ -#define MPAM_BASE(suffix, offset) ((suffix) << 24 | (offset) << 16) -#define MPAM_NODE(n, t, suffix, offset) \ - { \ - .name = #n, \ - .type = t, \ - .addr = MPAM_BASE(suffix, (offset)), \ - .cpus_list = "0", \ - } +static inline void mpam_node_assign_val(struct mpam_node *n, + char *name, + u8 type, + phys_addr_t hwpage_address, + u32 component_id) +{ + n->name = name; + n->type = type; + n->addr = hwpage_address; + n->component_id = component_id; + n->cpus_list = "0"; +} -struct mpam_node mpam_node_all[] = { - MPAM_NODE(L3TALL0, MPAM_RESOURCE_CACHE, 0x000098ULL, 0xB9), - MPAM_NODE(L3TALL1, MPAM_RESOURCE_CACHE, 0x000090ULL, 0xB9), - MPAM_NODE(L3TALL2, MPAM_RESOURCE_CACHE, 0x200098ULL, 0xB9), - MPAM_NODE(L3TALL3, MPAM_RESOURCE_CACHE, 0x200090ULL, 0xB9), +#define MPAM_NODE_NAME_SIZE (10) - MPAM_NODE(HHAALL0, MPAM_RESOURCE_MC, 0x000098ULL, 0xC1), - MPAM_NODE(HHAALL1, MPAM_RESOURCE_MC, 0x000090ULL, 0xC1), - MPAM_NODE(HHAALL2, MPAM_RESOURCE_MC, 0x200098ULL, 0xC1), - MPAM_NODE(HHAALL3, MPAM_RESOURCE_MC, 0x200090ULL, 0xC1), -}; +struct mpam_node *mpam_nodes_ptr; -void mpam_nodes_unmap(void) +static int __init mpam_init(void); + +static void mpam_nodes_unmap(void) { - int i; - size_t num_nodes = ARRAY_SIZE(mpam_node_all); struct mpam_node *n; - for (i = 0; i < num_nodes; i++) { - n = &mpam_node_all[i]; + list_for_each_entry(n, &mpam_nodes_ptr->list, list) { if (n->base) { iounmap(n->base); n->base = NULL; @@ -122,14 +111,12 @@ void mpam_nodes_unmap(void) } } -int mpam_nodes_init(void) +static int mpam_nodes_init(void) { - int i, ret = 0; - size_t num_nodes = ARRAY_SIZE(mpam_node_all); + int ret = 0; struct mpam_node *n; - for (i = 0; i < num_nodes; i++) { - n = &mpam_node_all[i]; + list_for_each_entry(n, &mpam_nodes_ptr->list, list) { ret |= cpulist_parse(n->cpus_list, &n->cpu_mask); n->base = ioremap(n->addr, 0x10000); if (!n->base) { @@ -141,6 +128,160 @@ int mpam_nodes_init(void) return ret; } +static void mpam_nodes_destroy(void) +{ + struct mpam_node *n, *tmp; + + if (!mpam_nodes_ptr) + return; + + list_for_each_entry_safe(n, tmp, &mpam_nodes_ptr->list, list) { + kfree(n->name); + list_del(&n->list); + kfree(n); + } + + list_del(&mpam_nodes_ptr->list); + kfree(mpam_nodes_ptr); + mpam_nodes_ptr = NULL; +} + +int __init mpam_nodes_discovery_start(void) +{ + if (!mpam_enabled) + return -EINVAL; + + mpam_nodes_ptr = kzalloc(sizeof(struct mpam_node), GFP_KERNEL); + if (!mpam_nodes_ptr) + return -ENOMEM; + + INIT_LIST_HEAD(&mpam_nodes_ptr->list); + + return 0; +} + +void __init mpam_nodes_discovery_failed(void) +{ + mpam_nodes_destroy(); +} + +int __init mpam_nodes_discovery_complete(void) +{ + return mpam_init(); +} + +static inline int validate_mpam_node(int type, + int component_id) +{ + int ret = 0; + struct mpam_node *n; + + list_for_each_entry(n, &mpam_nodes_ptr->list, list) { + if (n->component_id == component_id && + n->type == type) { + ret = -EINVAL; + break; + } + } + + return ret; +} + +int mpam_create_cache_node(u32 component_id, + phys_addr_t hwpage_address) +{ + struct mpam_node *new; + char *name; + + if (validate_mpam_node(MPAM_RESOURCE_CACHE, component_id)) + goto skip; + + new = kzalloc(sizeof(struct mpam_node), GFP_KERNEL); + if (!new) + return -ENOMEM; + + name = kzalloc(MPAM_NODE_NAME_SIZE, GFP_KERNEL); + if (!name) { + kfree(new); + return -ENOMEM; + } + snprintf(name, MPAM_NODE_NAME_SIZE, "%s%d", "L3TALL", component_id); + + mpam_node_assign_val(new, + name, + MPAM_RESOURCE_CACHE, + hwpage_address, + component_id); + list_add_tail(&new->list, &mpam_nodes_ptr->list); + +skip: + return 0; +} + +int mpam_create_memory_node(u32 component_id, + phys_addr_t hwpage_address) +{ + struct mpam_node *new; + char *name; + + if (validate_mpam_node(MPAM_RESOURCE_MC, component_id)) + goto skip; + + new = kzalloc(sizeof(struct mpam_node), GFP_KERNEL); + if (!new) + return -ENOMEM; + + name = kzalloc(MPAM_NODE_NAME_SIZE, GFP_KERNEL); + if (!name) { + kfree(new); + return -ENOMEM; + } + snprintf(name, MPAM_NODE_NAME_SIZE, "%s%d", "HHAALL", component_id); + + mpam_node_assign_val(new, + name, + MPAM_RESOURCE_MC, + hwpage_address, + component_id); + list_add_tail(&new->list, &mpam_nodes_ptr->list); + +skip: + return 0; + +} + +int __init mpam_force_init(void) +{ + int ret; + + if (mpam_enabled != enable_default) + return 0; + + ret = mpam_nodes_discovery_start(); + if (ret) + return ret; + + ret |= mpam_create_cache_node(0, 0x000098b90000ULL); + ret |= mpam_create_cache_node(1, 0x000090b90000ULL); + ret |= mpam_create_cache_node(2, 0x200098b90000ULL); + ret |= mpam_create_cache_node(3, 0x200090b90000ULL); + ret |= mpam_create_memory_node(0, 0x000098c10000ULL); + ret |= mpam_create_memory_node(1, 0x000090c10000ULL); + ret |= mpam_create_memory_node(2, 0x200098c10000ULL); + ret |= mpam_create_memory_node(3, 0x200090c10000ULL); + if (ret) { + mpam_nodes_discovery_failed(); + pr_err("Failed to force create mpam node\n"); + return -EINVAL; + } + + ret = mpam_nodes_discovery_complete(); + if (!ret) + pr_info("Successfully init mpam by hardcode.\n"); + + return 1; +} + static void cat_wrmsr(struct rdt_domain *d, int partid); static void @@ -1142,16 +1283,14 @@ static void mpam_domains_destroy(struct resctrl_resource *r) static void mpam_domains_init(struct resctrl_resource *r) { - int i, id = 0; - size_t num_nodes = ARRAY_SIZE(mpam_node_all); + int id = 0; struct mpam_node *n; struct list_head *add_pos = NULL; struct rdt_domain *d; struct raw_resctrl_resource *rr = (struct raw_resctrl_resource *)r->res; u32 val; - for (i = 0; i < num_nodes; i++) { - n = &mpam_node_all[i]; + list_for_each_entry(n, &mpam_nodes_ptr->list, list) { if (r->rid != n->type) continue; @@ -1220,25 +1359,22 @@ static void mpam_domains_init(struct resctrl_resource *r) } } -int __read_mostly mpam_enabled; +enum mpam_enable_type __read_mostly mpam_enabled; static int __init mpam_setup(char *str) { - mpam_enabled = 1; + if (!strcmp(str, "=acpi")) + mpam_enabled = enable_acpi; + else + mpam_enabled = enable_default; return 1; } __setup("mpam", mpam_setup); -static int __init mpam_late_init(void) +static int __init mpam_init(void) { struct resctrl_resource *r; int state, ret; - if (!mpam_enabled) - return 0; - - if (!cpus_have_const_cap(ARM64_HAS_MPAM)) - return -ENODEV; - rdt_alloc_capable = 1; rdt_mon_capable = 1; @@ -1247,7 +1383,7 @@ static int __init mpam_late_init(void) ret = mpam_nodes_init(); if (ret) { pr_err("internal error: bad cpu list\n"); - return ret; + goto out; } mpam_domains_init(&resctrl_resources_all[MPAM_RESOURCE_CACHE]); @@ -1256,8 +1392,10 @@ static int __init mpam_late_init(void) state = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "arm64/mpam:online:", mpam_online_cpu, mpam_offline_cpu); - if (state < 0) - return state; + if (state < 0) { + ret = state; + goto out; + } register_resctrl_specific_files(res_specific_files, ARRAY_SIZE(res_specific_files)); @@ -1267,7 +1405,7 @@ static int __init mpam_late_init(void) ret = resctrl_group_init(); if (ret) { cpuhp_remove_state(state); - return ret; + goto out; } for_each_resctrl_resource(r) { @@ -1280,11 +1418,11 @@ static int __init mpam_late_init(void) pr_info("MPAM %s monitoring detected\n", r->name); } - return 0; +out: + mpam_nodes_destroy(); + return ret; } -late_initcall(mpam_late_init); - /* * __intel_rdt_sched_in() - Writes the task's CLOSid/RMID to IA32_PQR_MSR * diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig index 5a6f80fce0d6..4ef04f0ea94c 100644 --- a/drivers/acpi/arm64/Kconfig +++ b/drivers/acpi/arm64/Kconfig @@ -7,3 +7,6 @@ config ACPI_IORT config ACPI_GTDT bool + +config ACPI_MPAM + bool diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile index 1017def2ea12..81408ce40506 100644 --- a/drivers/acpi/arm64/Makefile +++ b/drivers/acpi/arm64/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_ACPI_IORT) += iort.o obj-$(CONFIG_ACPI_GTDT) += gtdt.o +obj-$(CONFIG_ACPI_MPAM) += mpam.o diff --git a/drivers/acpi/arm64/mpam.c b/drivers/acpi/arm64/mpam.c new file mode 100644 index 000000000000..1f82dce33e07 --- /dev/null +++ b/drivers/acpi/arm64/mpam.c @@ -0,0 +1,249 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Common code for ARM v8 MPAM ACPI + * + * Copyright (C) 2019-2020 Huawei Technologies Co., Ltd + * + * Author: Wang ShaoBo &lt;bobo.shaobowang(a)huawei.com&gt; + * + * Code was partially borrowed from http://www.linux-arm.org/git?p= + * linux-jm.git;a=commit;h=10fe7d6363ae96b25f584d4a91f9d0f2fd5faf3b. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + */ + +/* Parse the MPAM ACPI table feeding the discovered nodes into the driver */ +#define pr_fmt(fmt) "ACPI MPAM: " fmt + +#include <linux/acpi.h> +#include <acpi/processor.h> +#include <linux/cpu.h> +#include <linux/cpumask.h> +#include <linux/cacheinfo.h> +#include <linux/string.h> +#include <linux/nodemask.h> +#include <asm/mpam_resource.h> + +/** + * acpi_mpam_label_cache_component_id() - Recursivly find @min_physid + * for all leaf CPUs below @cpu_node, use numa node id of @min_cpu_node + * to label mpam cache node, which be signed by @component_id. + * @table_hdr: Pointer to the head of the PPTT table + * @cpu_node: The point in the toplogy to start the walk + * @component_id: The id labels the structure mpam_node cache + */ +static int +acpi_mpam_label_cache_component_id(struct acpi_table_header *table_hdr, + struct acpi_pptt_processor *cpu_node, + u32 *component_id) +{ + phys_cpuid_t min_physid = PHYS_CPUID_INVALID; + struct acpi_pptt_processor *min_cpu_node = NULL; + u32 logical_cpuid; + u32 acpi_processor_id; + + acpi_pptt_find_min_physid_cpu_node(table_hdr, + cpu_node, + &min_physid, + &min_cpu_node); + WARN_ON_ONCE(invalid_phys_cpuid(min_physid)); + if (min_cpu_node == NULL) + return -EINVAL; + + acpi_processor_id = min_cpu_node->acpi_processor_id; + logical_cpuid = acpi_map_cpuid(min_physid, acpi_processor_id); + if (invalid_logical_cpuid(logical_cpuid) || + !cpu_present(logical_cpuid)) { + pr_err_once("Invalid logical cpuid.\n"); + return -EINVAL; + } + + *component_id = cpu_to_node(logical_cpuid); + + return 0; +} + +/** + * acpi_mpam_label_memory_component_id() - Use proximity_domain id to + * label mpam memory node, which be signed by @component_id. + * @proximity_domain: proximity_domain of ACPI MPAM memory node + * @component_id: The id labels the structure mpam_node memory + */ +static int acpi_mpam_label_memory_component_id(u8 proximity_domain, + u32 *component_id) +{ + u32 nid = (u32)proximity_domain; + + if (nid >= nr_online_nodes) { + pr_err_once("Invalid proximity domain\n"); + return -EINVAL; + } + + *component_id = nid; + return 0; +} + +static int __init acpi_mpam_parse_memory(struct acpi_mpam_header *h) +{ + int ret = 0; + u32 component_id; + struct acpi_mpam_node_memory *node = (struct acpi_mpam_node_memory *)h; + + ret = acpi_mpam_label_memory_component_id(node->proximity_domain, + &component_id); + if (ret) { + pr_err("Failed to label memory component id\n"); + return -EINVAL; + } + + ret = mpam_create_memory_node(component_id, + node->header.base_address); + if (ret) { + pr_err("Failed to create memory node\n"); + return -EINVAL; + } + + return ret; +} + +static int __init acpi_mpam_parse_cache(struct acpi_mpam_header *h, + struct acpi_table_header *pptt) +{ + int ret = 0; + u32 component_id; + struct acpi_pptt_cache *pptt_cache; + struct acpi_pptt_processor *pptt_cpu_node; + struct acpi_mpam_node_cache *node = (struct acpi_mpam_node_cache *)h; + + if (!pptt) { + pr_err("No PPTT table found, MPAM cannot be configured\n"); + return -EINVAL; + } + + pptt_cache = acpi_pptt_validate_cache_node(pptt, node->PPTT_ref); + if (!pptt_cache) { + pr_err("Broken PPTT reference in the MPAM table\n"); + return -EINVAL; + } + + /* + * We actually need a cpu_node, as a pointer to the PPTT cache + * description isn't unique. + */ + pptt_cpu_node = acpi_pptt_find_cache_backwards(pptt, pptt_cache); + + ret = acpi_mpam_label_cache_component_id(pptt, pptt_cpu_node, + &component_id); + + if (ret) { + pr_err("Failed to label cache component id\n"); + return -EINVAL; + } + + ret = mpam_create_cache_node(component_id, + node->header.base_address); + if (ret) { + pr_err("Failed to create cache node\n"); + return -EINVAL; + } + + return ret; +} + +static int __init acpi_mpam_parse_table(struct acpi_table_header *table, + struct acpi_table_header *pptt) +{ + char *table_offset = (char *)(table + 1); + char *table_end = (char *)table + table->length; + struct acpi_mpam_header *node_hdr; + int ret = 0; + + ret = mpam_nodes_discovery_start(); + if (ret) + return ret; + + node_hdr = (struct acpi_mpam_header *)table_offset; + while (table_offset < table_end) { + switch (node_hdr->type) { + + case ACPI_MPAM_TYPE_CACHE: + ret = acpi_mpam_parse_cache(node_hdr, pptt); + break; + case ACPI_MPAM_TYPE_MEMORY: + ret = acpi_mpam_parse_memory(node_hdr); + break; + default: + pr_warn_once("Unknown node type %u offset %ld.", + node_hdr->type, + (table_offset-(char *)table)); + /* fall through */ + case ACPI_MPAM_TYPE_SMMU: + /* not yet supported */ + /* fall through */ + case ACPI_MPAM_TYPE_UNKNOWN: + break; + } + if (ret) + break; + + table_offset += node_hdr->length; + node_hdr = (struct acpi_mpam_header *)table_offset; + } + + if (ret) { + pr_err("discovery failed: %d\n", ret); + mpam_nodes_discovery_failed(); + } else { + ret = mpam_nodes_discovery_complete(); + if (!ret) + pr_info("Successfully init mpam by ACPI.\n"); + } + + return ret; +} + +int __init acpi_mpam_parse(void) +{ + struct acpi_table_header *mpam, *pptt; + acpi_status status; + int ret; + + if (!cpus_have_const_cap(ARM64_HAS_MPAM)) + return 0; + + ret = mpam_force_init(); + if (ret) + return 0; + + if (acpi_disabled) + return 0; + + status = acpi_get_table(ACPI_SIG_MPAM, 0, &mpam); + if (ACPI_FAILURE(status)) + return -ENOENT; + + /* PPTT is optional, there may be no mpam cache controls */ + acpi_get_table(ACPI_SIG_PPTT, 0, &pptt); + if (ACPI_FAILURE(status)) + pptt = NULL; + + ret = acpi_mpam_parse_table(mpam, pptt); + acpi_put_table(pptt); + acpi_put_table(mpam); + + return ret; +} + +/* + * We want to run after cacheinfo_sysfs_init() has caused the cacheinfo + * structures to be populated. That runs as a device_initcall. + */ +device_initcall_sync(acpi_mpam_parse); -- 2.31.0

From: Wang ShaoBo &lt;bobo.shaobowang(a)huawei.com&gt; commit d3edc138bc98fdd654ac057b68291570130daa2e openEuler-1.0 hulk inclusion category: bugfix bugzilla: 34588 CVE: NA ----------------------------------------------- In many cases writing resctrl interface may return failure, but err tips in info/last_cmd_status remain ok. e.g. -bash: echo: write error: Invalid argument ok 1 -bash: echo: write error: No such file or directory ok We add extra tips when goes to this branches. Signed-off-by: Wang ShaoBo &lt;bobo.shaobowang(a)huawei.com&gt; Reviewed-by: Xie XiuQi &lt;xiexiuqi(a)huawei.com&gt; Signed-off-by: Yang Yingliang &lt;yangyingliang(a)huawei.com&gt; Signed-off-by: Xin Hao &lt;haoxing990(a)gmail.com&gt; --- arch/arm64/kernel/mpam.c | 7 ++++++- arch/arm64/kernel/mpam_ctrlmon.c | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/mpam.c b/arch/arm64/kernel/mpam.c index dc6dd566fc37..30900c08f0ef 100644 --- a/arch/arm64/kernel/mpam.c +++ b/arch/arm64/kernel/mpam.c @@ -863,7 +863,7 @@ static int resctrl_num_mon_show(struct kernfs_open_file *of, int cpus_mon_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask, cpumask_var_t tmpmask) { - pr_info("unsupported on mon_groups, please use ctrlmon groups\n"); + rdt_last_cmd_puts("temporarily unsupported write cpus on mon_groups\n"); return -EINVAL; } @@ -1148,6 +1148,7 @@ static ssize_t resctrl_group_ctrlmon_write(struct kernfs_open_file *of, if (!rdtgrp) { ret = -ENOENT; + rdt_last_cmd_puts("directory was removed\n"); goto unlock; } @@ -1161,6 +1162,10 @@ static ssize_t resctrl_group_ctrlmon_write(struct kernfs_open_file *of, if (!ret) rdtgrp->flags |= RDT_CTRLMON; } else { + if (ctrlmon) + rdt_last_cmd_printf("ctrlmon has been enabled\n"); + else + rdt_last_cmd_printf("ctrlmon has been disabled\n"); ret = -ENOENT; } diff --git a/arch/arm64/kernel/mpam_ctrlmon.c b/arch/arm64/kernel/mpam_ctrlmon.c index 90f34987e5b8..b62ab076bf30 100644 --- a/arch/arm64/kernel/mpam_ctrlmon.c +++ b/arch/arm64/kernel/mpam_ctrlmon.c @@ -175,6 +175,9 @@ static int parse_line(char *line, struct resctrl_resource *r) goto next; } } + + rdt_last_cmd_printf("unknown domain (%lu)\n", dom_id); + return -EINVAL; } @@ -228,6 +231,7 @@ ssize_t resctrl_group_schemata_write(struct kernfs_open_file *of, rdtgrp = resctrl_group_kn_lock_live(of->kn); if (!rdtgrp) { resctrl_group_kn_unlock(of->kn); + rdt_last_cmd_puts("directory was removed\n"); return -ENOENT; } rdt_last_cmd_clear(); -- 2.31.0