Skip to content

Commit 0ba6502

Browse files
Dapeng MiPeter Zijlstra
authored andcommitted
perf/x86/intel: Fix KASAN global-out-of-bounds warning
When running "perf mem record" command on CWF, the below KASAN global-out-of-bounds warning is seen. ================================================================== BUG: KASAN: global-out-of-bounds in cmt_latency_data+0x176/0x1b0 Read of size 4 at addr ffffffffb721d000 by task dtlb/9850 Call Trace: kasan_report+0xb8/0xf0 cmt_latency_data+0x176/0x1b0 setup_arch_pebs_sample_data+0xf49/0x2560 intel_pmu_drain_arch_pebs+0x577/0xb00 handle_pmi_common+0x6c4/0xc80 The issue is caused by below code in __grt_latency_data(). The code tries to access x86_hybrid_pmu structure which doesn't exist on non-hybrid platform like CWF. WARN_ON_ONCE(hybrid_pmu(event->pmu)->pmu_type == hybrid_big) So add is_hybrid() check before calling this WARN_ON_ONCE to fix the global-out-of-bounds access issue. Fixes: 0902624 ("perf/x86/intel: Rename model-specific pebs_latency_data functions") Reported-by: Xudong Hao <xudong.hao@intel.com> Signed-off-by: Dapeng Mi <dapeng1.mi@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Zide Chen <zide.chen@intel.com> Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20251028064214.1451968-1-dapeng1.mi@linux.intel.com
1 parent dcb6fa3 commit 0ba6502

File tree

1 file changed

+2
-1
lines changed
  • arch/x86/events/intel

1 file changed

+2
-1
lines changed

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];

0 commit comments

Comments
 (0)