| Message ID | 20230508213147.583344579@infradead.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | local_clock() vs noinstr | expand |
On Mon, May 08, 2023 at 11:19:54PM +0200, Peter Zijlstra wrote: > The next patch will want to use __raw_readl() from a noinstr section > and as such that needs to be marked __always_inline to avoid the > compiler being a silly bugger. > > Turns out it already is, but its siblings are not. > > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> FWIW, on arm64 we shouldn't ever end up with the MMIO counter being our {sched,local}_clock() -- several things blow up if we don't have the "CP15" version, and if we do have the CP15 version we'll use that as our preferred clocksource (and yes, the code is a mess). Regardless, for consistency I agree we should mark these all as __always_inline. It looks like we marked __raw_{readl,writel}() as noinstr in commit: e43f1331e2ef913b ("arm64: Ask the compiler to __always_inline functions used by KVM at HYP") ... and it'd be nice to mention that in the commit message. Thanks, Mark. > --- > arch/arm64/include/asm/io.h | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > --- a/arch/arm64/include/asm/io.h > +++ b/arch/arm64/include/asm/io.h > @@ -22,13 +22,13 @@ > * Generic IO read/write. These perform native-endian accesses. > */ > #define __raw_writeb __raw_writeb > -static inline void __raw_writeb(u8 val, volatile void __iomem *addr) > +static __always_inline void __raw_writeb(u8 val, volatile void __iomem *addr) > { > asm volatile("strb %w0, [%1]" : : "rZ" (val), "r" (addr)); > } > > #define __raw_writew __raw_writew > -static inline void __raw_writew(u16 val, volatile void __iomem *addr) > +static __always_inline void __raw_writew(u16 val, volatile void __iomem *addr) > { > asm volatile("strh %w0, [%1]" : : "rZ" (val), "r" (addr)); > } > @@ -40,13 +40,13 @@ static __always_inline void __raw_writel > } > > #define __raw_writeq __raw_writeq > -static inline void __raw_writeq(u64 val, volatile void __iomem *addr) > +static __always_inline void __raw_writeq(u64 val, volatile void __iomem *addr) > { > asm volatile("str %x0, [%1]" : : "rZ" (val), "r" (addr)); > } > > #define __raw_readb __raw_readb > -static inline u8 __raw_readb(const volatile void __iomem *addr) > +static __always_inline u8 __raw_readb(const volatile void __iomem *addr) > { > u8 val; > asm volatile(ALTERNATIVE("ldrb %w0, [%1]", > @@ -57,7 +57,7 @@ static inline u8 __raw_readb(const volat > } > > #define __raw_readw __raw_readw > -static inline u16 __raw_readw(const volatile void __iomem *addr) > +static __always_inline u16 __raw_readw(const volatile void __iomem *addr) > { > u16 val; > > @@ -80,7 +80,7 @@ static __always_inline u32 __raw_readl(c > } > > #define __raw_readq __raw_readq > -static inline u64 __raw_readq(const volatile void __iomem *addr) > +static __always_inline u64 __raw_readq(const volatile void __iomem *addr) > { > u64 val; > asm volatile(ALTERNATIVE("ldr %0, [%1]", > >
--- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -22,13 +22,13 @@ * Generic IO read/write. These perform native-endian accesses. */ #define __raw_writeb __raw_writeb -static inline void __raw_writeb(u8 val, volatile void __iomem *addr) +static __always_inline void __raw_writeb(u8 val, volatile void __iomem *addr) { asm volatile("strb %w0, [%1]" : : "rZ" (val), "r" (addr)); } #define __raw_writew __raw_writew -static inline void __raw_writew(u16 val, volatile void __iomem *addr) +static __always_inline void __raw_writew(u16 val, volatile void __iomem *addr) { asm volatile("strh %w0, [%1]" : : "rZ" (val), "r" (addr)); } @@ -40,13 +40,13 @@ static __always_inline void __raw_writel } #define __raw_writeq __raw_writeq -static inline void __raw_writeq(u64 val, volatile void __iomem *addr) +static __always_inline void __raw_writeq(u64 val, volatile void __iomem *addr) { asm volatile("str %x0, [%1]" : : "rZ" (val), "r" (addr)); } #define __raw_readb __raw_readb -static inline u8 __raw_readb(const volatile void __iomem *addr) +static __always_inline u8 __raw_readb(const volatile void __iomem *addr) { u8 val; asm volatile(ALTERNATIVE("ldrb %w0, [%1]", @@ -57,7 +57,7 @@ static inline u8 __raw_readb(const volat } #define __raw_readw __raw_readw -static inline u16 __raw_readw(const volatile void __iomem *addr) +static __always_inline u16 __raw_readw(const volatile void __iomem *addr) { u16 val; @@ -80,7 +80,7 @@ static __always_inline u32 __raw_readl(c } #define __raw_readq __raw_readq -static inline u64 __raw_readq(const volatile void __iomem *addr) +static __always_inline u64 __raw_readq(const volatile void __iomem *addr) { u64 val; asm volatile(ALTERNATIVE("ldr %0, [%1]",
The next patch will want to use __raw_readl() from a noinstr section and as such that needs to be marked __always_inline to avoid the compiler being a silly bugger. Turns out it already is, but its siblings are not. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> --- arch/arm64/include/asm/io.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)