x86/apic: Wrap IPI calls into helper functions

hansendc · hansendc · commit 28b8235238fa · 2023-08-09T12:00:55.000-07:00
Move them to one place so the static call conversion gets simpler.

No functional change.

[ dhansen: merge against recent x86/apic changes ]

Signed-off-by: Thomas Gleixner &lt;tglx@linutronix.de&gt;
Signed-off-by: Dave Hansen &lt;dave.hansen@linux.intel.com&gt;
Acked-by: Peter Zijlstra (Intel) &lt;peterz@infradead.org&gt;
Tested-by: Michael Kelley &lt;mikelley@microsoft.com&gt;
Tested-by: Sohil Mehta &lt;sohil.mehta@intel.com&gt;
Tested-by: Juergen Gross &lt;jgross@suse.com&gt; # Xen PV (dom0 and unpriv. guest)
diff --git a/arch/x86/hyperv/hv_spinlock.c b/arch/x86/hyperv/hv_spinlock.c
@@ -20,7 +20,7 @@ static bool __initdata hv_pvspin = true;
 
 static void hv_qlock_kick(int cpu)
 {
-	apic->send_IPI(cpu, X86_PLATFORM_IPI_VECTOR);
+	__apic_send_IPI(cpu, X86_PLATFORM_IPI_VECTOR);
 }
 
 static void hv_qlock_wait(u8 *byte, u8 val)
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
@@ -401,6 +401,36 @@ static __always_inline void apic_icr_write(u32 low, u32 high)
 	apic->icr_write(low, high);
 }
 
+static __always_inline void __apic_send_IPI(int cpu, int vector)
+{
+	apic->send_IPI(cpu, vector);
+}
+
+static __always_inline void __apic_send_IPI_mask(const struct cpumask *mask, int vector)
+{
+	apic->send_IPI_mask(mask, vector);
+}
+
+static __always_inline void __apic_send_IPI_mask_allbutself(const struct cpumask *mask, int vector)
+{
+	apic->send_IPI_mask_allbutself(mask, vector);
+}
+
+static __always_inline void __apic_send_IPI_allbutself(int vector)
+{
+	apic->send_IPI_allbutself(vector);
+}
+
+static __always_inline void __apic_send_IPI_all(int vector)
+{
+	apic->send_IPI_all(vector);
+}
+
+static __always_inline void __apic_send_IPI_self(int vector)
+{
+	apic->send_IPI_self(vector);
+}
+
 static __always_inline void apic_wait_icr_idle(void)
 {
 	if (apic->wait_icr_idle)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
@@ -502,7 +502,7 @@ static int lapic_timer_set_oneshot(struct clock_event_device *evt)
 static void lapic_timer_broadcast(const struct cpumask *mask)
 {
 #ifdef CONFIG_SMP
-	apic->send_IPI_mask(mask, LOCAL_TIMER_VECTOR);
+	__apic_send_IPI_mask(mask, LOCAL_TIMER_VECTOR);
 #endif
 }
 
diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
@@ -21,6 +21,8 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 
+#include "local.h"
+
 #ifdef CONFIG_HARDLOCKUP_DETECTOR_PERF
 u64 hw_nmi_get_sample_period(int watchdog_thresh)
 {
@@ -31,7 +33,7 @@ u64 hw_nmi_get_sample_period(int watchdog_thresh)
 #ifdef arch_trigger_cpumask_backtrace
 static void nmi_raise_cpu_backtrace(cpumask_t *mask)
 {
-	apic->send_IPI_mask(mask, NMI_VECTOR);
+	__apic_send_IPI_mask(mask, NMI_VECTOR);
 }
 
 void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self)
diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c
@@ -54,9 +54,9 @@ void apic_send_IPI_allbutself(unsigned int vector)
 		return;
 
 	if (static_branch_likely(&apic_use_ipi_shorthand))
-		apic->send_IPI_allbutself(vector);
+		__apic_send_IPI_allbutself(vector);
 	else
-		apic->send_IPI_mask_allbutself(cpu_online_mask, vector);
+		__apic_send_IPI_mask_allbutself(cpu_online_mask, vector);
 }
 
 /*
@@ -70,12 +70,12 @@ void native_smp_send_reschedule(int cpu)
 		WARN(1, "sched: Unexpected reschedule of offline CPU#%d!\n", cpu);
 		return;
 	}
-	apic->send_IPI(cpu, RESCHEDULE_VECTOR);
+	__apic_send_IPI(cpu, RESCHEDULE_VECTOR);
 }
 
 void native_send_call_func_single_ipi(int cpu)
 {
-	apic->send_IPI(cpu, CALL_FUNCTION_SINGLE_VECTOR);
+	__apic_send_IPI(cpu, CALL_FUNCTION_SINGLE_VECTOR);
 }
 
 void native_send_call_func_ipi(const struct cpumask *mask)
@@ -87,14 +87,14 @@ void native_send_call_func_ipi(const struct cpumask *mask)
 			goto sendmask;
 
 		if (cpumask_test_cpu(cpu, mask))
-			apic->send_IPI_all(CALL_FUNCTION_VECTOR);
+			__apic_send_IPI_all(CALL_FUNCTION_VECTOR);
 		else if (num_online_cpus() > 1)
-			apic->send_IPI_allbutself(CALL_FUNCTION_VECTOR);
+			__apic_send_IPI_allbutself(CALL_FUNCTION_VECTOR);
 		return;
 	}
 
 sendmask:
-	apic->send_IPI_mask(mask, CALL_FUNCTION_VECTOR);
+	__apic_send_IPI_mask(mask, CALL_FUNCTION_VECTOR);
 }
 
 #endif /* CONFIG_SMP */
