mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Tony Luck <tony.luck@intel.com>
To: Fenghua Yu <fenghuay@nvidia.com>,
	Reinette Chatre <reinette.chatre@intel.com>,
	Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>,
	Peter Newman <peternewman@google.com>,
	James Morse <james.morse@arm.com>,
	Babu Moger <babu.moger@amd.com>,
	Drew Fustini <dfustini@baylibre.com>,
	Dave Martin <Dave.Martin@arm.com>,
	Anil Keshavamurthy <anil.s.keshavamurthy@intel.com>,
	Chen Yu <yu.c.chen@intel.com>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
	patches@lists.linux.dev, Tony Luck <tony.luck@intel.com>
Subject: [PATCH v7 17/31] x86/resctrl: Discover hardware telemetry events
Date: Fri, 11 Jul 2025 16:53:24 -0700	[thread overview]
Message-ID: <20250711235341.113933-18-tony.luck@intel.com> (raw)
In-Reply-To: <20250711235341.113933-1-tony.luck@intel.com>

Hardware has one or more telemetry event aggregators per package
for each group of telemetry events. Each aggregator provides access
to event counts in an array of 64-bit values in MMIO space. There
is a "guid" (in this case a unique 32-bit integer) which refers to
an XML file published in https://github.com/intel/Intel-PMT
that provides all the details about each aggregator.

The XML file provides the following information:
1) Which telemetry events are included in the group for this aggregator.
2) The order in which the event counters appear for each RMID.
3) The value type of each event counter (integer or fixed-point).
4) The number of RMIDs supported.
5) Which additional aggregator status registers are included.
6) The total size of the MMIO region for this aggregator.

Each aggregator makes event counters available to Linux in
a region of MMIO memory. Enumeration of these regions is
done by the INTEL_PMT_DISCOVERY discovery driver.

Add a new Kconfig option CONFIG_X86_RESCTRL_CPU_INTEL_AET for the
Intel specific parts of telemetry code. This depends on the
INTEL_PMT_DISCOVERY driver being built-in to the kernel for
enumeration of telemetry features.

Call intel_pmt_get_regions_by_feature() for each pmt_feature_id
that indicates per-RMID telemetry.

Save the returned pmt_feature_group pointers with guids that are known
to resctrl for use at run time.

Those pointers are returned to the INTEL_PMT_DISCOVERY driver at
resctrl_arch_exit() time.

Note that checkpatch complains about the alignment of additional
lines in the definition of the intel_pmt_put_feature_group
cleanup helper. I didn't find a way to appease conflicting
requirements from checkpatch.

Signed-off-by: Tony Luck <tony.luck@intel.com>
---
 arch/x86/kernel/cpu/resctrl/internal.h  |   8 ++
 arch/x86/kernel/cpu/resctrl/core.c      |   5 +
 arch/x86/kernel/cpu/resctrl/intel_aet.c | 133 ++++++++++++++++++++++++
 arch/x86/Kconfig                        |  13 +++
 arch/x86/kernel/cpu/resctrl/Makefile    |   1 +
 5 files changed, 160 insertions(+)
 create mode 100644 arch/x86/kernel/cpu/resctrl/intel_aet.c

diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index 684a1b830ced..36a2072c19c7 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -169,4 +169,12 @@ void __init intel_rdt_mbm_apply_quirk(void);
 
 void rdt_domain_reconfigure_cdp(struct rdt_resource *r);
 
+#ifdef CONFIG_X86_RESCTRL_CPU_INTEL_AET
+bool intel_aet_get_events(void);
+void __exit intel_aet_exit(void);
+#else
+static inline bool intel_aet_get_events(void) { return false; }
+static inline void __exit intel_aet_exit(void) { }
+#endif
+
 #endif /* _ASM_X86_RESCTRL_INTERNAL_H */
diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
index 2b2f76c76d73..b8288f5d4aff 100644
--- a/arch/x86/kernel/cpu/resctrl/core.c
+++ b/arch/x86/kernel/cpu/resctrl/core.c
@@ -734,6 +734,9 @@ void resctrl_arch_pre_mount(void)
 
 	if (!atomic_try_cmpxchg(&only_once, &old, 1))
 		return;
