[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <e1ed273e-ec4a-076b-45ed-e6f17f063194@linux.intel.com>
Date: Mon, 1 Sep 2025 11:57:07 +0300 (EEST)
From: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
To: Tony Luck <tony.luck@...el.com>
cc: 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>, Chen Yu <yu.c.chen@...el.com>,
x86@...nel.org, linux-kernel@...r.kernel.org, patches@...ts.linux.dev
Subject: Re: [PATCH v9 18/31] x86,fs/resctrl: Fill in details of events for
guid 0x26696143 and 0x26557651
On Fri, 29 Aug 2025, Tony Luck wrote:
> The Intel Clearwater Forest CPU supports two RMID-based pmt feature
> groups documented in the xml/CWF/OOBMSM/RMID-ENERGY/cwf_aggregator.xml
> and xml/CWF/OOBMSM/RMID-PERF/cwf_aggregator.xml files in the Intel PMT
> GIT repository here:
>
> Link: https://github.com/intel/Intel-PMT
>
> The offsets in MMIO space are arranged in groups for each RMID.
>
> E.g the "energy" counters for guid 0x26696143 are arranged like this:
>
> MMIO offset:0x0000 Counter for RMID 0 PMT_EVENT_ENERGY
> MMIO offset:0x0008 Counter for RMID 0 PMT_EVENT_ACTIVITY
> MMIO offset:0x0010 Counter for RMID 1 PMT_EVENT_ENERGY
> MMIO offset:0x0018 Counter for RMID 1 PMT_EVENT_ACTIVITY
> ...
> MMIO offset:0x23F0 Counter for RMID 575 PMT_EVENT_ENERGY
> MMIO offset:0x23F8 Counter for RMID 575 PMT_EVENT_ACTIVITY
>
> Define these events in the file system code and add the events
> to the event_group structures.
>
> PMT_EVENT_ENERGY and PMT_EVENT_ACTIVITY are produced in fixed point
> format. File system code must output as floating point values.
>
> Signed-off-by: Tony Luck <tony.luck@...el.com>
> ---
> include/linux/resctrl_types.h | 11 +++++++
> arch/x86/kernel/cpu/resctrl/intel_aet.c | 41 +++++++++++++++++++++++++
> fs/resctrl/monitor.c | 35 ++++++++++++---------
> 3 files changed, 72 insertions(+), 15 deletions(-)
>
> diff --git a/include/linux/resctrl_types.h b/include/linux/resctrl_types.h
> index d98351663c2c..6838b02d5ca3 100644
> --- a/include/linux/resctrl_types.h
> +++ b/include/linux/resctrl_types.h
> @@ -47,6 +47,17 @@ enum resctrl_event_id {
> QOS_L3_MBM_TOTAL_EVENT_ID = 0x02,
> QOS_L3_MBM_LOCAL_EVENT_ID = 0x03,
>
> + /* Intel Telemetry Events */
> + PMT_EVENT_ENERGY,
> + PMT_EVENT_ACTIVITY,
> + PMT_EVENT_STALLS_LLC_HIT,
> + PMT_EVENT_C1_RES,
> + PMT_EVENT_UNHALTED_CORE_CYCLES,
> + PMT_EVENT_STALLS_LLC_MISS,
> + PMT_EVENT_AUTO_C6_RES,
> + PMT_EVENT_UNHALTED_REF_CYCLES,
> + PMT_EVENT_UOPS_RETIRED,
> +
> /* Must be the last */
> QOS_NUM_EVENTS,
> };
> diff --git a/arch/x86/kernel/cpu/resctrl/intel_aet.c b/arch/x86/kernel/cpu/resctrl/intel_aet.c
> index 45cadbb87dc8..565777841f5c 100644
> --- a/arch/x86/kernel/cpu/resctrl/intel_aet.c
> +++ b/arch/x86/kernel/cpu/resctrl/intel_aet.c
> @@ -18,12 +18,30 @@
>
> #include "internal.h"
>
> +/**
> + * struct pmt_event - Telemetry event.
> + * @id: Resctrl event id.
> + * @idx: Counter index within each per-RMID block of counters.
> + * @bin_bits: Zero for integer valued events, else number bits in fraction
> + * part of fixed-point.
> + */
> +struct pmt_event {
> + enum resctrl_event_id id;
> + unsigned int idx;
> + unsigned int bin_bits;
> +};
> +
> +#define EVT(_id, _idx, _bits) { .id = _id, .idx = _idx, .bin_bits = _bits }
> +
> /**
> * struct event_group - All information about a group of telemetry events.
> * @pfg: Points to the aggregated telemetry space information
> * within the INTEL_PMT_TELEMETRY driver that contains data for all
> * telemetry regions.
> * @guid: Unique number per XML description file.
> + * @mmio_size: Number of bytes of MMIO registers for this group.
> + * @num_events: Number of events in this group.
> + * @evts: Array of event descriptors.
> */
> struct event_group {
> /* Data fields for additional structures to manage this group. */
> @@ -31,14 +49,26 @@ struct event_group {
>
> /* Remaining fields initialized from XML file. */
> u32 guid;
> + size_t mmio_size;
+ linux/types.h, although it should probably have been added in patch 17
already.
> + unsigned int num_events;
> + struct pmt_event evts[] __counted_by(num_events);
#include for __counted_by()?
> };
>
> +#define XML_MMIO_SIZE(num_rmids, num_events, num_extra_status) \
> + (((num_rmids) * (num_events) + (num_extra_status)) * sizeof(u64))
> +
> /*
> * Link: https://github.com/intel/Intel-PMT
> * File: xml/CWF/OOBMSM/RMID-ENERGY/cwf_aggregator.xml
> */
> static struct event_group energy_0x26696143 = {
> .guid = 0x26696143,
> + .mmio_size = XML_MMIO_SIZE(576, 2, 3),
> + .num_events = 2,
> + .evts = {
> + EVT(PMT_EVENT_ENERGY, 0, 18),
> + EVT(PMT_EVENT_ACTIVITY, 1, 18),
> + }
> };
>
> /*
> @@ -47,6 +77,17 @@ static struct event_group energy_0x26696143 = {
> */
> static struct event_group perf_0x26557651 = {
> .guid = 0x26557651,
> + .mmio_size = XML_MMIO_SIZE(576, 7, 3),
> + .num_events = 7,
> + .evts = {
> + EVT(PMT_EVENT_STALLS_LLC_HIT, 0, 0),
> + EVT(PMT_EVENT_C1_RES, 1, 0),
> + EVT(PMT_EVENT_UNHALTED_CORE_CYCLES, 2, 0),
> + EVT(PMT_EVENT_STALLS_LLC_MISS, 3, 0),
> + EVT(PMT_EVENT_AUTO_C6_RES, 4, 0),
> + EVT(PMT_EVENT_UNHALTED_REF_CYCLES, 5, 0),
> + EVT(PMT_EVENT_UOPS_RETIRED, 6, 0),
> + }
> };
>
> static struct event_group *known_energy_event_groups[] = {
> diff --git a/fs/resctrl/monitor.c b/fs/resctrl/monitor.c
> index 8967ab2e494a..5fad7aa6b0dd 100644
> --- a/fs/resctrl/monitor.c
> +++ b/fs/resctrl/monitor.c
> @@ -878,27 +878,32 @@ static void dom_data_exit(struct rdt_resource *r)
> mutex_unlock(&rdtgroup_mutex);
> }
>
> +#define MON_EVENT(_eventid, _name, _res, _fp) \
> + [_eventid] = { \
> + .name = _name, \
> + .evtid = _eventid, \
> + .rid = _res, \
> + .is_floating_point = _fp, \
> +}
> +
> /*
> * All available events. Architecture code marks the ones that
> * are supported by a system using resctrl_enable_mon_event()
> * to set .enabled.
> */
> struct mon_evt mon_event_all[QOS_NUM_EVENTS] = {
> - [QOS_L3_OCCUP_EVENT_ID] = {
> - .name = "llc_occupancy",
> - .evtid = QOS_L3_OCCUP_EVENT_ID,
> - .rid = RDT_RESOURCE_L3,
> - },
> - [QOS_L3_MBM_TOTAL_EVENT_ID] = {
> - .name = "mbm_total_bytes",
> - .evtid = QOS_L3_MBM_TOTAL_EVENT_ID,
> - .rid = RDT_RESOURCE_L3,
> - },
> - [QOS_L3_MBM_LOCAL_EVENT_ID] = {
> - .name = "mbm_local_bytes",
> - .evtid = QOS_L3_MBM_LOCAL_EVENT_ID,
> - .rid = RDT_RESOURCE_L3,
> - },
> + MON_EVENT(QOS_L3_OCCUP_EVENT_ID, "llc_occupancy", RDT_RESOURCE_L3, false),
> + MON_EVENT(QOS_L3_MBM_TOTAL_EVENT_ID, "mbm_total_bytes", RDT_RESOURCE_L3, false),
> + MON_EVENT(QOS_L3_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),
> };
>
> void resctrl_enable_mon_event(enum resctrl_event_id eventid, bool any_cpu, unsigned int binary_bits)
>
--
i.
Powered by blists - more mailing lists