arm_mpam: resctrl: Add resctrl_arch_config_cntr() for ABMC use

ABMC, mbm_event mode, has a helper resctrl_arch_config_cntr() for changing
the mapping between 'cntr_id' and a CLOSID/RMID pair.

Add the helper.

For MPAM this is done by updating the mon->mbwu_idx_to_mon[] array, and as
usual CDP means it needs doing in three different ways.

Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Ben Horgan <ben.horgan@arm.com>
Tested-by: Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Tested-by: Fenghua Yu <fenghuay@nvidia.com>
Tested-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Reviewed-by: Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Reviewed-by: Fenghua Yu <fenghuay@nvidia.com>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
James Morse
2026-07-31 18:52:40 +01:00
committed by Will Deacon
parent 779cfd6531
commit 6e0e538a75

View File

@@ -125,12 +125,6 @@ void resctrl_arch_reset_cntr(struct rdt_resource *r, struct rdt_l3_mon_domain *d
{
}
void resctrl_arch_config_cntr(struct rdt_resource *r, struct rdt_l3_mon_domain *d,
enum resctrl_event_id evtid, u32 rmid, u32 closid,
u32 cntr_id, bool assign)
{
}
int resctrl_arch_cntr_read(struct rdt_resource *r, struct rdt_l3_mon_domain *d,
u32 unused, u32 rmid, int cntr_id,
enum resctrl_event_id eventid, u64 *val)
@@ -1082,6 +1076,48 @@ static void mpam_resctrl_pick_counters(void)
}
}
static void __config_cntr(struct mpam_resctrl_mon *mon, u32 cntr_id,
enum resctrl_conf_type cdp_type, u32 closid, u32 rmid,
bool assign)
{
/* Same CDP index remap as closid; maps cntr_id to assigned_counters[]. */
u32 mbwu_idx, mon_idx = resctrl_get_config_index(cntr_id, cdp_type);
closid = resctrl_get_config_index(closid, cdp_type);
mbwu_idx = resctrl_arch_rmid_idx_encode(closid, rmid);
if (assign)
mon->mbwu_idx_to_mon[mbwu_idx] = mon->assigned_counters[mon_idx];
else
mon->mbwu_idx_to_mon[mbwu_idx] = -1;
}
void resctrl_arch_config_cntr(struct rdt_resource *r, struct rdt_l3_mon_domain *d,
enum resctrl_event_id evtid, u32 rmid, u32 closid,
u32 cntr_id, bool assign)
{
struct mpam_resctrl_mon *mon = &mpam_resctrl_counters[evtid];
if (evtid != QOS_L3_MBM_TOTAL_EVENT_ID) {
pr_debug("unexpected event id\n");
return;
}
if (!mon->mbwu_idx_to_mon || !mon->assigned_counters) {
pr_debug("monitor arrays not allocated\n");
return;
}
if (cdp_enabled) {
__config_cntr(mon, cntr_id, CDP_CODE, closid, rmid, assign);
__config_cntr(mon, cntr_id, CDP_DATA, closid, rmid, assign);
} else {
__config_cntr(mon, cntr_id, CDP_NONE, closid, rmid, assign);
}
resctrl_arch_reset_cntr(r, d, closid, rmid, cntr_id, QOS_L3_MBM_TOTAL_EVENT_ID);
}
static int mpam_resctrl_control_init(struct mpam_resctrl_res *res)
{
struct mpam_class *class = res->class;