Commit f9bc8e09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull perf event fixes from Ingo Molnar:
 "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"

* tag 'perf-urgent-2025-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel/uncore: Add uncore PMU support for Wildcat Lake
  perf/x86/intel: Add PMU support for WildcatLake
  perf/x86/intel: Fix KASAN global-out-of-bounds warning
parents 74131a0f f4c12e5c

arch/x86/events/intel/core.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

arch/x86/events/intel/ds.c

+2 −1
Original line number Diff line number Diff line
@@ -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];

arch/x86/events/intel/uncore.c

+1 −0
Original line number Diff line number Diff line
@@ -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),