In mbm_assign_mode, the MBM counters are assigned/unassigned to an RMID, event pair in a resctrl group and monitor the bandwidth as long as it is assigned. Counters are assigned/unassigned at domain level and needs to be tracked at domain level. Add the mbm_assign_cntr_cfg data structure to struct rdt_ctrl_domain to manage and track MBM counter assignments at the domain level. Suggested-by: Peter Newman <peternewman@xxxxxxxxxx> Signed-off-by: Babu Moger <babu.moger@xxxxxxx> --- v10: Patch changed completely to handle the counters at domain level. https://lore.kernel.org/lkml/CALPaoCj+zWq1vkHVbXYP0znJbe6Ke3PXPWjtri5AFgD9cQDCUg@xxxxxxxxxxxxxx/ Removed Reviewed-by tag. Did not see the need to add cntr_id in mbm_state structure. Not used in the code. v9: Added Reviewed-by tag. No other changes. v8: Minor commit message changes. v7: Added check mbm_cntr_assignable for allocating bitmap mbm_cntr_map v6: New patch to add domain level assignment. --- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 11 +++++++++++ include/linux/resctrl.h | 12 ++++++++++++ 2 files changed, 23 insertions(+) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 682f47e0beb1..1ee008a63d8b 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -4068,6 +4068,7 @@ static void __init rdtgroup_setup_default(void) static void domain_destroy_mon_state(struct rdt_mon_domain *d) { + kfree(d->cntr_cfg); bitmap_free(d->rmid_busy_llc); kfree(d->mbm_total); kfree(d->mbm_local); @@ -4141,6 +4142,16 @@ static int domain_setup_mon_state(struct rdt_resource *r, struct rdt_mon_domain return -ENOMEM; } } + if (is_mbm_enabled() && r->mon.mbm_cntr_assignable) { + tsize = sizeof(*d->cntr_cfg); + d->cntr_cfg = kcalloc(r->mon.num_mbm_cntrs, tsize, GFP_KERNEL); + if (!d->cntr_cfg) { + bitmap_free(d->rmid_busy_llc); + kfree(d->mbm_total); + kfree(d->mbm_local); + return -ENOMEM; + } + } return 0; } diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h index c8ab3d7a0dab..03c67d9156f3 100644 --- a/include/linux/resctrl.h +++ b/include/linux/resctrl.h @@ -94,6 +94,16 @@ struct rdt_ctrl_domain { u32 *mbps_val; }; +/** + * struct mbm_cntr_cfg -Assignable counter configuration + * @evtid: Event type + * @rdtgroup: Resctrl group assigned to the counter + */ +struct mbm_cntr_cfg { + enum resctrl_event_id evtid; + struct rdtgroup *rdtgrp; +}; + /** * struct rdt_mon_domain - group of CPUs sharing a resctrl monitor resource * @hdr: common header for different domain types @@ -105,6 +115,7 @@ struct rdt_ctrl_domain { * @cqm_limbo: worker to periodically read CQM h/w counters * @mbm_work_cpu: worker CPU for MBM h/w counters * @cqm_work_cpu: worker CPU for CQM h/w counters + * @cntr_cfg: Assignable counters configuration */ struct rdt_mon_domain { struct rdt_domain_hdr hdr; @@ -116,6 +127,7 @@ struct rdt_mon_domain { struct delayed_work cqm_limbo; int mbm_work_cpu; int cqm_work_cpu; + struct mbm_cntr_cfg *cntr_cfg; }; /** -- 2.34.1