linux-kernel - Re: [PATCH 4/7] perf/x86/intel/uncore: Add freerunning event descriptor helper macro

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
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1a42689e-1b4d-4634-901a-f18edd7f8a74@linux.intel.com>
Date: Tue, 23 Dec 2025 11:39:55 +0800
From: "Mi, Dapeng" <dapeng1.mi@...ux.intel.com>
To: Zide Chen <zide.chen@...el.com>, Peter Zijlstra <peterz@...radead.org>,
 Ingo Molnar <mingo@...hat.com>, Arnaldo Carvalho de Melo <acme@...nel.org>,
 Namhyung Kim <namhyung@...nel.org>, Ian Rogers <irogers@...gle.com>,
 Adrian Hunter <adrian.hunter@...el.com>,
 Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
 Andi Kleen <ak@...ux.intel.com>, Eranian Stephane <eranian@...gle.com>
Cc: linux-kernel@...r.kernel.org, linux-perf-users@...r.kernel.org,
 Xudong Hao <xudong.hao@...el.com>, Falcon Thomas <thomas.falcon@...el.com>
Subject: Re: [PATCH 4/7] perf/x86/intel/uncore: Add freerunning event
 descriptor helper macro


On 12/13/2025 5:00 AM, Zide Chen wrote:
> Freerunning counter events are repetitive: the event code is fixed to
> 0xff, the unit is always "MiB", and the scale is identical across all
> counters on a given PMON unit.
>
> Introduce a new helper macro, INTEL_UNCORE_FR_EVENT_DESC(), to populate
> the event, scale, and unit descriptor triplet. This reduces duplicated
> lines and improves readability.
>
> No functional change intended.
>
> Signed-off-by: Zide Chen <zide.chen@...el.com>
> ---
>  arch/x86/events/intel/uncore_snbep.c | 95 ++++++++--------------------
>  1 file changed, 28 insertions(+), 67 deletions(-)
>
> diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
> index bd1569876640..56c6ac86f28e 100644
> --- a/arch/x86/events/intel/uncore_snbep.c
> +++ b/arch/x86/events/intel/uncore_snbep.c
> @@ -4068,34 +4068,24 @@ static struct freerunning_counters skx_iio_freerunning[] = {
>  	[SKX_IIO_MSR_UTIL]	= { 0xb08, 0x1, 0x10, 8, 36 },
>  };
>  
> +#define INTEL_UNCORE_FR_EVENT_DESC(name, umask, scl)		\
> +	INTEL_UNCORE_EVENT_DESC(name,				\
> +		"event=0xff,umask=" __stringify(umask)),	\
> +	INTEL_UNCORE_EVENT_DESC(name.scale, __stringify(scl)),	\
> +	INTEL_UNCORE_EVENT_DESC(name.unit, "MiB")
> +
>  static struct uncore_event_desc skx_uncore_iio_freerunning_events[] = {
>  	/* Free-Running IO CLOCKS Counter */
>  	INTEL_UNCORE_EVENT_DESC(ioclk,			"event=0xff,umask=0x10"),
>  	/* Free-Running IIO BANDWIDTH Counters */
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port0,		"event=0xff,umask=0x20"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port0.scale,	"3.814697266e-6"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port0.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port1,		"event=0xff,umask=0x21"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port1.scale,	"3.814697266e-6"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port1.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port2,		"event=0xff,umask=0x22"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port2.scale,	"3.814697266e-6"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port2.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port3,		"event=0xff,umask=0x23"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port3.scale,	"3.814697266e-6"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port3.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(bw_out_port0,		"event=0xff,umask=0x24"),
> -	INTEL_UNCORE_EVENT_DESC(bw_out_port0.scale,	"3.814697266e-6"),
> -	INTEL_UNCORE_EVENT_DESC(bw_out_port0.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(bw_out_port1,		"event=0xff,umask=0x25"),
> -	INTEL_UNCORE_EVENT_DESC(bw_out_port1.scale,	"3.814697266e-6"),
> -	INTEL_UNCORE_EVENT_DESC(bw_out_port1.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(bw_out_port2,		"event=0xff,umask=0x26"),
> -	INTEL_UNCORE_EVENT_DESC(bw_out_port2.scale,	"3.814697266e-6"),
> -	INTEL_UNCORE_EVENT_DESC(bw_out_port2.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(bw_out_port3,		"event=0xff,umask=0x27"),
> -	INTEL_UNCORE_EVENT_DESC(bw_out_port3.scale,	"3.814697266e-6"),
> -	INTEL_UNCORE_EVENT_DESC(bw_out_port3.unit,	"MiB"),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port0, 0x20, 3.814697266e-6),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port1, 0x21, 3.814697266e-6),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port2, 0x22, 3.814697266e-6),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port3, 0x23, 3.814697266e-6),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port0, 0x24, 3.814697266e-6),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port1, 0x25, 3.814697266e-6),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port2, 0x26, 3.814697266e-6),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port3, 0x27, 3.814697266e-6),
>  	/* Free-running IIO UTILIZATION Counters */
>  	INTEL_UNCORE_EVENT_DESC(util_in_port0,		"event=0xff,umask=0x30"),
>  	INTEL_UNCORE_EVENT_DESC(util_out_port0,		"event=0xff,umask=0x31"),
> @@ -4910,30 +4900,14 @@ static struct uncore_event_desc snr_uncore_iio_freerunning_events[] = {
>  	/* Free-Running IIO CLOCKS Counter */
>  	INTEL_UNCORE_EVENT_DESC(ioclk,			"event=0xff,umask=0x10"),
>  	/* Free-Running IIO BANDWIDTH IN Counters */
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port0,		"event=0xff,umask=0x20"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port0.scale,	"3.0517578125e-5"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port0.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port1,		"event=0xff,umask=0x21"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port1.scale,	"3.0517578125e-5"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port1.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port2,		"event=0xff,umask=0x22"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port2.scale,	"3.0517578125e-5"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port2.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port3,		"event=0xff,umask=0x23"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port3.scale,	"3.0517578125e-5"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port3.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port4,		"event=0xff,umask=0x24"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port4.scale,	"3.0517578125e-5"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port4.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port5,		"event=0xff,umask=0x25"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port5.scale,	"3.0517578125e-5"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port5.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port6,		"event=0xff,umask=0x26"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port6.scale,	"3.0517578125e-5"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port6.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port7,		"event=0xff,umask=0x27"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port7.scale,	"3.0517578125e-5"),
> -	INTEL_UNCORE_EVENT_DESC(bw_in_port7.unit,	"MiB"),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port0, 0x20, 3.0517578125e-5),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port1, 0x21, 3.0517578125e-5),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port2, 0x22, 3.0517578125e-5),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port3, 0x23, 3.0517578125e-5),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port4, 0x24, 3.0517578125e-5),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port5, 0x25, 3.0517578125e-5),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port6, 0x26, 3.0517578125e-5),
> +	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port7, 0x27, 3.0517578125e-5),
>  	{ /* end: all zeroes */ },
>  };
>  
> @@ -5266,12 +5240,8 @@ static struct freerunning_counters snr_imc_freerunning[] = {
>  static struct uncore_event_desc snr_uncore_imc_freerunning_events[] = {
>  	INTEL_UNCORE_EVENT_DESC(dclk,		"event=0xff,umask=0x10"),
>  
> -	INTEL_UNCORE_EVENT_DESC(read,		"event=0xff,umask=0x20"),
> -	INTEL_UNCORE_EVENT_DESC(read.scale,	"6.103515625e-5"),
> -	INTEL_UNCORE_EVENT_DESC(read.unit,	"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(write,		"event=0xff,umask=0x21"),
> -	INTEL_UNCORE_EVENT_DESC(write.scale,	"6.103515625e-5"),
> -	INTEL_UNCORE_EVENT_DESC(write.unit,	"MiB"),
> +	INTEL_UNCORE_FR_EVENT_DESC(read, 0x20, 6.103515625e-5),
> +	INTEL_UNCORE_FR_EVENT_DESC(write, 0x21, 6.103515625e-5),
>  	{ /* end: all zeroes */ },
>  };
>  
> @@ -5836,19 +5806,10 @@ static struct freerunning_counters icx_imc_freerunning[] = {
>  static struct uncore_event_desc icx_uncore_imc_freerunning_events[] = {
>  	INTEL_UNCORE_EVENT_DESC(dclk,			"event=0xff,umask=0x10"),
>  
> -	INTEL_UNCORE_EVENT_DESC(read,			"event=0xff,umask=0x20"),
> -	INTEL_UNCORE_EVENT_DESC(read.scale,		"6.103515625e-5"),
> -	INTEL_UNCORE_EVENT_DESC(read.unit,		"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(write,			"event=0xff,umask=0x21"),
> -	INTEL_UNCORE_EVENT_DESC(write.scale,		"6.103515625e-5"),
> -	INTEL_UNCORE_EVENT_DESC(write.unit,		"MiB"),
> -
> -	INTEL_UNCORE_EVENT_DESC(ddrt_read,		"event=0xff,umask=0x30"),
> -	INTEL_UNCORE_EVENT_DESC(ddrt_read.scale,	"6.103515625e-5"),
> -	INTEL_UNCORE_EVENT_DESC(ddrt_read.unit,		"MiB"),
> -	INTEL_UNCORE_EVENT_DESC(ddrt_write,		"event=0xff,umask=0x31"),
> -	INTEL_UNCORE_EVENT_DESC(ddrt_write.scale,	"6.103515625e-5"),
> -	INTEL_UNCORE_EVENT_DESC(ddrt_write.unit,	"MiB"),
> +	INTEL_UNCORE_FR_EVENT_DESC(read, 0x20, 6.103515625e-5),
> +	INTEL_UNCORE_FR_EVENT_DESC(write, 0x21, 6.103515625e-5),
> +	INTEL_UNCORE_FR_EVENT_DESC(ddrt_read, 0x30, 6.103515625e-5),
> +	INTEL_UNCORE_FR_EVENT_DESC(ddrt_write, 0x31, 6.103515625e-5),
>  	{ /* end: all zeroes */ },
>  };
>  

Nice cleanup. 

Reviewed-by: Dapeng Mi <dapeng1.mi@...ux.intel.com>