@@ -221,7 +221,7 @@ void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask,
  */
 void default_send_IPI_single(int cpu, int vector)
 {
-	apic->send_IPI_mask(cpumask_of(cpu), vector);
+	__apic_send_IPI_mask(cpumask_of(cpu), vector);
 }
 
 void default_send_IPI_allbutself(int vector)
diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
@@ -898,7 +898,7 @@ static int apic_retrigger_irq(struct irq_data *irqd)
 	unsigned long flags;
 
 	raw_spin_lock_irqsave(&vector_lock, flags);
-	apic->send_IPI(apicd->cpu, apicd->vector);
+	__apic_send_IPI(apicd->cpu, apicd->vector);
 	raw_spin_unlock_irqrestore(&vector_lock, flags);
 
 	return 1;
diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c
@@ -270,8 +270,7 @@ static void __maybe_unused raise_mce(struct mce *m)
 					mce_irq_ipi, NULL, 0);
 				preempt_enable();
 			} else if (m->inject_flags & MCJ_NMI_BROADCAST)
-				apic->send_IPI_mask(mce_inject_cpumask,
-						NMI_VECTOR);
+				__apic_send_IPI_mask(mce_inject_cpumask, NMI_VECTOR);
 		}
 		start = jiffies;
 		while (!cpumask_empty(mce_inject_cpumask)) {
diff --git a/arch/x86/kernel/irq_work.c b/arch/x86/kernel/irq_work.c
@@ -28,7 +28,7 @@ void arch_irq_work_raise(void)
 	if (!arch_irq_work_has_interrupt())
 		return;
 
-	apic->send_IPI_self(IRQ_WORK_VECTOR);
+	__apic_send_IPI_self(IRQ_WORK_VECTOR);
 	apic_wait_icr_idle();
 }
 #endif
diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
@@ -75,7 +75,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
 	/* sync above data before sending NMI */
 	wmb();
 
