[PATCH v3] arm_mpam: resctrl: Use the domain's counter ID

From: Jinjie Ruan

Date: Wed Nov 18 2026 - 07:54:37 EST


resctrl assigns MBM counters per domain: mbm_L3_assignments takes a
domain ID, a group can have a counter in one domain and none in
another, and resctrl_arch_cntr_read() and resctrl_arch_reset_cntr()
are given the counter to use.

The driver ignores that counter and looks the monitor up in
mbwu_idx_to_mon[], indexed by CLOSID and RMID.
resctrl_arch_config_cntr() fills that array without looking at the
domain, so each group has one monitor for the whole resource.
Whichever assignment is written last selects the monitor the group
reads in every domain.

For example, with the counter ID each group uses for mbm_total_bytes
on each domain and "_" for none:

domain 0 domain 1
mount, mkdir g1 default=0 g1=1 default=0 g1=1
unassign both on domain 1 default=0 g1=1 default=_ g1=_
assign g1 on domain 1 default=0 g1=1 default=_ g1=0

g1 is assigned the lowest free counter on domain 1, counter 0. That
assignment is the last one written for g1, so it selects the monitor
g1 reads in every domain. On domain 0, g1 uses counter 1, but reads
the monitor of counter 0:

counter whose monitor is read on domain 0
default g1
expected 0 1
actual 0 0

That is the default group's monitor.

Translate the counter ID with assigned_counters[], which maps a counter
ID to a monitor of the class and is valid in every domain.

mbwu_idx_to_mon[] is left alone: resctrl_arch_config_cntr() still fills
it, but the read and reset paths no longer consult it, and a future
default mbm_assign_mode may use the array, so removing it can be
considered separately. Unassigning a counter now resets its monitor,
where before the lookup made the reset a no-op; the monitor is reset
again when the counter is next assigned.

Fixes: a5ff6ef2d73e ("arm_mpam: resctrl: Add resctrl_arch_cntr_read() & resctrl_arch_reset_cntr()")
Suggested-by: Ben Horgan <ben.horgan@xxxxxxx>
Signed-off-by: Jinjie Ruan <ruanjinjie@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
---
v3:
- Keep mbwu_idx_to_mon[] and remove the cleanup. (Ben)
- Split out as a mpam seperate patch.
- Remove unnessary stable version.
- v2: https://lore.kernel.org/all/20261113083506.4129060-2-ruanjinjie@xxxxxxxxxx/
---
drivers/resctrl/mpam_resctrl.c | 50 ++++++++++++++++++++++++++++------
1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/drivers/resctrl/mpam_resctrl.c b/drivers/resctrl/mpam_resctrl.c
index 8e9d5c68c2c1..0d290962ef62 100644
--- a/drivers/resctrl/mpam_resctrl.c
+++ b/drivers/resctrl/mpam_resctrl.c
@@ -463,6 +463,15 @@ void resctrl_arch_mon_ctx_free(struct rdt_resource *r,
resctrl_arch_mon_ctx_free_no_wait(evtid, mon_idx);
}

+/* The monitor resctrl's counter @cntr_id uses for @cdp_type. */
+static int mon_for_cntr(struct mpam_resctrl_mon *mon, int cntr_id,
+ enum resctrl_conf_type cdp_type)
+{
+ u32 idx = resctrl_get_config_index(cntr_id, cdp_type);
+
+ return mon->assigned_counters[idx];
+}
+
static int __read_mon(struct mpam_resctrl_mon *mon, struct mpam_component *mon_comp,
enum mpam_device_features mon_type,
int mon_idx,
@@ -558,7 +567,7 @@ int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain_hdr *hdr,

/* MBWU counters when in ABMC mode */
int resctrl_arch_cntr_read(struct rdt_resource *r, struct rdt_l3_mon_domain *d,
- u32 closid, u32 rmid, int mon_idx,
+ u32 closid, u32 rmid, int cntr_id,
enum resctrl_event_id eventid, u64 *val)
{
struct mpam_resctrl_mon *mon = &mpam_resctrl_counters[eventid];
@@ -574,8 +583,30 @@ int resctrl_arch_cntr_read(struct rdt_resource *r, struct rdt_l3_mon_domain *d,
l3_dom = container_of(d, struct mpam_resctrl_dom, resctrl_mon_dom);
mon_comp = l3_dom->mon_comp[eventid];

- return read_mon_cdp_safe(mon, mon_comp, mpam_feat_msmon_mbwu,
- USE_PRE_ALLOCATED, closid, rmid, val);
+ /* A counter ID maps to one monitor per CDP configuration. */
+ if (cdp_enabled) {
+ u64 code_val = 0, data_val = 0;
+ int err;
+
+ err = __read_mon(mon, mon_comp, mpam_feat_msmon_mbwu,
+ mon_for_cntr(mon, cntr_id, CDP_CODE),
+ CDP_CODE, closid, rmid, &code_val);
+ if (err)
+ return err;
+
+ err = __read_mon(mon, mon_comp, mpam_feat_msmon_mbwu,
+ mon_for_cntr(mon, cntr_id, CDP_DATA),
+ CDP_DATA, closid, rmid, &data_val);
+ if (err)
+ return err;
+
+ *val = code_val + data_val;
+ return 0;
+ }
+
+ return __read_mon(mon, mon_comp, mpam_feat_msmon_mbwu,
+ mon_for_cntr(mon, cntr_id, CDP_NONE),
+ CDP_NONE, closid, rmid, val);
}

static void __reset_mon(struct mpam_resctrl_mon *mon, struct mpam_component *mon_comp,
@@ -603,13 +634,16 @@ static void __reset_mon(struct mpam_resctrl_mon *mon, struct mpam_component *mon
}

static void reset_mon_cdp_safe(struct mpam_resctrl_mon *mon, struct mpam_component *mon_comp,
- int mon_idx, u32 closid, u32 rmid)
+ int cntr_id, u32 closid, u32 rmid)
{
if (cdp_enabled) {
- __reset_mon(mon, mon_comp, mon_idx, CDP_CODE, closid, rmid);
- __reset_mon(mon, mon_comp, mon_idx, CDP_DATA, closid, rmid);
+ __reset_mon(mon, mon_comp, mon_for_cntr(mon, cntr_id, CDP_CODE),
+ CDP_CODE, closid, rmid);
+ __reset_mon(mon, mon_comp, mon_for_cntr(mon, cntr_id, CDP_DATA),
+ CDP_DATA, closid, rmid);
} else {
- __reset_mon(mon, mon_comp, mon_idx, CDP_NONE, closid, rmid);
+ __reset_mon(mon, mon_comp, mon_for_cntr(mon, cntr_id, CDP_NONE),
+ CDP_NONE, closid, rmid);
}
}

@@ -631,7 +665,7 @@ void resctrl_arch_reset_cntr(struct rdt_resource *r, struct rdt_l3_mon_domain *d
l3_dom = container_of(d, struct mpam_resctrl_dom, resctrl_mon_dom);
mon_comp = l3_dom->mon_comp[eventid];

- reset_mon_cdp_safe(mon, mon_comp, USE_PRE_ALLOCATED, closid, rmid);
+ reset_mon_cdp_safe(mon, mon_comp, cntr_id, closid, rmid);
}

/*
--
2.34.1