[RFC PATCH v3 06/19] x86,fs/resctrl: Record the resource that enables a monitor event

From: Jinjie Ruan

Date: Mon Nov 16 2026 - 07:59:48 EST


mon_evt::rid is initialised from a static table that guesses which
resource each event belongs to. The architecture enabling the event
knows the answer, so pass the resource to resctrl_enable_mon_event()
and record it in mon_evt::rid.

Every architecture records the value the table guessed, so this does
not change which events are shown where.

No functional change intended.

Signed-off-by: Jinjie Ruan <ruanjinjie@xxxxxxxxxx>
---
arch/x86/kernel/cpu/resctrl/core.c | 6 +--
arch/x86/kernel/cpu/resctrl/intel_aet.c | 2 +-
drivers/resctrl/mpam_resctrl.c | 2 +-
fs/resctrl/internal.h | 3 +-
fs/resctrl/monitor.c | 54 ++++++++++++++-----------
include/linux/resctrl.h | 3 +-
6 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
index fab126ae2eba..707fa4e7ed24 100644
--- a/arch/x86/kernel/cpu/resctrl/core.c
+++ b/arch/x86/kernel/cpu/resctrl/core.c
@@ -968,15 +968,15 @@ static __init bool get_rdt_mon_resources(void)
bool ret = false;

if (rdt_cpu_has(X86_FEATURE_CQM_OCCUP_LLC)) {
- resctrl_enable_mon_event(QOS_OCCUP_EVENT_ID, false, 0, NULL);
+ resctrl_enable_mon_event(r, QOS_OCCUP_EVENT_ID, false, 0, NULL);
ret = true;
}
if (rdt_cpu_has(X86_FEATURE_CQM_MBM_TOTAL)) {
- resctrl_enable_mon_event(QOS_MBM_TOTAL_EVENT_ID, false, 0, NULL);
+ resctrl_enable_mon_event(r, QOS_MBM_TOTAL_EVENT_ID, false, 0, NULL);
ret = true;
}
if (rdt_cpu_has(X86_FEATURE_CQM_MBM_LOCAL)) {
- resctrl_enable_mon_event(QOS_MBM_LOCAL_EVENT_ID, false, 0, NULL);
+ resctrl_enable_mon_event(r, QOS_MBM_LOCAL_EVENT_ID, false, 0, NULL);
ret = true;
}
if (rdt_cpu_has(X86_FEATURE_ABMC))
diff --git a/arch/x86/kernel/cpu/resctrl/intel_aet.c b/arch/x86/kernel/cpu/resctrl/intel_aet.c
index 66cd8c2c7a51..a5978019a48c 100644
--- a/arch/x86/kernel/cpu/resctrl/intel_aet.c
+++ b/arch/x86/kernel/cpu/resctrl/intel_aet.c
@@ -290,7 +290,7 @@ static bool enable_events(struct event_group *e, struct pmt_feature_group *p)
}

