Commit 314dfe10 authored by Peter Zijlstra (Intel)'s avatar Peter Zijlstra (Intel) Committed by Peter Zijlstra
Browse files

perf/x86/intel: Apply static call for drain_pebs 



The x86_pmu_drain_pebs static call was introduced in commit 7c9903c9
("x86/perf, static_call: Optimize x86_pmu methods"), but it's not really
used to replace the old method.

Apply the static call for drain_pebs.

Fixes: 7c9903c9 ("x86/perf, static_call: Optimize x86_pmu methods")
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20250121152303.3128733-1-kan.liang@linux.intel.com
parent 83179cd6

arch/x86/events/intel/core.c

+1 −1
Original line number Diff line number Diff line
@@ -3076,7 +3076,7 @@ static int handle_pmi_common(struct pt_regs *regs, u64 status) 


		handled++;

		x86_pmu_handle_guest_pebs(regs, &data);

		x86_pmu.drain_pebs(regs, &data);

		static_call(x86_pmu_drain_pebs)(regs, &data);

		status &= intel_ctrl | GLOBAL_STATUS_TRACE_TOPAPMI;



		/*

arch/x86/events/intel/ds.c

+1 −1
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ static inline void intel_pmu_drain_pebs_buffer(void) 
{

	struct perf_sample_data data;



	x86_pmu.drain_pebs(NULL, &data);

	static_call(x86_pmu_drain_pebs)(NULL, &data);

}



/*

arch/x86/events/perf_event.h

+1 −0
Original line number Diff line number Diff line
@@ -1107,6 +1107,7 @@ extern struct x86_pmu x86_pmu __read_mostly; 


DECLARE_STATIC_CALL(x86_pmu_set_period, *x86_pmu.set_period);

DECLARE_STATIC_CALL(x86_pmu_update,     *x86_pmu.update);

DECLARE_STATIC_CALL(x86_pmu_drain_pebs,	*x86_pmu.drain_pebs);



static __always_inline struct x86_perf_task_context_opt *task_context_opt(void *ctx)

{