There are now three meanings for "number of RMIDs":
1) The number for legacy features enumerated by CPUID leaf 0xF. This
is the maximum number of distinct values that can be loaded into the
IA32_PQR_ASSOC MSR. Note that systems with Sub-NUMA Cluster mode enabled
will force scaling down the CPUID enumerated value by the number of SNC
nodes per L3-cache.
2) The number of registers in MMIO space for each event. This
is enumerated in the XML files and is the value placed into
event_group::num_rmids.
3) The number of "h/w counters" (this isn't a strictly accurate
description of how things work, but serves as a useful analogy that
does describe the limitations) feeding to those MMIO registers. This
is enumerated in telemetry_region::num_rmids returned from the call to
intel_pmt_get_regions_by_feature()
Event groups with insufficient "h/w counter" to track all RMIDs are
difficult for users to use, since the system may reassign "h/w counters"
as any time. This means that users cannot reliably collect two consecutive
event counts to compute the rate at which events are occurring.
Ignore such under-resourced event groups unless the user explicitly
requests to enable them using the "rdt=" Linux boot argument.
Scan all enabled event groups and assign the RDT_RESOURCE_PERF_PKG
resource "num_rmids" value to the smallest of these values to ensure
that all resctrl groups have equal monitor capabilities.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
arch/x86/kernel/cpu/resctrl/internal.h | 2 ++
arch/x86/kernel/cpu/resctrl/intel_aet.c | 25 +++++++++++++++++++++++++
arch/x86/kernel/cpu/resctrl/monitor.c | 2 ++
3 files changed, 29 insertions(+)
diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index 92cbba9d82a8..31499bcd2065 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -18,6 +18,8 @@
#define RMID_VAL_UNAVAIL BIT_ULL(62)
+extern int rdt_num_system_rmids;
+
/*
* With the above fields in use 62 bits remain in MSR_IA32_QM_CTR for
* data to be returned. The counter width is discovered from the hardware
diff --git a/arch/x86/kernel/cpu/resctrl/intel_aet.c b/arch/x86/kernel/cpu/resctrl/intel_aet.c
index aacaedcc7b74..eec5eb625f13 100644
--- a/arch/x86/kernel/cpu/resctrl/intel_aet.c
+++ b/arch/x86/kernel/cpu/resctrl/intel_aet.c
@@ -14,6 +14,7 @@
#include <linux/cleanup.h>
#include <linux/cpu.h>
#include <linux/io.h>
+#include <linux/minmax.h>
#include <linux/resctrl.h>
/* Temporary - delete from final version */
@@ -51,6 +52,7 @@ struct pmt_event {
* @pfg: The pmt_feature_group for this event group
* @name: Name for this group
* @guid: Unique number per XML description file
+ * @num_rmids: Number of RMIDS supported by this group
* @mmio_size: Number of bytes of mmio registers for this group
* @pkginfo: Per-package MMIO addresses
* @num_events: Number of events in this group
@@ -60,6 +62,7 @@ struct event_group {
struct pmt_feature_group *pfg;
char *name;
int guid;
+ int num_rmids;
int mmio_size;
struct mmio_info **pkginfo;
int num_events;
@@ -70,6 +73,7 @@ struct event_group {
static struct event_group energy_0x26696143 = {
.name = "energy",
.guid = 0x26696143,
+ .num_rmids = 576,
.mmio_size = (576 * 2 + 3) * 8,
.num_events = 2,
.evts = {
@@ -82,6 +86,7 @@ static struct event_group energy_0x26696143 = {
static struct event_group perf_0x26557651 = {
.name = "perf",
.guid = 0x26557651,
+ .num_rmids = 576,
.mmio_size = (576 * 7 + 3) * 8,
.num_events = 7,
.evts = {
@@ -214,6 +219,15 @@ static bool get_pmt_feature(enum pmt_feature_id feature)
if ((*peg)->guid == p->regions[i].guid) {
if (rdt_check_option((*peg)->name, false, true))
return false;
+ /*
+ * Ignore event group with insufficient RMIDs unless the
+ * user used the rdt= boot option to specifically ask
+ * for it to be enabled.
+ */
+ if (p->regions[i].num_rmids < rdt_num_system_rmids &&
+ !rdt_check_option((*peg)->name, true, false))
+ return false;
+ (*peg)->num_rmids = p->regions[i].num_rmids;
ret = configure_events((*peg), p);
if (ret) {
(*peg)->pfg = no_free_ptr(p);
@@ -233,11 +247,22 @@ static bool get_pmt_feature(enum pmt_feature_id feature)
*/
bool intel_aet_get_events(void)
{
+ struct rdt_resource *r = &rdt_resources_all[RDT_RESOURCE_PERF_PKG].r_resctrl;
+ struct event_group **eg;
bool ret1, ret2;
ret1 = get_pmt_feature(FEATURE_PER_RMID_ENERGY_TELEM);
ret2 = get_pmt_feature(FEATURE_PER_RMID_PERF_TELEM);
+ for (eg = &known_event_groups[0]; eg < &known_event_groups[NUM_KNOWN_GROUPS]; eg++) {
+ if (!(*eg)->pfg)
+ continue;
+ if (r->num_rmid)
+ r->num_rmid = min(r->num_rmid, (*eg)->num_rmids);
+ else
+ r->num_rmid = (*eg)->num_rmids;
+ }
+
return ret1 || ret2;
}
diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
index 04214585824b..7e3a68058b90 100644
--- a/arch/x86/kernel/cpu/resctrl/monitor.c
+++ b/arch/x86/kernel/cpu/resctrl/monitor.c
@@ -32,6 +32,7 @@ bool rdt_mon_capable;
#define CF(cf) ((unsigned long)(1048576 * (cf) + 0.5))
+int rdt_num_system_rmids;
static int snc_nodes_per_l3_cache = 1;
/*
@@ -354,6 +355,7 @@ int __init rdt_get_mon_l3_config(struct rdt_resource *r)
resctrl_rmid_realloc_limit = boot_cpu_data.x86_cache_size * 1024;
hw_res->mon_scale = boot_cpu_data.x86_cache_occ_scale / snc_nodes_per_l3_cache;
r->num_rmid = (boot_cpu_data.x86_cache_max_rmid + 1) / snc_nodes_per_l3_cache;
+ rdt_num_system_rmids = r->num_rmid;
hw_res->mbm_width = MBM_CNTR_WIDTH_BASE;
if (mbm_offset > 0 && mbm_offset <= MBM_CNTR_WIDTH_OFFSET_MAX)
--
2.48.1