The following commit has been merged into the x86/apic branch of tip:
Commit-ID: 54271fb0b78511048aa7910d593994f2ca055e68
Gitweb: https://git.kernel.org/tip/54271fb0b78511048aa7910d593994f2ca055e68
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Tue, 08 Aug 2023 15:04:21 -07:00
Committer: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
CommitterDate: Wed, 09 Aug 2023 12:00:55 -07:00
x86/apic: Mark all hotpath APIC callback wrappers __always_inline
There is no value for instrumentation to look at those wrappers and with the
upcoming conversion to static calls even less so.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Tested-by: Michael Kelley <mikelley@xxxxxxxxxxxxx>
Tested-by: Sohil Mehta <sohil.mehta@xxxxxxxxx>
Tested-by: Juergen Gross <jgross@xxxxxxxx> # Xen PV (dom0 and unpriv. guest)
---
arch/x86/include/asm/apic.h | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 1742f97..28192a2 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -371,48 +371,48 @@ void __init apic_install_driver(struct apic *driver);
pr_info("APIC: %s() replaced with %ps()\n", #_callback, _fn); \
}
-static inline u32 apic_read(u32 reg)
+static __always_inline u32 apic_read(u32 reg)
{
return apic->read(reg);
}
-static inline void apic_write(u32 reg, u32 val)
+static __always_inline void apic_write(u32 reg, u32 val)
{
apic->write(reg, val);
}
-static inline void apic_eoi(void)
+static __always_inline void apic_eoi(void)
{
apic->eoi();
}
-static inline void apic_native_eoi(void)
+static __always_inline void apic_native_eoi(void)
{
apic->native_eoi();
}
-static inline u64 apic_icr_read(void)
+static __always_inline u64 apic_icr_read(void)
{
return apic->icr_read();
}
-static inline void apic_icr_write(u32 low, u32 high)
+static __always_inline void apic_icr_write(u32 low, u32 high)
{
apic->icr_write(low, high);
}
-static inline void apic_wait_icr_idle(void)
+static __always_inline void apic_wait_icr_idle(void)
{
if (apic->wait_icr_idle)
apic->wait_icr_idle();
}
-static inline u32 safe_apic_wait_icr_idle(void)
+static __always_inline u32 safe_apic_wait_icr_idle(void)
{
return apic->safe_wait_icr_idle ? apic->safe_wait_icr_idle() : 0;
}
-static inline bool apic_id_valid(u32 apic_id)
+static __always_inline bool apic_id_valid(u32 apic_id)
{
return apic_id <= apic->max_apic_id;
}
|