Skip to content

Commit f9bc8e0

Browse files
committed
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
2 parents 74131a0 + f4c12e5 commit f9bc8e0

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

arch/x86/events/intel/core.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7596,6 +7596,7 @@ __init int intel_pmu_init(void)
75967596
break;
75977597

75987598
case INTEL_PANTHERLAKE_L:
7599+
case INTEL_WILDCATLAKE_L:
75997600
pr_cont("Pantherlake Hybrid events, ");
76007601
name = "pantherlake_hybrid";
76017602
goto lnl_common;

arch/x86/events/intel/ds.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,8 @@ static u64 __grt_latency_data(struct perf_event *event, u64 status,
317317
{
318318
u64 val;
319319

320-
WARN_ON_ONCE(hybrid_pmu(event->pmu)->pmu_type == hybrid_big);
320+
WARN_ON_ONCE(is_hybrid() &&
321+
hybrid_pmu(event->pmu)->pmu_type == hybrid_big);
321322

322323
dse &= PERF_PEBS_DATA_SOURCE_GRT_MASK;
323324
val = hybrid_var(event->pmu, pebs_data_source)[dse];

arch/x86/events/intel/uncore.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1895,6 +1895,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {
18951895
X86_MATCH_VFM(INTEL_ARROWLAKE_H, &mtl_uncore_init),
18961896
X86_MATCH_VFM(INTEL_LUNARLAKE_M, &lnl_uncore_init),
18971897
X86_MATCH_VFM(INTEL_PANTHERLAKE_L, &ptl_uncore_init),
1898+
X86_MATCH_VFM(INTEL_WILDCATLAKE_L, &ptl_uncore_init),
18981899
X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, &spr_uncore_init),
18991900
X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, &spr_uncore_init),
19001901
X86_MATCH_VFM(INTEL_GRANITERAPIDS_X, &gnr_uncore_init),

0 commit comments

Comments
 (0)