Re: [PATCH v5 20/29] x86,fs/resctrl: Fill in details of Clearwater Forest events

[Fenghua Yu]

Hi, Tony,

On 5/21/25 15:50, Tony Luck wrote:
> Clearwater Forest supports two energy related telemetry events
> and seven perf style events. The counters are arranged in per-RMID
> blocks like this:
>
> 	MMIO offset:0x00 Counter for RMID 0 Event 0
> 	MMIO offset:0x08 Counter for RMID 0 Event 1
> 	MMIO offset:0x10 Counter for RMID 0 Event 2
> 	MMIO offset:0x18 Counter for RMID 1 Event 0
> 	MMIO offset:0x20 Counter for RMID 1 Event 1
> 	MMIO offset:0x28 Counter for RMID 1 Event 2
> 	...
>
> 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@xxxxxxxxx>
> ---
>   include/linux/resctrl_types.h           | 11 ++++++
>   arch/x86/kernel/cpu/resctrl/intel_aet.c | 33 ++++++++++++++++++
>   fs/resctrl/monitor.c                    | 45 +++++++++++++++++++++++++
>   3 files changed, 89 insertions(+)
>
> diff --git a/include/linux/resctrl_types.h b/include/linux/resctrl_types.h
> index b468bfbab9ea..455b29a0a9b9 100644
> --- a/include/linux/resctrl_types.h
> +++ b/include/linux/resctrl_types.h
> @@ -43,6 +43,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 2316198eb69e..bf8e2a6126d2 100644
> --- a/arch/x86/kernel/cpu/resctrl/intel_aet.c
> +++ b/arch/x86/kernel/cpu/resctrl/intel_aet.c
> @@ -34,6 +34,20 @@ struct mmio_info {
>   	void __iomem	*addrs[] __counted_by(count);
>   };
>   
> +/**
> + * struct pmt_event - Telemetry event.
> + * @evtid:	Resctrl event id
> + * @evt_idx:	Counter index within each per-RMID block of counters
> + * @bin_bits:	Zero for integer valued events, else number bits in fixed-point
> + */
> +struct pmt_event {
> +	enum resctrl_event_id	evtid;
> +	int			evt_idx;
> +	int			bin_bits;
> +};
> +
> +#define EVT(id, idx, bits) { .evtid = id, .evt_idx = idx, .bin_bits = bits }
> +
>   /**
>    * struct event_group - All information about a group of telemetry events.
>    * @pfg:		Points to the aggregated telemetry space information
> @@ -42,6 +56,8 @@ struct mmio_info {
>    * @pkginfo:		Per-package MMIO addresses of telemetry regions belonging to this group
>    * @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 used by this code. */
> @@ -51,6 +67,8 @@ struct event_group {
>   	/* Remaining fields initialized from XML file. */
>   	u32				guid;
>   	size_t				mmio_size;
> +	int				num_events;
> +	struct pmt_event		evts[] __counted_by(num_events);
>   };
>   
>   /*
> @@ -60,6 +78,11 @@ struct event_group {
>   static struct event_group energy_0x26696143 = {
>   	.guid		= 0x26696143,
>   	.mmio_size	= (576 * 2 + 3) * 8,
> +	.num_events	= 2,
> +	.evts				= {
Please align the "=" with the above "=".
> +		EVT(PMT_EVENT_ENERGY, 0, 18),
> +		EVT(PMT_EVENT_ACTIVITY, 1, 18),
> +	}
>   };
>   
>   /*
> @@ -69,6 +92,16 @@ static struct event_group energy_0x26696143 = {
>   static struct event_group perf_0x26557651 = {
>   	.guid		= 0x26557651,
>   	.mmio_size	= (576 * 7 + 3) * 8,
> +	.num_events	= 7,
> +	.evts				= {

Ditto.

[SNIP]

Thanks.

-Fenghua