-	apic->send_IPI_mask(mask, NMI_VECTOR);
+	__apic_send_IPI_mask(mask, NMI_VECTOR);
 
 	/* Don't wait longer than a second */
 	timeout = USEC_PER_SEC;
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
@@ -237,7 +237,7 @@ static void native_stop_other_cpus(int wait)
 			pr_emerg("Shutting down cpus with NMI\n");
 
 			for_each_cpu(cpu, &cpus_stop_mask)
-				apic->send_IPI(cpu, NMI_VECTOR);
+				__apic_send_IPI(cpu, NMI_VECTOR);
 		}
 		/*
 		 * Don't wait longer than 10 ms if the caller didn't
diff --git a/arch/x86/kvm/vmx/posted_intr.c b/arch/x86/kvm/vmx/posted_intr.c
@@ -175,7 +175,7 @@ static void pi_enable_wakeup_handler(struct kvm_vcpu *vcpu)
 	 * scheduled out).
 	 */
 	if (pi_test_on(&new))
-		apic->send_IPI_self(POSTED_INTR_WAKEUP_VECTOR);
+		__apic_send_IPI_self(POSTED_INTR_WAKEUP_VECTOR);
 
 	local_irq_restore(flags);
 }
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
@@ -4179,7 +4179,7 @@ static inline void kvm_vcpu_trigger_posted_interrupt(struct kvm_vcpu *vcpu,
 		 */
 
 		if (vcpu != kvm_get_running_vcpu())
-			apic->send_IPI_mask(get_cpu_mask(vcpu->cpu), pi_vec);
+			__apic_send_IPI_mask(get_cpu_mask(vcpu->cpu), pi_vec);
 		return;
 	}
 #endif
diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c
@@ -601,7 +601,7 @@ static void uv_nmi_nr_cpus_ping(void)
 	for_each_cpu(cpu, uv_nmi_cpu_mask)
 		uv_cpu_nmi_per(cpu).pinging = 1;
 