+
+	if (!intel_aet_get_events())
+		return;
 }
 
 enum {
@@ -1086,6 +1089,8 @@ late_initcall(resctrl_arch_late_init);
 
 static void __exit resctrl_arch_exit(void)
 {
+	intel_aet_exit();
+
 	cpuhp_remove_state(rdt_online);
 
 	resctrl_exit();
diff --git a/arch/x86/kernel/cpu/resctrl/intel_aet.c b/arch/x86/kernel/cpu/resctrl/intel_aet.c
new file mode 100644
index 000000000000..d177e5aa1f6a
--- /dev/null
+++ b/arch/x86/kernel/cpu/resctrl/intel_aet.c
@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Resource Director Technology(RDT)
+ * - Intel Application Energy Telemetry
+ *
+ * Copyright (C) 2025 Intel Corporation
+ *
+ * Author:
+ *    Tony Luck <tony.luck@intel.com>
+ */
+
+#define pr_fmt(fmt)   "resctrl: " fmt
+
+#include <linux/cleanup.h>
+#include <linux/cpu.h>
+#include <linux/intel_vsec.h>
+#include <linux/resctrl.h>
+
+#include "internal.h"
+
+/**
+ * struct event_group - All information about a group of telemetry events.
+ * @pfg:		Points to the aggregated telemetry space information
+ *			within the OOBMSM driver that contains data for all
+ *			telemetry regions.
+ * @list:		List of active event groups.
+ * @guid:		Unique number per XML description file.
+ */
+struct event_group {
+	/* Data fields for additional structures to manage this group. */
+	struct pmt_feature_group	*pfg;
+	struct list_head		list;
+
+	/* Remaining fields initialized from XML file. */
+	u32				guid;
+};
+
+static LIST_HEAD(active_event_groups);
+
+/*
+ * Link: https://github.com/intel/Intel-PMT
+ * File: xml/CWF/OOBMSM/RMID-ENERGY/cwf_aggregator.xml
+ */
+static struct event_group energy_0x26696143 = {
+	.guid		= 0x26696143,
+};
+
+/*
+ * Link: https://github.com/intel/Intel-PMT
+ * File: xml/CWF/OOBMSM/RMID-PERF/cwf_aggregator.xml
+ */
+static struct event_group perf_0x26557651 = {
+	.guid		= 0x26557651,
+};
+
+static struct event_group *known_energy_event_groups[] = {
+	&energy_0x26696143,
+};
+
+#define NUM_KNOWN_ENERGY_GROUPS ARRAY_SIZE(known_energy_event_groups)
+
+static struct event_group *known_perf_event_groups[] = {
+	&perf_0x26557651,
+};
+
+#define NUM_KNOWN_PERF_GROUPS ARRAY_SIZE(known_perf_event_groups)
+
+/* Stub for now */
+static int discover_events(struct event_group *e, struct pmt_feature_group *p)
+{
+	return -EINVAL;
+}
+
+DEFINE_FREE(intel_pmt_put_feature_group, struct pmt_feature_group *,
+		if (!IS_ERR_OR_NULL(_T))
+			intel_pmt_put_feature_group(_T))
+
+/*
+ * Make a request to the INTEL_PMT_DISCOVERY driver for the
+ * pmt_feature_group for a specific feature. If there is
+ * one the returned structure has an array of telemetry_region
+ * structures. Each describes one telemetry aggregator.
+ * Try to use any with a known matching guid.
+ */
+static bool get_pmt_feature(enum pmt_feature_id feature, struct event_group **evgs,
+			    unsigned int num_evg)
+{
+	struct pmt_feature_group *p __free(intel_pmt_put_feature_group) = NULL;
+	struct event_group **peg;
+	bool ret;
+
+	p = intel_pmt_get_regions_by_feature(feature);
+
+	if (IS_ERR_OR_NULL(p))
+		return false;
+
+	for (peg = evgs; peg < &evgs[num_evg]; peg++) {
+		ret = discover_events(*peg, p);
+		if (!ret) {
+			(*peg)->pfg = no_free_ptr(p);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/*
+ * Ask OOBMSM discovery driver for all the RMID based telemetry groups
+ * that it supports.
+ */
+bool intel_aet_get_events(void)
+{
+	bool ret1, ret2;
+
+	ret1 = get_pmt_feature(FEATURE_PER_RMID_ENERGY_TELEM,
+			       known_energy_event_groups, NUM_KNOWN_ENERGY_GROUPS);
+	ret2 = get_pmt_feature(FEATURE_PER_RMID_PERF_TELEM,
+			       known_perf_event_groups, NUM_KNOWN_PERF_GROUPS);
+
+	return ret1 || ret2;
+}
+
+void __exit intel_aet_exit(void)
+{
+	struct event_group *evg, *tmp;
+
+	list_for_each_entry_safe(evg, tmp, &active_event_groups, list) {
+		intel_pmt_put_feature_group(evg->pfg);
+		evg->pfg = NULL;
+		list_del(&evg->list);
+	}
+}
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 340e5468980e..21c2d1022b15 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -528,6 +528,19 @@ config X86_CPU_RESCTRL
 
 	  Say N if unsure.
 
+config X86_RESCTRL_CPU_INTEL_AET
+	bool "Intel Application Energy Telemetry" if INTEL_PMT_DISCOVERY=y
+	depends on X86_CPU_RESCTRL && CPU_SUP_INTEL
+	help
+	  Enable per-RMID telemetry events in resctrl
+
+	  Intel feature that collects per-RMID execution data
+	  about energy consumption, measure of frequency independent
+	  activity and other performance metrics. Data is aggregated
+	  per package.
+
+	  Say N if unsure.
+
 config X86_FRED
 	bool "Flexible Return and Event Delivery"
 	depends on X86_64
diff --git a/arch/x86/kernel/cpu/resctrl/Makefile b/arch/x86/kernel/cpu/resctrl/Makefile
index d8a04b195da2..c86df4b23993 100644
--- a/arch/x86/kernel/cpu/resctrl/Makefile
+++ b/arch/x86/kernel/cpu/resctrl/Makefile
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_X86_CPU_RESCTRL)		+= core.o rdtgroup.o monitor.o
 obj-$(CONFIG_X86_CPU_RESCTRL)		+= ctrlmondata.o
+obj-$(CONFIG_X86_RESCTRL_CPU_INTEL_AET)	+= intel_aet.o
 obj-$(CONFIG_RESCTRL_FS_PSEUDO_LOCK)	+= pseudo_lock.o
 
 # To allow define_trace.h's recursive include:
-- 
2.50.0


  parent reply	other threads:[~2025-07-11 23:54 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-11 23:53 [PATCH v7 00/31] x86,fs/resctrl telemetry monitoring Tony Luck
2025-07-11 23:53 ` [PATCH v7 01/31] x86,fs/resctrl: Consolidate monitor event descriptions Tony Luck
2025-07-17 17:51   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 02/31] x86,fs/resctrl: Replace architecture event enabled checks Tony Luck
2025-07-11 23:53 ` [PATCH v7 03/31] x86/resctrl: Remove 'rdt_mon_features' global variable Tony Luck
2025-07-11 23:53 ` [PATCH v7 04/31] x86,fs/resctrl: Prepare for more monitor events Tony Luck
2025-07-11 23:53 ` [PATCH v7 05/31] x86,fs/resctrl: Improve domain type checking Tony Luck
2025-07-25 23:17   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 06/31] x86/resctrl: Move L3 initialization into new helper function Tony Luck
2025-07-25 23:21   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 07/31] x86,fs/resctrl: Refactor domain_remove_cpu_mon() ready for new domain types Tony Luck
2025-07-25 23:29   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 08/31] x86/resctrl: Clean up domain_remove_cpu_ctrl() Tony Luck
2025-07-25 23:22   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 09/31] x86,fs/resctrl: Use struct rdt_domain_hdr instead of struct rdt_mon_domain Tony Luck
2025-07-25 23:25   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 10/31] x86,fs/resctrl: Rename struct rdt_mon_domain and rdt_hw_mon_domain Tony Luck
2025-07-25 23:26   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 11/31] x86,fs/resctrl: Rename some L3 specific functions Tony Luck
2025-07-25 23:26   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 12/31] fs/resctrl: Make event details accessible to functions when reading events Tony Luck
2025-07-25 23:27   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 13/31] x86,fs/resctrl: Handle events that can be read from any CPU Tony Luck
2025-07-25 23:32   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 14/31] x86,fs/resctrl: Support binary fixed point event counters Tony Luck
2025-07-25 23:34   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 15/31] x86,fs/resctrl: Add an architectural hook called for each mount Tony Luck
2025-07-25 23:35   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 16/31] x86,fs/resctrl: Add and initialize rdt_resource for package scope core monitor Tony Luck
2025-07-25 23:36   ` Reinette Chatre
2025-07-11 23:53 ` Tony Luck [this message]
2025-07-25 23:39   ` [PATCH v7 17/31] x86/resctrl: Discover hardware telemetry events Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 18/31] x86/resctrl: Count valid telemetry aggregators per package Tony Luck
2025-07-25 23:40   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 19/31] x86/resctrl: Complete telemetry event enumeration Tony Luck
2025-07-25 23:41   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 20/31] x86,fs/resctrl: Fill in details of events for guid 0x26696143 and 0x26557651 Tony Luck
2025-07-25 23:43   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 21/31] x86,fs/resctrl: Add architectural event pointer Tony Luck
2025-07-25 23:43   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 22/31] x86/resctrl: Read telemetry events Tony Luck
2025-07-25 23:45   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 23/31] x86/resctrl: Handle domain creation/deletion for RDT_RESOURCE_PERF_PKG Tony Luck
2025-07-25 23:46   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 24/31] x86/resctrl: Add energy/perf choices to rdt boot option Tony Luck
2025-07-25 23:46   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 25/31] x86/resctrl: Handle number of RMIDs supported by telemetry resources Tony Luck
2025-07-25 23:49   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 26/31] fs/resctrl: Fix life-cycle of closid_num_dirty_rmid Tony Luck
2025-07-25 23:51   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 27/31] x86,fs/resctrl: Move RMID initialization to first mount Tony Luck
2025-07-25 23:53   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 28/31] x86/resctrl: Enable RDT_RESOURCE_PERF_PKG Tony Luck
2025-07-25 23:54   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 29/31] fs/resctrl: Provide interface to create architecture specific debugfs area Tony Luck
2025-07-25 23:55   ` Reinette Chatre
2025-07-11 23:53 ` [PATCH v7 30/31] x86/resctrl: Add debugfs files to show telemetry aggregator status Tony Luck
2025-07-11 23:53 ` [PATCH v7 31/31] x86,fs/resctrl: Update Documentation for package events Tony Luck
2025-07-30 18:42 ` [PATCH v7 00/31] x86,fs/resctrl telemetry monitoring Moger, Babu
2025-07-30 20:27   ` Reinette Chatre
2025-07-30 22:05     ` Moger, Babu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250711235341.113933-18-tony.luck@intel.com \
    --to=tony.luck@intel.com \
    --cc=Dave.Martin@arm.com \
    --cc=anil.s.keshavamurthy@intel.com \
    --cc=babu.moger@amd.com \
    --cc=dfustini@baylibre.com \
    --cc=fenghuay@nvidia.com \
    --cc=james.morse@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maciej.wieczor-retman@intel.com \
    --cc=patches@lists.linux.dev \
    --cc=peternewman@google.com \
    --cc=reinette.chatre@intel.com \
    --cc=x86@kernel.org \
    --cc=yu.c.chen@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®