| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250407234032.241215-16-tony.luck@intel.com>
Date: Mon, 7 Apr 2025 16:40:17 -0700
From: Tony Luck <tony.luck@...el.com>
To: Fenghua Yu <fenghuay@...dia.com>,
Reinette Chatre <reinette.chatre@...el.com>,
Maciej Wieczor-Retman <maciej.wieczor-retman@...el.com>,
Peter Newman <peternewman@...gle.com>,
James Morse <james.morse@....com>,
Babu Moger <babu.moger@....com>,
Drew Fustini <dfustini@...libre.com>,
Dave Martin <Dave.Martin@....com>,
Anil Keshavamurthy <anil.s.keshavamurthy@...el.com>
Cc: linux-kernel@...r.kernel.org,
patches@...ts.linux.dev,
Tony Luck <tony.luck@...el.com>
Subject: [PATCH v3 15/26] x86/resctrl: Second stage of telemetry event enumeration
Scan the telemetry_region structures looking for recognised guid
values. Count how many are found in each package.
Note that telemetry support depends on at least one of the
original RDT monitoring features being enabled (so that the
CPU hotplug notifiers for resctrl are running).
Signed-off-by: Tony Luck <tony.luck@...el.com>
---
arch/x86/kernel/cpu/resctrl/intel_aet.c | 112 +++++++++++++++++++++++-
1 file changed, 110 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/resctrl/intel_aet.c b/arch/x86/kernel/cpu/resctrl/intel_aet.c
index 8e531ad279b5..9d414dd40f8b 100644
--- a/arch/x86/kernel/cpu/resctrl/intel_aet.c
+++ b/arch/x86/kernel/cpu/resctrl/intel_aet.c
@@ -23,10 +23,100 @@
static struct pmt_feature_group *feat_energy;
static struct pmt_feature_group *feat_perf;
+/* Per-package event groups active on this machine */
+static struct pkg_info {
+ int count;
+ struct telemetry_region *regions;
+} *pkg_info;
+
+/**
+ * struct pmt_event - Telemetry event.
+ * @evtid: Resctrl event id
+ * @evt_offset: MMIO offset of counter
+ * @type: Type for format user display of event value
+ */
+struct pmt_event {
+ enum resctrl_event_id evtid;
+ int evt_offset;
+ enum resctrl_event_type type;
+};
+
+/**
+ * struct telem_entry - Summarized form from XML telemetry description
+ * @name: Name for this group of events
+ * @guid: Unique ID for this group
+ * @size: Size of MMIO mapped counter registers
+ * @num_rmids: Number of RMIDS supported
+ * @overflow_counter_off: Offset of overflow count
+ * @last_overflow_tstamp_off: Offset of overflow timestamp
+ * @last_update_tstamp_off: Offset of last update timestamp
+ * @active: Marks this group as active on this system
+ * @num_events: Size of @evts array
+ * @evts: Telemetry events in this group
+ */
+struct telem_entry {
+ char *name;
+ int guid;
+ int size;
+ int num_rmids;
+ int overflow_counter_off;
+ int last_overflow_tstamp_off;
+ int last_update_tstamp_off;
+ bool active;
+ int num_events;
+ struct pmt_event evts[];
+};
+
+/* All known telemetry event groups */
+static struct telem_entry *telem_entry[] = {
+ NULL
+};
+
+/*
+ * Scan a feature group looking for guids recognized
+ * and update the per-package counts of known groups.
+ */
+static bool count_events(struct pkg_info *pkg, int max_pkgs, struct pmt_feature_group *p)
+{
+ struct telem_entry **tentry;
+ bool found = false;
+
+ if (IS_ERR_OR_NULL(p))
+ return false;
+
+ for (int i = 0; i < p->count; i++) {
+ struct telemetry_region *tr = &p->regions[i];
+
+ for (tentry = telem_entry; *tentry; tentry++) {
+ if (tr->guid == (*tentry)->guid) {
+ if (tr->plat_info.package_id > max_pkgs) {
+ pr_warn_once("Bad package %d\n", tr->plat_info.package_id);
+ continue;
+ }
+ if (tr->size > (*tentry)->size) {
+ pr_warn_once("MMIO region for guid 0x%x too small\n", tr->guid);
+ continue;
+ }
+ found = true;
+ (*tentry)->active = true;
+ pkg[tr->plat_info.package_id].count++;
+ break;
+ }
+ }
+ }
+
+ return found;
+}
+
DEFINE_FREE(intel_pmt_put_feature_group, struct pmt_feature_group *, \
if (!IS_ERR_OR_NULL(_T)) \
intel_pmt_put_feature_group(_T))
+DEFINE_FREE(free_pkg_info, struct pkg_info *, \
+ if (_T) \
+ for (int i = 0; i < topology_max_packages(); i++) \
+ kfree(_T[i].regions); \
+ kfree(_T))
/*
* Ask OOBMSM discovery driver for all the RMID based telemetry groups
* that it supports.
@@ -35,20 +125,32 @@ bool intel_aet_get_events(void)
{
struct pmt_feature_group *p1 __free(intel_pmt_put_feature_group) = NULL;
struct pmt_feature_group *p2 __free(intel_pmt_put_feature_group) = NULL;
+ struct pkg_info *pkg __free(free_pkg_info) = NULL;
+ int num_pkgs = topology_max_packages();
bool use_p1, use_p2;
+ pkg = kcalloc(num_pkgs, sizeof(*pkg_info), GFP_KERNEL);
+ if (!pkg)
+ return false;
+
p1 = intel_pmt_get_regions_by_feature(FEATURE_PER_RMID_ENERGY_TELEM);
p2 = intel_pmt_get_regions_by_feature(FEATURE_PER_RMID_PERF_TELEM);
- use_p1 = !IS_ERR_OR_NULL(p1);
- use_p2 = !IS_ERR_OR_NULL(p2);
+ use_p1 = count_events(pkg, num_pkgs, p1);
+ use_p2 = count_events(pkg, num_pkgs, p2);
if (!use_p1 && !use_p2)
return false;
+ if (!resctrl_arch_mon_capable()) {
+ pr_info("Telemetry available but monitor support disabled\n");
+ return false;
+ }
+
if (use_p1)
feat_energy = no_free_ptr(p1);
if (use_p2)
feat_perf = no_free_ptr(p2);
+ pkg_info = no_free_ptr(pkg);
return true;
}
@@ -59,4 +161,10 @@ void __exit intel_aet_exit(void)
intel_pmt_put_feature_group(feat_energy);
if (feat_perf)
intel_pmt_put_feature_group(feat_perf);
+
+ if (pkg_info) {
+ for (int i = 0; i < topology_max_packages(); i++)
+ kfree(pkg_info[i].regions);
+ }
+ kfree(pkg_info);
}
--
2.48.1
Powered by blists - more mailing lists