Commit 4bcaa590 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 perf event fix from Ingo Molnar:
 "Fix PEBS-via-PT crash"

* tag 'perf-urgent-2025-05-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Fix segfault with PEBS-via-PT with sample_freq
parents c586c97d 99bcd91f

arch/x86/events/intel/ds.c

+5 −4
Original line number Diff line number Diff line
@@ -2465,8 +2465,9 @@ static void intel_pmu_drain_pebs_core(struct pt_regs *iregs, struct perf_sample_ 
				setup_pebs_fixed_sample_data);

}



static void intel_pmu_pebs_event_update_no_drain(struct cpu_hw_events *cpuc, int size)

static void intel_pmu_pebs_event_update_no_drain(struct cpu_hw_events *cpuc, u64 mask)

{

	u64 pebs_enabled = cpuc->pebs_enabled & mask;

	struct perf_event *event;

	int bit;
@@ -2477,7 +2478,7 @@ static void intel_pmu_pebs_event_update_no_drain(struct cpu_hw_events *cpuc, int 
	 * It needs to call intel_pmu_save_and_restart_reload() to

	 * update the event->count for this case.

	 */

	for_each_set_bit(bit, (unsigned long *)&cpuc->pebs_enabled, size) {

	for_each_set_bit(bit, (unsigned long *)&pebs_enabled, X86_PMC_IDX_MAX) {

		event = cpuc->events[bit];

		if (event->hw.flags & PERF_X86_EVENT_AUTO_RELOAD)

			intel_pmu_save_and_restart_reload(event, 0);
@@ -2512,7 +2513,7 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs, struct perf_sample_d 
	}



	if (unlikely(base >= top)) {

		intel_pmu_pebs_event_update_no_drain(cpuc, size);

		intel_pmu_pebs_event_update_no_drain(cpuc, mask);

		return;

	}
@@ -2626,7 +2627,7 @@ static void intel_pmu_drain_pebs_icl(struct pt_regs *iregs, struct perf_sample_d 
	       (hybrid(cpuc->pmu, fixed_cntr_mask64) << INTEL_PMC_IDX_FIXED);



	if (unlikely(base >= top)) {

		intel_pmu_pebs_event_update_no_drain(cpuc, X86_PMC_IDX_MAX);

		intel_pmu_pebs_event_update_no_drain(cpuc, mask);

		return;

	}