Messages in this thread Patch in this message | | | From | Tony Luck <> | Subject | [PATCH 08/10] x86/resctrl: Mark L3 monitor files with summation flag. | Date | Wed, 27 Mar 2024 13:03:50 -0700 |
| |
When Sub-NUMA cluster mode is enabled, the parent monitor files in the mon_L3_XX directories need to sum all child siblings from the SUBL3 domains.
Add a flag to the parent files and pass that down to the routines that will read values from hardware RMID counters.
Signed-off-by: Tony Luck <tony.luck@intel.com> --- arch/x86/kernel/cpu/resctrl/internal.h | 5 ++++- arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 1 + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 8 +++++--- 3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h index 7f05502454c5..4263fbdf7ee7 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -130,6 +130,7 @@ struct mon_evt { * @priv: Used to store monitoring event data in @u * as kernfs private data * @rid: Resource id associated with the event file + * @sumdomains: Report total of all SNC domains sharing an L3 cache * @evtid: Event id associated with the event file * @domid: The domain to which the event file belongs * @u: Name of the bit fields struct @@ -137,7 +138,8 @@ struct mon_evt { union mon_data_bits { void *priv; struct { - unsigned int rid : 10; + unsigned int rid : 9; + unsigned int sumdomains : 1; enum resctrl_event_id evtid : 8; unsigned int domid : 14; } u; @@ -149,6 +151,7 @@ struct rmid_read { struct rdt_domain *d; enum resctrl_event_id evtid; bool first; + bool sumdomains; int err; u64 val; void *arch_mon_ctx; diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c index 2bf021d42500..fedcf50df6e5 100644 --- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c +++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c @@ -574,6 +574,7 @@ int rdtgroup_mondata_show(struct seq_file *m, void *arg) resid = md.u.rid; domid = md.u.domid; evtid = md.u.evtid; + rr.sumdomains = md.u.sumdomains; r = &rdt_resources_all[resid].r_resctrl; d = rdt_find_domain(r, domid, NULL); diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 399dc3175292..3e7f2e36b71e 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -3059,7 +3059,8 @@ static void rmdir_mondata_subdir_allrdtgrp(struct rdt_resource *r, } static int mon_add_all_files(struct kernfs_node *kn, struct rdt_domain *d, - struct rdt_resource *r, struct rdtgroup *prgrp) + struct rdt_resource *r, struct rdtgroup *prgrp, + bool sumdomains) { union mon_data_bits priv; struct mon_evt *mevt; @@ -3071,6 +3072,7 @@ static int mon_add_all_files(struct kernfs_node *kn, struct rdt_domain *d, priv.u.rid = r->rid; priv.u.domid = d->id; + priv.u.sumdomains = sumdomains; list_for_each_entry(mevt, &r->evt_list, list) { priv.u.evtid = mevt->evtid; ret = mon_addfile(kn, mevt->name, priv.priv); @@ -3109,7 +3111,7 @@ static int mkdir_mondata_subdir(struct kernfs_node *parent_kn, ret = rdtgroup_kn_set_ugid(kn); if (ret) goto out_destroy; - ret = mon_add_all_files(kn, d, r, prgrp); + ret = mon_add_all_files(kn, d, r, prgrp, true); if (ret) goto out_destroy; } @@ -3124,7 +3126,7 @@ static int mkdir_mondata_subdir(struct kernfs_node *parent_kn, if (ret) goto out_destroy; - ret = mon_add_all_files(ckn, d, r, prgrp); + ret = mon_add_all_files(ckn, d, r, prgrp, false); if (ret) goto out_destroy; kernfs_activate(kn); -- 2.44.0
| |