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

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

Pull perf events updates from Ingo Molnar:
 "Core & generic-arch updates:

   - Add support for dynamic constraints and propagate it to the Intel
     driver (Kan Liang)

   - Fix & enhance driver-specific throttling support (Kan Liang)

   - Record sample last_period before updating on the x86 and PowerPC
     platforms (Mark Barnett)

   - Make perf_pmu_unregister() usable (Peter Zijlstra)

   - Unify perf_event_free_task() / perf_event_exit_task_context()
     (Peter Zijlstra)

   - Simplify perf_event_release_kernel() and perf_event_free_task()
     (Peter Zijlstra)

   - Allocate non-contiguous AUX pages by default (Yabin Cui)

  Uprobes updates:

   - Add support to emulate NOP instructions (Jiri Olsa)

   - selftests/bpf: Add 5-byte NOP uprobe trigger benchmark (Jiri Olsa)

  x86 Intel PMU enhancements:

   - Support Intel Auto Counter Reload [ACR] (Kan Liang)

   - Add PMU support for Clearwater Forest (Dapeng Mi)

   - Arch-PEBS preparatory changes: (Dapeng Mi)
       - Parse CPUID archPerfmonExt leaves for non-hybrid CPUs
       - Decouple BTS initialization from PEBS initialization
       - Introduce pairs of PEBS static calls

  x86 AMD PMU enhancements:

   - Use hrtimer for handling overflows in the AMD uncore driver
     (Sandipan Das)

   - Prevent UMC counters from saturating (Sandipan Das)

  Fixes and cleanups:

   - Fix put_ctx() ordering (Frederic Weisbecker)

   - Fix irq work dereferencing garbage (Frederic Weisbecker)

   - Misc fixes and cleanups (Changbin Du, Frederic Weisbecker, Ian
     Rogers, Ingo Molnar, Kan Liang, Peter Zijlstra, Qing Wang, Sandipan
     Das, Thorsten Blum)"

* tag 'perf-core-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (60 commits)
  perf/headers: Clean up <linux/perf_event.h> a bit
  perf/uapi: Clean up <uapi/linux/perf_event.h> a bit
  perf/uapi: Fix PERF_RECORD_SAMPLE comments in <uapi/linux/perf_event.h>
  mips/perf: Remove driver-specific throttle support
  xtensa/perf: Remove driver-specific throttle support
  sparc/perf: Remove driver-specific throttle support
  loongarch/perf: Remove driver-specific throttle support
  csky/perf: Remove driver-specific throttle support
  arc/perf: Remove driver-specific throttle support
  alpha/perf: Remove driver-specific throttle support
  perf/apple_m1: Remove driver-specific throttle support
  perf/arm: Remove driver-specific throttle support
  s390/perf: Remove driver-specific throttle support
  powerpc/perf: Remove driver-specific throttle support
  perf/x86/zhaoxin: Remove driver-specific throttle support
  perf/x86/amd: Remove driver-specific throttle support
  perf/x86/intel: Remove driver-specific throttle support
  perf: Only dump the throttle log for the leader
  perf: Fix the throttle logic for a group
  perf/core: Add the is_event_in_freq_mode() helper to simplify the code
  ...
parents eaed94d1 e7d952cc

arch/alpha/kernel/perf_event.c

+3 −8
Original line number Diff line number Diff line
@@ -852,14 +852,9 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr, 
	alpha_perf_event_update(event, hwc, idx, alpha_pmu->pmc_max_period[idx]+1);

	perf_sample_data_init(&data, 0, hwc->last_period);



	if (alpha_perf_event_set_period(event, hwc, idx)) {

		if (perf_event_overflow(event, &data, regs)) {

			/* Interrupts coming too quickly; "throttle" the

			 * counter, i.e., disable it for a little while.

			 */

			alpha_pmu_stop(event, 0);

		}

	}

	if (alpha_perf_event_set_period(event, hwc, idx))

		perf_event_overflow(event, &data, regs);



	wrperfmon(PERFMON_CMD_ENABLE, cpuc->idx_mask);



	return;

arch/arc/kernel/perf_event.c

+2 −4
Original line number Diff line number Diff line
@@ -599,10 +599,8 @@ static irqreturn_t arc_pmu_intr(int irq, void *dev) 


		arc_perf_event_update(event, &event->hw, event->hw.idx);

		perf_sample_data_init(&data, 0, hwc->last_period);

		if (arc_pmu_event_set_period(event)) {

			if (perf_event_overflow(event, &data, regs))

				arc_pmu_stop(event, 0);

		}

		if (arc_pmu_event_set_period(event))

			perf_event_overflow(event, &data, regs);



		active_ints &= ~BIT(idx);

	} while (active_ints);

arch/csky/kernel/perf_event.c

+1 −2
Original line number Diff line number Diff line
@@ -1139,8 +1139,7 @@ static irqreturn_t csky_pmu_handle_irq(int irq_num, void *dev) 
		perf_sample_data_init(&data, 0, hwc->last_period);

		csky_pmu_event_set_period(event);



		if (perf_event_overflow(event, &data, regs))

			csky_pmu_stop_event(event);

		perf_event_overflow(event, &data, regs);

	}



	csky_pmu_enable(&csky_pmu.pmu);

arch/loongarch/kernel/perf_event.c

+1 −2
Original line number Diff line number Diff line
@@ -479,8 +479,7 @@ static void handle_associated_event(struct cpu_hw_events *cpuc, int idx, 
	if (!loongarch_pmu_event_set_period(event, hwc, idx))

		return;



	if (perf_event_overflow(event, data, regs))

		loongarch_pmu_disable_event(idx);

	perf_event_overflow(event, data, regs);

}



static irqreturn_t pmu_handle_irq(int irq, void *dev)

arch/mips/kernel/perf_event_mipsxx.c

+1 −2
Original line number Diff line number Diff line
@@ -791,8 +791,7 @@ static void handle_associated_event(struct cpu_hw_events *cpuc, 
	if (!mipspmu_event_set_period(event, hwc, idx))

		return;



	if (perf_event_overflow(event, data, regs))

		mipsxx_pmu_disable_event(idx);

	perf_event_overflow(event, data, regs);

}