2023-07-18 00:31:23

by Thomas Gleixner

Subject: [patch 58/58] x86/apic: Turn on static calls

Convert all the APIC callback inline wrappers from apic->foo() to
static_call(apic_call_foo)(), except for the safe_wait_icr_idle() one which
is only used during SMP bringup when sending INIT/SIPI. That really can do
the conditional callback. The regular wait_icr_idle() matters as it is used
in irq_work_raise(), so X2APIC machines spare the conditional.

Signed-off-by: Thomas Gleixner <[email protected]>
---
arch/x86/include/asm/apic.h | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)

--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -397,68 +397,67 @@ EXPORT_STATIC_CALL_TRAMP_GPL(apic_call_s

static __always_inline u32 apic_read(u32 reg)
{
- return apic->read(reg);
+ return static_call(apic_call_read)(reg);
}

static __always_inline void apic_write(u32 reg, u32 val)
{
- apic->write(reg, val);
+ static_call(apic_call_write)(reg, val);
}

static __always_inline void apic_eoi(void)
{
- apic->eoi();
+ static_call(apic_call_eoi)();
}

static __always_inline void apic_native_eoi(void)
{
- apic->native_eoi();
+ static_call(apic_call_native_eoi)();
}

static __always_inline u64 apic_icr_read(void)
{
- return apic->icr_read();
+ return static_call(apic_call_icr_read)();
}

static __always_inline void apic_icr_write(u32 low, u32 high)
{
- apic->icr_write(low, high);
+ static_call(apic_call_icr_write)(low, high);
}

static __always_inline void __apic_send_IPI(int cpu, int vector)
{
- apic->send_IPI(cpu, vector);
+ static_call(apic_call_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_call(apic_call_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_call(apic_call_send_IPI_mask_allbutself)(mask, vector);
}

static __always_inline void __apic_send_IPI_allbutself(int vector)
{
- apic->send_IPI_allbutself(vector);
+ static_call(apic_call_send_IPI_allbutself)(vector);
}

static __always_inline void __apic_send_IPI_all(int vector)
{
- apic->send_IPI_all(vector);
+ static_call(apic_call_send_IPI_all)(vector);
}

static __always_inline void __apic_send_IPI_self(int vector)
{
- apic->send_IPI_self(vector);
+ static_call(apic_call_send_IPI_self)(vector);
}

static __always_inline void apic_wait_icr_idle(void)
{
- if (apic->wait_icr_idle)
- apic->wait_icr_idle();
+ static_call_cond(apic_call_wait_icr_idle)();
}

static __always_inline u32 safe_apic_wait_icr_idle(void)

2023-07-18 13:47:00

by Thomas Gleixner

Subject: Re: [patch 58/58] x86/apic: Turn on static calls

On Tue, Jul 18 2023 at 01:16, Thomas Gleixner wrote:
> static __always_inline void __apic_send_IPI_mask(const struct cpumask *mask, int vector)
> {
> - apic->send_IPI_mask(mask, vector);
> + static_call(apic_call_send_IPI_mask)(mask, vector);
> }
>
> static __always_inline void __apic_send_IPI_self(int vector)
> {
> - apic->send_IPI_self(vector);
> + static_call(apic_call_send_IPI_self)(vector);
> }

I obviously must have missed to read the huge documentation section
about static_call() and modules. These two need to be static_call_mod().

I've force pushed the fixed up git branch to:

git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git x86/apic

Delta patch on top of the original pile below.

Thanks,

tglx
---
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 78dfe8aaed83..f7eb72a1ae00 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -429,7 +429,7 @@ static __always_inline void __apic_send_IPI(int cpu, int vector)

static __always_inline void __apic_send_IPI_mask(const struct cpumask *mask, int vector)
{
- static_call(apic_call_send_IPI_mask)(mask, vector);
+ static_call_mod(apic_call_send_IPI_mask)(mask, vector);
}

static __always_inline void __apic_send_IPI_mask_allbutself(const struct cpumask *mask, int vector)
@@ -449,7 +449,7 @@ static __always_inline void __apic_send_IPI_all(int vector)

static __always_inline void __apic_send_IPI_self(int vector)
{
- static_call(apic_call_send_IPI_self)(vector);
+ static_call_mod(apic_call_send_IPI_self)(vector);
}

static __always_inline void apic_wait_icr_idle(void)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 0c63d2d9d75c..66d531876d3b 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1875,6 +1875,7 @@ static __init void try_to_enable_x2apic(int remap_mode)
* be addressed must not be brought online.
*/
x2apic_set_max_apicid(apic_limit);
+ x2apic_phys = 1;
}
x2apic_enable();
}