[GIT PULL] perf events fixes

Ingo Molnar posted 1 patch 3 months, 1 week ago
There is a newer version of this series
arch/x86/events/intel/core.c   | 1 +
arch/x86/events/intel/ds.c     | 3 ++-
arch/x86/events/intel/uncore.c | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
[GIT PULL] perf events fixes
Posted by Ingo Molnar 3 months, 1 week ago
Linus,

Please pull the latest perf/urgent Git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-2025-11-01

   # HEAD: f4c12e5cefc8ec2eda93bc17ea734407228449ab perf/x86/intel/uncore: Add uncore PMU support for Wildcat Lake

Miscellaneous fixes and CPU model updates:

 - Fix an out-of-bounds access on non-hybrid platforms in the
   Intel PMU DS code, reported by KASAN.

 - Add WildcatLake PMU and uncore support: it's identical to the
   PantherLake version.

 Thanks,

	Ingo

------------------>
Dapeng Mi (2):
      perf/x86/intel: Fix KASAN global-out-of-bounds warning
      perf/x86/intel: Add PMU support for WildcatLake

dongsheng (1):
      perf/x86/intel/uncore: Add uncore PMU support for Wildcat Lake


 arch/x86/events/intel/core.c   | 1 +
 arch/x86/events/intel/ds.c     | 3 ++-
 arch/x86/events/intel/uncore.c | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 28f5468a6ea3..fe65be0b9d9c 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -7596,6 +7596,7 @@ __init int intel_pmu_init(void)
 		break;
 
 	case INTEL_PANTHERLAKE_L:
+	case INTEL_WILDCATLAKE_L:
 		pr_cont("Pantherlake Hybrid events, ");
 		name = "pantherlake_hybrid";
 		goto lnl_common;
diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c
index c0b7ac1c7594..01bc59e9286c 100644
--- a/arch/x86/events/intel/ds.c
+++ b/arch/x86/events/intel/ds.c
@@ -317,7 +317,8 @@ static u64 __grt_latency_data(struct perf_event *event, u64 status,
 {
 	u64 val;
 
-	WARN_ON_ONCE(hybrid_pmu(event->pmu)->pmu_type == hybrid_big);
+	WARN_ON_ONCE(is_hybrid() &&
+		     hybrid_pmu(event->pmu)->pmu_type == hybrid_big);
 
 	dse &= PERF_PEBS_DATA_SOURCE_GRT_MASK;
 	val = hybrid_var(event->pmu, pebs_data_source)[dse];
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index a762f7f5b161..d6c945cc5d07 100644
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -1895,6 +1895,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {
 	X86_MATCH_VFM(INTEL_ARROWLAKE_H,	&mtl_uncore_init),
 	X86_MATCH_VFM(INTEL_LUNARLAKE_M,	&lnl_uncore_init),
 	X86_MATCH_VFM(INTEL_PANTHERLAKE_L,	&ptl_uncore_init),
+	X86_MATCH_VFM(INTEL_WILDCATLAKE_L,	&ptl_uncore_init),
 	X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X,	&spr_uncore_init),
 	X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X,	&spr_uncore_init),
 	X86_MATCH_VFM(INTEL_GRANITERAPIDS_X,	&gnr_uncore_init),
Re: [GIT PULL] perf events fixes
Posted by pr-tracker-bot@kernel.org 3 months, 1 week ago
The pull request you sent on Sat, 1 Nov 2025 08:13:38 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-2025-11-01

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f9bc8e0912b8f6b1d60608a715a1da575670e038

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html