hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf/x86/intel: Apply static call for drain_pebs

Browse Source 
commit 314dfe10576912e1d786b13c5d4eee8c51b63caa upstream.

The x86_pmu_drain_pebs static call was introduced in commit 7c9903c9bf
("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: 7c9903c9bf ("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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Zijlstra (Intel) 2025-01-21 07:23:00 -08:00 committed by Greg Kroah-Hartman
parent 5b36f9e8fa
commit 0a416b4c53
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/events/intel/core.c
View File

@ -2975,7 +2975,7 @@ static int handle_pmi_common(struct pt_regs *regs, u64 status)
handled++; handled++;
x86_pmu_handle_guest_pebs(regs, &data); 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; status &= intel_ctrl | GLOBAL_STATUS_TRACE_TOPAPMI;
/* /*

2
arch/x86/events/intel/ds.c
View File

@ -793,7 +793,7 @@ static inline void intel_pmu_drain_pebs_buffer(void)
{ {
struct perf_sample_data data; struct perf_sample_data data;
x86_pmu.drain_pebs(NULL, &data); static_call(x86_pmu_drain_pebs)(NULL, &data);
} }
/* /*

1
arch/x86/events/perf_event.h
View File

@ -1047,6 +1047,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_set_period, *x86_pmu.set_period);
DECLARE_STATIC_CALL(x86_pmu_update, *x86_pmu.update); 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) static __always_inline struct x86_perf_task_context_opt *task_context_opt(void *ctx)
{ {