for (int j = 0; j < e->num_events; j++) {
- if (!resctrl_enable_mon_event(e->evts[j].id, true,
+ if (!resctrl_enable_mon_event(r, e->evts[j].id, true,
e->evts[j].bin_bits, &e->evts[j]))
skipped_events++;
}
diff --git a/drivers/resctrl/mpam_resctrl.c b/drivers/resctrl/mpam_resctrl.c
index 385c54604872..961210af3159 100644
--- a/drivers/resctrl/mpam_resctrl.c
+++ b/drivers/resctrl/mpam_resctrl.c
@@ -1377,7 +1377,7 @@ static int mpam_resctrl_monitor_init(struct rdt_resource *r,
r->mon.mbm_cfg_mask = MAX_EVT_CONFIG_BITS;
}

- if (!resctrl_enable_mon_event(type, false, 0, NULL))
+ if (!resctrl_enable_mon_event(r, type, false, 0, NULL))
return -EINVAL;

r->mon_capable = true;
diff --git a/fs/resctrl/internal.h b/fs/resctrl/internal.h
index e62a277dee85..f7815e4fb53e 100644
--- a/fs/resctrl/internal.h
+++ b/fs/resctrl/internal.h
@@ -54,7 +54,8 @@ static inline struct rdt_fs_context *rdt_fc2context(struct fs_context *fc)
/**
* struct mon_evt - Properties of a monitor event
* @evtid: event id
- * @rid: resource id for this event
+ * @rid: resource that implements this event, recorded by the
+ * architecture when it enables the event
* @name: name of the event
* @evt_cfg: Event configuration value that represents the
* memory transactions (e.g., READS_TO_LOCAL_MEM,
diff --git a/fs/resctrl/monitor.c b/fs/resctrl/monitor.c
index 1b0fb3c2aaee..23c1838a7661 100644
--- a/fs/resctrl/monitor.c
+++ b/fs/resctrl/monitor.c
@@ -1015,11 +1015,10 @@ void free_rmid_lru_list(void)
mutex_unlock(&rdtgroup_mutex);
}

-#define MON_EVENT(_eventid, _name, _res, _fp) \
+#define MON_EVENT(_eventid, _name, _fp) \
[_eventid] = { \
.name = _name, \
.evtid = _eventid, \
- .rid = _res, \
.is_floating_point = _fp, \
}

@@ -1029,41 +1028,48 @@ void free_rmid_lru_list(void)
* to set .enabled.
*/
struct mon_evt mon_event_all[QOS_NUM_EVENTS] = {
- MON_EVENT(QOS_OCCUP_EVENT_ID, "llc_occupancy", RDT_RESOURCE_L3, false),
- MON_EVENT(QOS_MBM_TOTAL_EVENT_ID, "mbm_total_bytes", RDT_RESOURCE_L3, false),
- MON_EVENT(QOS_MBM_LOCAL_EVENT_ID, "mbm_local_bytes", RDT_RESOURCE_L3, false),
- MON_EVENT(PMT_EVENT_ENERGY, "core_energy", RDT_RESOURCE_PERF_PKG, true),
- MON_EVENT(PMT_EVENT_ACTIVITY, "activity", RDT_RESOURCE_PERF_PKG, true),
- MON_EVENT(PMT_EVENT_STALLS_LLC_HIT, "stalls_llc_hit", RDT_RESOURCE_PERF_PKG, false),
- MON_EVENT(PMT_EVENT_C1_RES, "c1_res", RDT_RESOURCE_PERF_PKG, false),
- MON_EVENT(PMT_EVENT_UNHALTED_CORE_CYCLES, "unhalted_core_cycles", RDT_RESOURCE_PERF_PKG, false),
- MON_EVENT(PMT_EVENT_STALLS_LLC_MISS, "stalls_llc_miss", RDT_RESOURCE_PERF_PKG, false),
- MON_EVENT(PMT_EVENT_AUTO_C6_RES, "c6_res", RDT_RESOURCE_PERF_PKG, false),
- MON_EVENT(PMT_EVENT_UNHALTED_REF_CYCLES, "unhalted_ref_cycles", RDT_RESOURCE_PERF_PKG, false),
- MON_EVENT(PMT_EVENT_UOPS_RETIRED, "uops_retired", RDT_RESOURCE_PERF_PKG, false),
- MON_EVENT(PMT_EVENT_INST_RETIRED, "inst_retired", RDT_RESOURCE_PERF_PKG, false),
- MON_EVENT(PMT_EVENT_PCNT, "pcnt", RDT_RESOURCE_PERF_PKG, false),
+ MON_EVENT(QOS_OCCUP_EVENT_ID, "llc_occupancy", false),
+ MON_EVENT(QOS_MBM_TOTAL_EVENT_ID, "mbm_total_bytes", false),
+ MON_EVENT(QOS_MBM_LOCAL_EVENT_ID, "mbm_local_bytes", false),
+ MON_EVENT(PMT_EVENT_ENERGY, "core_energy", true),
+ MON_EVENT(PMT_EVENT_ACTIVITY, "activity", true),
+ MON_EVENT(PMT_EVENT_STALLS_LLC_HIT, "stalls_llc_hit", false),
+ MON_EVENT(PMT_EVENT_C1_RES, "c1_res", false),
+ MON_EVENT(PMT_EVENT_UNHALTED_CORE_CYCLES, "unhalted_core_cycles", false),
+ MON_EVENT(PMT_EVENT_STALLS_LLC_MISS, "stalls_llc_miss", false),
+ MON_EVENT(PMT_EVENT_AUTO_C6_RES, "c6_res", false),
+ MON_EVENT(PMT_EVENT_UNHALTED_REF_CYCLES, "unhalted_ref_cycles", false),
+ MON_EVENT(PMT_EVENT_UOPS_RETIRED, "uops_retired", false),
+ MON_EVENT(PMT_EVENT_INST_RETIRED, "inst_retired", false),
+ MON_EVENT(PMT_EVENT_PCNT, "pcnt", false),
};

-bool resctrl_enable_mon_event(enum resctrl_event_id eventid, bool any_cpu,
+bool resctrl_enable_mon_event(struct rdt_resource *r,
+ enum resctrl_event_id eventid, bool any_cpu,
unsigned int binary_bits, void *arch_priv)
{
+ struct mon_evt *mevt;
+
if (WARN_ON_ONCE(eventid < QOS_FIRST_EVENT || eventid >= QOS_NUM_EVENTS ||
binary_bits > MAX_BINARY_BITS))
return false;
- if (mon_event_all[eventid].enabled) {
- pr_warn("Duplicate enable for event %d\n", eventid);
+
+ mevt = &mon_event_all[eventid];
+ if (mevt->enabled) {
+ pr_warn("Duplicate enable for event %d on resource %d\n",
+ eventid, r->rid);
return false;
}
- if (binary_bits && !mon_event_all[eventid].is_floating_point) {
+ if (binary_bits && !mevt->is_floating_point) {
pr_warn("Event %d may not be floating point\n", eventid);
return false;
}

- mon_event_all[eventid].any_cpu = any_cpu;
- mon_event_all[eventid].binary_bits = binary_bits;
- mon_event_all[eventid].arch_priv = arch_priv;
- mon_event_all[eventid].enabled = true;
+ mevt->rid = r->rid;
+ mevt->any_cpu = any_cpu;
+ mevt->binary_bits = binary_bits;
+ mevt->arch_priv = arch_priv;
+ mevt->enabled = true;

return true;
}
diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h
index c844f99fb824..f09169c964e6 100644
--- a/include/linux/resctrl.h
+++ b/include/linux/resctrl.h
@@ -419,7 +419,8 @@ u32 resctrl_arch_get_num_closid(struct rdt_resource *r);
u32 resctrl_arch_system_num_rmid_idx(void);
int resctrl_arch_update_domains(struct rdt_resource *r, u32 closid);

-bool resctrl_enable_mon_event(enum resctrl_event_id eventid, bool any_cpu,
+bool resctrl_enable_mon_event(struct rdt_resource *r,
+ enum resctrl_event_id eventid, bool any_cpu,
unsigned int binary_bits, void *arch_priv);

bool resctrl_is_mon_event_enabled(enum resctrl_event_id eventid);
--
2.34.1