[PATCH 3/3] x86/smp: Use static_call for arch_send_call_function_ipi()

[Eric Dumazet <edumazet@google.com>]

Use static_call to avoid an indirect call, especially expensive
with retpoline.

Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 arch/x86/include/asm/smp.h | 6 ++++--
 arch/x86/kernel/smp.c      | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 3b3ff77706fb72c18e66fc1785b21896d32c9ac9..f7305c492e6d5b724b0ee3d983ac1ebf45696294 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -49,6 +49,9 @@ void native_send_call_func_single_ipi(int cpu);
 DECLARE_STATIC_CALL(x86_send_call_func_single_ipi,
 		    native_send_call_func_single_ipi);
 
+void native_send_call_func_ipi(const struct cpumask *mask);
+DECLARE_STATIC_CALL(x86_send_call_func_ipi, native_send_call_func_ipi);
+
 void native_smp_send_reschedule(int cpu);
 DECLARE_STATIC_CALL(x86_smp_send_reschedule,
 		    native_smp_send_reschedule);
@@ -108,7 +111,7 @@ static inline void arch_send_call_function_single_ipi(int cpu)
 
 static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask)
 {
-	smp_ops.send_call_func_ipi(mask);
+	static_call(x86_send_call_func_ipi)(mask);
 }
 
 void cpu_disable_common(void);
@@ -131,7 +134,6 @@ void wbnoinvd_on_cpus_mask(struct cpumask *cpus);
 void smp_kick_mwait_play_dead(void);
 void __noreturn mwait_play_dead(unsigned int eax_hint);
 
-void native_send_call_func_ipi(const struct cpumask *mask);
 
 asmlinkage __visible void smp_reboot_interrupt(void);
 __visible void smp_reschedule_interrupt(struct pt_regs *regs);
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
index 6e25a86f67faf0a30e9b4920b1d4634aa9c64de7..4633ade879938eabfa424d36e7835cf3a7192d6a 100644
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
@@ -302,6 +302,8 @@ EXPORT_SYMBOL_GPL(smp_ops);
 
 DEFINE_STATIC_CALL(x86_send_call_func_single_ipi,
 		   native_send_call_func_single_ipi);
+DEFINE_STATIC_CALL(x86_send_call_func_ipi,
+		   native_send_call_func_ipi);
 DEFINE_STATIC_CALL(x86_smp_send_reschedule,
 		   native_smp_send_reschedule);
 EXPORT_STATIC_CALL(x86_smp_send_reschedule);
@@ -310,6 +312,8 @@ void x86_smp_ops_static_call_update(void)
 {
 	static_call_update(x86_send_call_func_single_ipi,
 			   smp_ops.send_call_func_single_ipi);
+	static_call_update(x86_send_call_func_ipi,
+			   smp_ops.send_call_func_ipi);
 	static_call_update(x86_smp_send_reschedule,
 			   smp_ops.smp_send_reschedule);
 }
-- 
2.52.0.351.gbe84eed79e-goog