-	apic->send_IPI_mask(uv_nmi_cpu_mask, APIC_DM_NMI);
+	__apic_send_IPI_mask(uv_nmi_cpu_mask, APIC_DM_NMI);
 }
 
 /* Clean up flags for CPU's that ignored both NMI and ping */

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ static bool __initdata hv_pvspin = true;`
`20`	`20`
`21`	`21`	`static void hv_qlock_kick(int cpu)`
`22`	`22`	`{`
`23`		`- apic->send_IPI(cpu, X86_PLATFORM_IPI_VECTOR);`
	`23`	`+ __apic_send_IPI(cpu, X86_PLATFORM_IPI_VECTOR);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`static void hv_qlock_wait(u8 *byte, u8 val)`
Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ static int lapic_timer_set_oneshot(struct clock_event_device *evt)`
`502`	`502`	`static void lapic_timer_broadcast(const struct cpumask *mask)`
`503`	`503`	`{`
`504`	`504`	`#ifdef CONFIG_SMP`
`505`		`- apic->send_IPI_mask(mask, LOCAL_TIMER_VECTOR);`
	`505`	`+ __apic_send_IPI_mask(mask, LOCAL_TIMER_VECTOR);`
`506`	`506`	`#endif`
`507`	`507`	`}`
`508`	`508`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`	`#include <linux/init.h>`
`22`	`22`	`#include <linux/delay.h>`
`23`	`23`
	`24`	`+#include "local.h"`
	`25`	`+`
`24`	`26`	`#ifdef CONFIG_HARDLOCKUP_DETECTOR_PERF`
`25`	`27`	`u64 hw_nmi_get_sample_period(int watchdog_thresh)`
`26`	`28`	`{`
`@@ -31,7 +33,7 @@ u64 hw_nmi_get_sample_period(int watchdog_thresh)`
`31`	`33`	`#ifdef arch_trigger_cpumask_backtrace`
`32`	`34`	`static void nmi_raise_cpu_backtrace(cpumask_t *mask)`
`33`	`35`	`{`
`34`		`- apic->send_IPI_mask(mask, NMI_VECTOR);`
	`36`	`+ __apic_send_IPI_mask(mask, NMI_VECTOR);`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self)`
Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,9 @@ void apic_send_IPI_allbutself(unsigned int vector)`
`54`	`54`	`return;`
`55`	`55`
`56`	`56`	`if (static_branch_likely(&apic_use_ipi_shorthand))`
`57`		`- apic->send_IPI_allbutself(vector);`
	`57`	`+ __apic_send_IPI_allbutself(vector);`
`58`	`58`	`else`
`59`		`- apic->send_IPI_mask_allbutself(cpu_online_mask, vector);`
	`59`	`+ __apic_send_IPI_mask_allbutself(cpu_online_mask, vector);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/*`
`@@ -70,12 +70,12 @@ void native_smp_send_reschedule(int cpu)`
`70`	`70`	`WARN(1, "sched: Unexpected reschedule of offline CPU#%d!\n", cpu);`
`71`	`71`	`return;`
`72`	`72`	`}`
`73`		`- apic->send_IPI(cpu, RESCHEDULE_VECTOR);`
	`73`	`+ __apic_send_IPI(cpu, RESCHEDULE_VECTOR);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`void native_send_call_func_single_ipi(int cpu)`
`77`	`77`	`{`
`78`		`- apic->send_IPI(cpu, CALL_FUNCTION_SINGLE_VECTOR);`
	`78`	`+ __apic_send_IPI(cpu, CALL_FUNCTION_SINGLE_VECTOR);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`void native_send_call_func_ipi(const struct cpumask *mask)`
`@@ -87,14 +87,14 @@ void native_send_call_func_ipi(const struct cpumask *mask)`
`87`	`87`	`goto sendmask;`
`88`	`88`
`89`	`89`	`if (cpumask_test_cpu(cpu, mask))`
`90`		`- apic->send_IPI_all(CALL_FUNCTION_VECTOR);`
	`90`	`+ __apic_send_IPI_all(CALL_FUNCTION_VECTOR);`
`91`	`91`	`else if (num_online_cpus() > 1)`
`92`		`- apic->send_IPI_allbutself(CALL_FUNCTION_VECTOR);`
	`92`	`+ __apic_send_IPI_allbutself(CALL_FUNCTION_VECTOR);`
`93`	`93`	`return;`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`sendmask:`
`97`		`- apic->send_IPI_mask(mask, CALL_FUNCTION_VECTOR);`
	`97`	`+ __apic_send_IPI_mask(mask, CALL_FUNCTION_VECTOR);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`#endif /* CONFIG_SMP */`
`@@ -221,7 +221,7 @@ void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask,`
`221`	`221`	`*/`
`222`	`222`	`void default_send_IPI_single(int cpu, int vector)`
`223`	`223`	`{`
`224`		`- apic->send_IPI_mask(cpumask_of(cpu), vector);`
	`224`	`+ __apic_send_IPI_mask(cpumask_of(cpu), vector);`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`void default_send_IPI_allbutself(int vector)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ void arch_irq_work_raise(void)`
`28`	`28`	`if (!arch_irq_work_has_interrupt())`
`29`	`29`	`return;`
`30`	`30`
`31`		`- apic->send_IPI_self(IRQ_WORK_VECTOR);`
	`31`	`+ __apic_send_IPI_self(IRQ_WORK_VECTOR);`
`32`	`32`	`apic_wait_icr_idle();`
`33`	`33`	`}`
`34`	`34`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ static void native_stop_other_cpus(int wait)`
`237`	`237`	`pr_emerg("Shutting down cpus with NMI\n");`
`238`	`238`
`239`	`239`	`for_each_cpu(cpu, &cpus_stop_mask)`
`240`		`- apic->send_IPI(cpu, NMI_VECTOR);`
	`240`	`+ __apic_send_IPI(cpu, NMI_VECTOR);`
`241`	`241`	`}`
`242`	`242`	`/*`
`243`	`243`	`* Don't wait longer than 10 ms if the caller didn't`