perf/x86/intel: Apply static call for drain_pebs

rfmvh · rfmvh · commit 6d89c1cc7eb1 · 2025-06-23T14:54:27.000+02:00
JIRA: https://issues.redhat.com/browse/RHEL-47444 upstream ======== commit 314dfe1 Author: Peter Zijlstra (Intel) <peterz@infradead.org> Date: Tue Jan 21 07:23:00 2025 -0800 description =========== The x86_pmu_drain_pebs static call was introduced in commit 7c9903c ("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: 7c9903c ("x86/perf, static_call: Optimize x86_pmu methods") Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20250121152303.3128733-1-kan.liang@linux.intel.com Signed-off-by: Michael Petlan <mpetlan@redhat.com>
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
@@ -3067,7 +3067,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;
 
 		/*
diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c
@@ -956,7 +956,7 @@ 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);
 }
 
 /*
diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h
@@ -1106,6 +1106,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)
 {

Original file line number	Diff line number	Diff line change
`@@ -956,7 +956,7 @@ void intel_pmu_drain_pebs_buffer(void)`
`956`	`956`	`{`
`957`	`957`	`struct perf_sample_data data;`
`958`	`958`
`959`		`- x86_pmu.drain_pebs(NULL, &data);`
	`959`	`+ static_call(x86_pmu_drain_pebs)(NULL, &data);`
`960`	`960`	`}`
`961`	`961`
`962`	`962`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1106,6 +1106,7 @@ extern struct x86_pmu x86_pmu __read_mostly;`
`1106`	`1106`
`1107`	`1107`	`DECLARE_STATIC_CALL(x86_pmu_set_period, *x86_pmu.set_period);`
`1108`	`1108`	`DECLARE_STATIC_CALL(x86_pmu_update, *x86_pmu.update);`
	`1109`	`+DECLARE_STATIC_CALL(x86_pmu_drain_pebs, *x86_pmu.drain_pebs);`
`1109`	`1110`
`1110`	`1111`	`static __always_inline struct x86_perf_task_context_opt task_context_opt(void ctx)`
`1111`	`1112`	`{`