* [RFC PATCH 0/5] make use of gcc 9's "asm inline()"
@ 2019-08-29 8:32 Rasmus Villemoes
2019-08-29 8:32 ` [RFC PATCH 1/5] treewide: replace __inline__ by inline Rasmus Villemoes
` (7 more replies)
0 siblings, 8 replies; 66+ messages in thread
From: Rasmus Villemoes @ 2019-08-29 8:32 UTC (permalink / raw)
To: x86, linux-kernel
Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit,
Linus Torvalds, Miguel Ojeda, ndesaulniers, Rasmus Villemoes
gcc 9 provides a way to override the otherwise crude heuristic that
gcc uses to estimate the size of the code represented by an asm()
statement. From the gcc docs
If you use 'asm inline' instead of just 'asm', then for inlining
purposes the size of the asm is taken as the minimum size, ignoring
how many instructions GCC thinks it is.
For compatibility with older compilers, we obviously want a
#if new enough
#define asm_inline asm inline
#else
#define asm_inline asm
#endif
But since we #define the identifier inline to attach some attributes,
we have to use the alternate spelling __inline__ of that
keyword. Unfortunately, we also currently #define that one (to
inline), so we first have to get rid of all (mis)uses of
__inline__. Hence the huge diffstat. I think patch 1 should be
regenerated and applied just before -rc1.
There are a few remaining users of __inline__, in particular in uapi
headers, which I'm not sure what to do about (kernel-side users of
those will get slightly different semantics since we no longer
automatically attach the __attribute__((__gnu_inline__)) etc.). So RFC.
The two x86 changes cause smaller code gen differences than I'd
expect, but I think we do want the asm_inline thing available sooner
or later, so this is just to get the ball rolling.
Rasmus Villemoes (5):
treewide: replace __inline__ by inline
compiler_types.h: don't #define __inline__
compiler-gcc.h: add asm_inline definition
x86: alternative.h: use asm_inline for all alternative variants
x86: bug.h: use asm_inline in _BUG_FLAGS definitions
arch/alpha/include/asm/atomic.h | 12 +++---
arch/alpha/include/asm/bitops.h | 6 +--
arch/alpha/include/asm/dma.h | 22 +++++-----
arch/alpha/include/asm/floppy.h | 2 +-
arch/alpha/include/asm/irq.h | 2 +-
arch/alpha/include/asm/local.h | 4 +-
arch/alpha/include/asm/smp.h | 2 +-
.../arm/mach-iop32x/include/mach/uncompress.h | 2 +-
.../arm/mach-iop33x/include/mach/uncompress.h | 2 +-
.../arm/mach-ixp4xx/include/mach/uncompress.h | 2 +-
arch/ia64/hp/common/sba_iommu.c | 2 +-
arch/ia64/hp/sim/simeth.c | 2 +-
arch/ia64/include/asm/atomic.h | 8 ++--
arch/ia64/include/asm/bitops.h | 34 ++++++++--------
arch/ia64/include/asm/delay.h | 14 +++----
arch/ia64/include/asm/irq.h | 2 +-
arch/ia64/include/asm/page.h | 2 +-
arch/ia64/include/asm/sn/leds.h | 2 +-
arch/ia64/include/asm/uaccess.h | 4 +-
arch/ia64/oprofile/backtrace.c | 4 +-
arch/m68k/include/asm/blinken.h | 2 +-
arch/m68k/include/asm/checksum.h | 2 +-
arch/m68k/include/asm/dma.h | 32 +++++++--------
arch/m68k/include/asm/floppy.h | 8 ++--
arch/m68k/include/asm/nettel.h | 8 ++--
arch/m68k/mac/iop.c | 14 +++----
arch/mips/include/asm/atomic.h | 16 ++++----
arch/mips/include/asm/checksum.h | 2 +-
arch/mips/include/asm/dma.h | 20 +++++-----
arch/mips/include/asm/jazz.h | 2 +-
arch/mips/include/asm/local.h | 4 +-
arch/mips/include/asm/string.h | 8 ++--
arch/mips/kernel/binfmt_elfn32.c | 2 +-
arch/nds32/include/asm/swab.h | 4 +-
arch/parisc/include/asm/atomic.h | 20 +++++-----
arch/parisc/include/asm/bitops.h | 18 ++++-----
arch/parisc/include/asm/checksum.h | 4 +-
arch/parisc/include/asm/compat.h | 2 +-
arch/parisc/include/asm/delay.h | 2 +-
arch/parisc/include/asm/dma.h | 20 +++++-----
arch/parisc/include/asm/ide.h | 8 ++--
arch/parisc/include/asm/irq.h | 2 +-
arch/parisc/include/asm/spinlock.h | 12 +++---
arch/powerpc/include/asm/atomic.h | 40 +++++++++----------
arch/powerpc/include/asm/bitops.h | 28 ++++++-------
arch/powerpc/include/asm/dma.h | 20 +++++-----
arch/powerpc/include/asm/edac.h | 2 +-
arch/powerpc/include/asm/irq.h | 2 +-
arch/powerpc/include/asm/local.h | 14 +++----
arch/sh/include/asm/pgtable_64.h | 2 +-
arch/sh/include/asm/processor_32.h | 4 +-
arch/sh/include/cpu-sh3/cpu/dac.h | 6 +--
arch/x86/include/asm/alternative.h | 14 +++----
arch/x86/include/asm/bug.h | 4 +-
arch/x86/um/asm/checksum.h | 4 +-
arch/x86/um/asm/checksum_32.h | 4 +-
arch/xtensa/include/asm/checksum.h | 14 +++----
arch/xtensa/include/asm/cmpxchg.h | 4 +-
arch/xtensa/include/asm/irq.h | 2 +-
block/partitions/amiga.c | 2 +-
drivers/atm/he.c | 6 +--
drivers/atm/idt77252.c | 6 +--
drivers/gpu/drm/mga/mga_drv.h | 2 +-
drivers/gpu/drm/mga/mga_state.c | 14 +++----
drivers/gpu/drm/r128/r128_drv.h | 2 +-
drivers/gpu/drm/r128/r128_state.c | 14 +++----
drivers/gpu/drm/via/via_irq.c | 2 +-
drivers/gpu/drm/via/via_verifier.c | 30 +++++++-------
drivers/media/pci/ivtv/ivtv-ioctl.c | 2 +-
drivers/net/ethernet/sun/sungem.c | 8 ++--
drivers/net/ethernet/sun/sunhme.c | 6 +--
drivers/net/hamradio/baycom_ser_fdx.c | 2 +-
drivers/net/wan/lapbether.c | 2 +-
drivers/net/wan/n2.c | 4 +-
drivers/parisc/led.c | 4 +-
drivers/parisc/sba_iommu.c | 2 +-
drivers/parport/parport_gsc.h | 4 +-
drivers/scsi/lpfc/lpfc_scsi.c | 2 +-
drivers/scsi/pcmcia/sym53c500_cs.c | 4 +-
drivers/scsi/qla2xxx/qla_inline.h | 2 +-
drivers/scsi/qla2xxx/qla_os.c | 2 +-
drivers/tty/amiserial.c | 2 +-
drivers/tty/serial/ip22zilog.c | 2 +-
drivers/tty/serial/sunsab.c | 4 +-
drivers/tty/serial/sunzilog.c | 2 +-
drivers/video/fbdev/core/fbcon.c | 20 +++++-----
drivers/video/fbdev/ffb.c | 2 +-
drivers/video/fbdev/intelfb/intelfbdrv.c | 8 ++--
drivers/video/fbdev/intelfb/intelfbhw.c | 2 +-
drivers/w1/masters/matrox_w1.c | 4 +-
fs/coda/coda_linux.h | 6 +--
fs/freevxfs/vxfs_inode.c | 2 +-
fs/nfsd/nfsfh.h | 4 +-
include/acpi/platform/acgcc.h | 2 +-
include/asm-generic/ide_iops.h | 8 ++--
include/linux/atalk.h | 4 +-
include/linux/compiler-gcc.h | 4 ++
include/linux/compiler_types.h | 5 ++-
include/linux/hdlc.h | 4 +-
include/linux/inetdevice.h | 6 +--
include/linux/parport.h | 4 +-
include/linux/parport_pc.h | 22 +++++-----
include/net/ax25.h | 2 +-
include/net/checksum.h | 2 +-
include/net/dn_nsp.h | 16 ++++----
include/net/ip.h | 2 +-
include/net/ip6_checksum.h | 2 +-
include/net/ipx.h | 10 ++---
include/net/llc_c_ev.h | 4 +-
include/net/llc_conn.h | 4 +-
include/net/llc_s_ev.h | 2 +-
include/net/netrom.h | 8 ++--
include/net/scm.h | 14 +++----
include/net/udplite.h | 2 +-
include/net/x25.h | 8 ++--
include/net/xfrm.h | 18 ++++-----
include/video/newport.h | 12 +++---
net/appletalk/atalk_proc.c | 4 +-
net/appletalk/ddp.c | 2 +-
net/core/neighbour.c | 2 +-
net/core/scm.c | 2 +-
net/decnet/dn_nsp_in.c | 2 +-
net/decnet/dn_nsp_out.c | 2 +-
net/decnet/dn_route.c | 2 +-
net/decnet/dn_table.c | 4 +-
net/ipv6/af_inet6.c | 2 +-
net/ipv6/icmp.c | 4 +-
net/ipv6/udp.c | 2 +-
net/lapb/lapb_iface.c | 4 +-
net/llc/llc_input.c | 2 +-
sound/sparc/amd7930.c | 6 +--
131 files changed, 449 insertions(+), 442 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 66+ messages in thread* [RFC PATCH 1/5] treewide: replace __inline__ by inline 2019-08-29 8:32 [RFC PATCH 0/5] make use of gcc 9's "asm inline()" Rasmus Villemoes @ 2019-08-29 8:32 ` Rasmus Villemoes 2019-08-29 16:29 ` Joe Perches 2019-08-29 8:32 ` [RFC PATCH 2/5] compiler_types.h: don't #define __inline__ Rasmus Villemoes ` (6 subsequent siblings) 7 siblings, 1 reply; 66+ messages in thread From: Rasmus Villemoes @ 2019-08-29 8:32 UTC (permalink / raw) To: x86, linux-kernel Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, ndesaulniers, Rasmus Villemoes Currently, compiler_types.h #defines __inline__ as inline. However, that defeats the purpose of gcc providing __inline__ as an alternate spelling of that keyword - namely, that it is always accessible under that name, even if one chooses to #define inline, which we also do in order to attach attribute(gnu_inline), and sometimes imply attribute(always_inline), etc. Note that it is quite possible that some header file defines a static inline function before the include chain has reached compiler_types.h, but in that case both the existing __inline__ as well as the new inline spelling refer to gcc's keyword, and the redefinitions in compiler_types.h have no effect anyway. For those static inline definitions that appear after compiler_types.h has been processed, this is obviously a no-op due to the #define __inline__ inline. We will need to be able to use the __inline__ keyword to make use of the "asm inline()" feature from gcc 9. This is preparation for removing the #define. Generated by git grep --files-with-matches -w __inline__ | \ grep -vE '^(usr|Documentation|scripts)/' | \ grep -v /uapi/ | \ xargs sed -i -e 's/static *__inline__/static inline/' git grep --files-with-matches -E 'define.*__inline__$' | \ xargs sed -i -e 's/__inline__/inline/' but this patch should be regenerated and applied just before -rc1. There's a few functions with external linkage left, as well as static inlines in uapi headers. The former can probably easily be dealt with. The latter will need to continue to use the __inline__ spelling, but once we remove the #define, that will change the semantics of the kernel callers of those (since we'll lack the attributes we append). Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- arch/alpha/include/asm/atomic.h | 12 +++--- arch/alpha/include/asm/bitops.h | 6 +-- arch/alpha/include/asm/dma.h | 22 +++++----- arch/alpha/include/asm/floppy.h | 2 +- arch/alpha/include/asm/irq.h | 2 +- arch/alpha/include/asm/local.h | 4 +- arch/alpha/include/asm/smp.h | 2 +- .../arm/mach-iop32x/include/mach/uncompress.h | 2 +- .../arm/mach-iop33x/include/mach/uncompress.h | 2 +- .../arm/mach-ixp4xx/include/mach/uncompress.h | 2 +- arch/ia64/hp/common/sba_iommu.c | 2 +- arch/ia64/hp/sim/simeth.c | 2 +- arch/ia64/include/asm/atomic.h | 8 ++-- arch/ia64/include/asm/bitops.h | 34 ++++++++-------- arch/ia64/include/asm/delay.h | 14 +++---- arch/ia64/include/asm/irq.h | 2 +- arch/ia64/include/asm/page.h | 2 +- arch/ia64/include/asm/sn/leds.h | 2 +- arch/ia64/include/asm/uaccess.h | 4 +- arch/ia64/oprofile/backtrace.c | 4 +- arch/m68k/include/asm/blinken.h | 2 +- arch/m68k/include/asm/checksum.h | 2 +- arch/m68k/include/asm/dma.h | 32 +++++++-------- arch/m68k/include/asm/floppy.h | 8 ++-- arch/m68k/include/asm/nettel.h | 8 ++-- arch/m68k/mac/iop.c | 14 +++---- arch/mips/include/asm/atomic.h | 16 ++++---- arch/mips/include/asm/checksum.h | 2 +- arch/mips/include/asm/dma.h | 20 +++++----- arch/mips/include/asm/jazz.h | 2 +- arch/mips/include/asm/local.h | 4 +- arch/mips/include/asm/string.h | 8 ++-- arch/mips/kernel/binfmt_elfn32.c | 2 +- arch/nds32/include/asm/swab.h | 4 +- arch/parisc/include/asm/atomic.h | 20 +++++----- arch/parisc/include/asm/bitops.h | 18 ++++----- arch/parisc/include/asm/checksum.h | 4 +- arch/parisc/include/asm/compat.h | 2 +- arch/parisc/include/asm/delay.h | 2 +- arch/parisc/include/asm/dma.h | 20 +++++----- arch/parisc/include/asm/ide.h | 8 ++-- arch/parisc/include/asm/irq.h | 2 +- arch/parisc/include/asm/spinlock.h | 12 +++--- arch/powerpc/include/asm/atomic.h | 40 +++++++++---------- arch/powerpc/include/asm/bitops.h | 28 ++++++------- arch/powerpc/include/asm/dma.h | 20 +++++----- arch/powerpc/include/asm/edac.h | 2 +- arch/powerpc/include/asm/irq.h | 2 +- arch/powerpc/include/asm/local.h | 14 +++---- arch/sh/include/asm/pgtable_64.h | 2 +- arch/sh/include/asm/processor_32.h | 4 +- arch/sh/include/cpu-sh3/cpu/dac.h | 6 +-- arch/x86/um/asm/checksum.h | 4 +- arch/x86/um/asm/checksum_32.h | 4 +- arch/xtensa/include/asm/checksum.h | 14 +++---- arch/xtensa/include/asm/cmpxchg.h | 4 +- arch/xtensa/include/asm/irq.h | 2 +- block/partitions/amiga.c | 2 +- drivers/atm/he.c | 6 +-- drivers/atm/idt77252.c | 6 +-- drivers/gpu/drm/mga/mga_drv.h | 2 +- drivers/gpu/drm/mga/mga_state.c | 14 +++---- drivers/gpu/drm/r128/r128_drv.h | 2 +- drivers/gpu/drm/r128/r128_state.c | 14 +++---- drivers/gpu/drm/via/via_irq.c | 2 +- drivers/gpu/drm/via/via_verifier.c | 30 +++++++------- drivers/media/pci/ivtv/ivtv-ioctl.c | 2 +- drivers/net/ethernet/sun/sungem.c | 8 ++-- drivers/net/ethernet/sun/sunhme.c | 6 +-- drivers/net/hamradio/baycom_ser_fdx.c | 2 +- drivers/net/wan/lapbether.c | 2 +- drivers/net/wan/n2.c | 4 +- drivers/parisc/led.c | 4 +- drivers/parisc/sba_iommu.c | 2 +- drivers/parport/parport_gsc.h | 4 +- drivers/scsi/lpfc/lpfc_scsi.c | 2 +- drivers/scsi/pcmcia/sym53c500_cs.c | 4 +- drivers/scsi/qla2xxx/qla_inline.h | 2 +- drivers/scsi/qla2xxx/qla_os.c | 2 +- drivers/tty/amiserial.c | 2 +- drivers/tty/serial/ip22zilog.c | 2 +- drivers/tty/serial/sunsab.c | 4 +- drivers/tty/serial/sunzilog.c | 2 +- drivers/video/fbdev/core/fbcon.c | 20 +++++----- drivers/video/fbdev/ffb.c | 2 +- drivers/video/fbdev/intelfb/intelfbdrv.c | 8 ++-- drivers/video/fbdev/intelfb/intelfbhw.c | 2 +- drivers/w1/masters/matrox_w1.c | 4 +- fs/coda/coda_linux.h | 6 +-- fs/freevxfs/vxfs_inode.c | 2 +- fs/nfsd/nfsfh.h | 4 +- include/acpi/platform/acgcc.h | 2 +- include/asm-generic/ide_iops.h | 8 ++-- include/linux/atalk.h | 4 +- include/linux/hdlc.h | 4 +- include/linux/inetdevice.h | 6 +-- include/linux/parport.h | 4 +- include/linux/parport_pc.h | 22 +++++----- include/net/ax25.h | 2 +- include/net/checksum.h | 2 +- include/net/dn_nsp.h | 16 ++++---- include/net/ip.h | 2 +- include/net/ip6_checksum.h | 2 +- include/net/ipx.h | 10 ++--- include/net/llc_c_ev.h | 4 +- include/net/llc_conn.h | 4 +- include/net/llc_s_ev.h | 2 +- include/net/netrom.h | 8 ++-- include/net/scm.h | 14 +++---- include/net/udplite.h | 2 +- include/net/x25.h | 8 ++-- include/net/xfrm.h | 18 ++++----- include/video/newport.h | 12 +++--- net/appletalk/atalk_proc.c | 4 +- net/appletalk/ddp.c | 2 +- net/core/neighbour.c | 2 +- net/core/scm.c | 2 +- net/decnet/dn_nsp_in.c | 2 +- net/decnet/dn_nsp_out.c | 2 +- net/decnet/dn_route.c | 2 +- net/decnet/dn_table.c | 4 +- net/ipv6/af_inet6.c | 2 +- net/ipv6/icmp.c | 4 +- net/ipv6/udp.c | 2 +- net/lapb/lapb_iface.c | 4 +- net/llc/llc_input.c | 2 +- sound/sparc/amd7930.c | 6 +-- 127 files changed, 432 insertions(+), 432 deletions(-) diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h index 2144530d1428..79497d14ea75 100644 --- a/arch/alpha/include/asm/atomic.h +++ b/arch/alpha/include/asm/atomic.h @@ -40,7 +40,7 @@ */ #define ATOMIC_OP(op, asm_op) \ -static __inline__ void atomic_##op(int i, atomic_t * v) \ +static inline void atomic_##op(int i, atomic_t * v) \ { \ unsigned long temp; \ __asm__ __volatile__( \ @@ -93,7 +93,7 @@ static inline int atomic_fetch_##op##_relaxed(int i, atomic_t *v) \ } #define ATOMIC64_OP(op, asm_op) \ -static __inline__ void atomic64_##op(s64 i, atomic64_t * v) \ +static inline void atomic64_##op(s64 i, atomic64_t * v) \ { \ s64 temp; \ __asm__ __volatile__( \ @@ -109,7 +109,7 @@ static __inline__ void atomic64_##op(s64 i, atomic64_t * v) \ } \ #define ATOMIC64_OP_RETURN(op, asm_op) \ -static __inline__ s64 atomic64_##op##_return_relaxed(s64 i, atomic64_t * v) \ +static inline s64 atomic64_##op##_return_relaxed(s64 i, atomic64_t * v) \ { \ s64 temp, result; \ __asm__ __volatile__( \ @@ -128,7 +128,7 @@ static __inline__ s64 atomic64_##op##_return_relaxed(s64 i, atomic64_t * v) \ } #define ATOMIC64_FETCH_OP(op, asm_op) \ -static __inline__ s64 atomic64_fetch_##op##_relaxed(s64 i, atomic64_t * v) \ +static inline s64 atomic64_fetch_##op##_relaxed(s64 i, atomic64_t * v) \ { \ s64 temp, result; \ __asm__ __volatile__( \ @@ -214,7 +214,7 @@ ATOMIC_OPS(xor, xor) * Atomically adds @a to @v, so long as it was not @u. * Returns the old value of @v. */ -static __inline__ int atomic_fetch_add_unless(atomic_t *v, int a, int u) +static inline int atomic_fetch_add_unless(atomic_t *v, int a, int u) { int c, new, old; smp_mb(); @@ -246,7 +246,7 @@ static __inline__ int atomic_fetch_add_unless(atomic_t *v, int a, int u) * Atomically adds @a to @v, so long as it was not @u. * Returns the old value of @v. */ -static __inline__ s64 atomic64_fetch_add_unless(atomic64_t *v, s64 a, s64 u) +static inline s64 atomic64_fetch_add_unless(atomic64_t *v, s64 a, s64 u) { s64 c, new, old; smp_mb(); diff --git a/arch/alpha/include/asm/bitops.h b/arch/alpha/include/asm/bitops.h index 5adca78830b5..ca249316e3f9 100644 --- a/arch/alpha/include/asm/bitops.h +++ b/arch/alpha/include/asm/bitops.h @@ -82,7 +82,7 @@ clear_bit_unlock(unsigned long nr, volatile void * addr) /* * WARNING: non atomic version. */ -static __inline__ void +static inline void __clear_bit(unsigned long nr, volatile void * addr) { int *m = ((int *) addr) + (nr >> 5); @@ -118,7 +118,7 @@ change_bit(unsigned long nr, volatile void * addr) /* * WARNING: non atomic version. */ -static __inline__ void +static inline void __change_bit(unsigned long nr, volatile void * addr) { int *m = ((int *) addr) + (nr >> 5); @@ -272,7 +272,7 @@ test_and_change_bit(unsigned long nr, volatile void * addr) /* * WARNING: non atomic version. */ -static __inline__ int +static inline int __test_and_change_bit(unsigned long nr, volatile void * addr) { unsigned long mask = 1 << (nr & 0x1f); diff --git a/arch/alpha/include/asm/dma.h b/arch/alpha/include/asm/dma.h index 28610ea7786d..73bf4154b6a5 100644 --- a/arch/alpha/include/asm/dma.h +++ b/arch/alpha/include/asm/dma.h @@ -198,20 +198,20 @@ extern spinlock_t dma_spin_lock; -static __inline__ unsigned long claim_dma_lock(void) +static inline unsigned long claim_dma_lock(void) { unsigned long flags; spin_lock_irqsave(&dma_spin_lock, flags); return flags; } -static __inline__ void release_dma_lock(unsigned long flags) +static inline void release_dma_lock(unsigned long flags) { spin_unlock_irqrestore(&dma_spin_lock, flags); } /* enable/disable a specific DMA channel */ -static __inline__ void enable_dma(unsigned int dmanr) +static inline void enable_dma(unsigned int dmanr) { if (dmanr<=3) dma_outb(dmanr, DMA1_MASK_REG); @@ -219,7 +219,7 @@ static __inline__ void enable_dma(unsigned int dmanr) dma_outb(dmanr & 3, DMA2_MASK_REG); } -static __inline__ void disable_dma(unsigned int dmanr) +static inline void disable_dma(unsigned int dmanr) { if (dmanr<=3) dma_outb(dmanr | 4, DMA1_MASK_REG); @@ -234,7 +234,7 @@ static __inline__ void disable_dma(unsigned int dmanr) * --- In order to do that, the DMA routines below should --- * --- only be used while interrupts are disabled! --- */ -static __inline__ void clear_dma_ff(unsigned int dmanr) +static inline void clear_dma_ff(unsigned int dmanr) { if (dmanr<=3) dma_outb(0, DMA1_CLEAR_FF_REG); @@ -243,7 +243,7 @@ static __inline__ void clear_dma_ff(unsigned int dmanr) } /* set mode (above) for a specific DMA channel */ -static __inline__ void set_dma_mode(unsigned int dmanr, char mode) +static inline void set_dma_mode(unsigned int dmanr, char mode) { if (dmanr<=3) dma_outb(mode | dmanr, DMA1_MODE_REG); @@ -252,7 +252,7 @@ static __inline__ void set_dma_mode(unsigned int dmanr, char mode) } /* set extended mode for a specific DMA channel */ -static __inline__ void set_dma_ext_mode(unsigned int dmanr, char ext_mode) +static inline void set_dma_ext_mode(unsigned int dmanr, char ext_mode) { if (dmanr<=3) dma_outb(ext_mode | dmanr, DMA1_EXT_MODE_REG); @@ -264,7 +264,7 @@ static __inline__ void set_dma_ext_mode(unsigned int dmanr, char ext_mode) * This is used for successive transfers when we know the contents of * the lower 16 bits of the DMA current address register. */ -static __inline__ void set_dma_page(unsigned int dmanr, unsigned int pagenr) +static inline void set_dma_page(unsigned int dmanr, unsigned int pagenr) { switch(dmanr) { case 0: @@ -302,7 +302,7 @@ static __inline__ void set_dma_page(unsigned int dmanr, unsigned int pagenr) /* Set transfer address & page bits for specific DMA channel. * Assumes dma flipflop is clear. */ -static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int a) +static inline void set_dma_addr(unsigned int dmanr, unsigned int a) { if (dmanr <= 3) { dma_outb( a & 0xff, ((dmanr&3)<<1) + IO_DMA1_BASE ); @@ -323,7 +323,7 @@ static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int a) * Assumes dma flip-flop is clear. * NOTE 2: "count" represents _bytes_ and must be even for channels 5-7. */ -static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count) +static inline void set_dma_count(unsigned int dmanr, unsigned int count) { count--; if (dmanr <= 3) { @@ -344,7 +344,7 @@ static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count) * * Assumes DMA flip-flop is clear. */ -static __inline__ int get_dma_residue(unsigned int dmanr) +static inline int get_dma_residue(unsigned int dmanr) { unsigned int io_port = (dmanr<=3)? ((dmanr&3)<<1) + 1 + IO_DMA1_BASE : ((dmanr&3)<<2) + 2 + IO_DMA2_BASE; diff --git a/arch/alpha/include/asm/floppy.h b/arch/alpha/include/asm/floppy.h index 942924756cf2..6fc7f666008c 100644 --- a/arch/alpha/include/asm/floppy.h +++ b/arch/alpha/include/asm/floppy.h @@ -34,7 +34,7 @@ #define fd_dma_setup(addr,size,mode,io) alpha_fd_dma_setup(addr,size,mode,io) -static __inline__ int +static inline int alpha_fd_dma_setup(char *addr, unsigned long size, int mode, int io) { static unsigned long prev_size; diff --git a/arch/alpha/include/asm/irq.h b/arch/alpha/include/asm/irq.h index 432402c8e47f..b7d8a0eae1ae 100644 --- a/arch/alpha/include/asm/irq.h +++ b/arch/alpha/include/asm/irq.h @@ -77,7 +77,7 @@ # define NR_IRQS 16 #endif -static __inline__ int irq_canonicalize(int irq) +static inline int irq_canonicalize(int irq) { /* * XXX is this true for all Alpha's? The old serial driver diff --git a/arch/alpha/include/asm/local.h b/arch/alpha/include/asm/local.h index fab26a1c93d5..b13615ee5431 100644 --- a/arch/alpha/include/asm/local.h +++ b/arch/alpha/include/asm/local.h @@ -18,7 +18,7 @@ typedef struct #define local_add(i,l) atomic_long_add((i),(&(l)->a)) #define local_sub(i,l) atomic_long_sub((i),(&(l)->a)) -static __inline__ long local_add_return(long i, local_t * l) +static inline long local_add_return(long i, local_t * l) { long temp, result; __asm__ __volatile__( @@ -35,7 +35,7 @@ static __inline__ long local_add_return(long i, local_t * l) return result; } -static __inline__ long local_sub_return(long i, local_t * l) +static inline long local_sub_return(long i, local_t * l) { long temp, result; __asm__ __volatile__( diff --git a/arch/alpha/include/asm/smp.h b/arch/alpha/include/asm/smp.h index 2264ae72673b..f5e49acf60a4 100644 --- a/arch/alpha/include/asm/smp.h +++ b/arch/alpha/include/asm/smp.h @@ -9,7 +9,7 @@ /* HACK: Cabrio WHAMI return value is bogus if more than 8 bits used.. :-( */ -static __inline__ unsigned char +static inline unsigned char __hard_smp_processor_id(void) { register unsigned char __r0 __asm__("$0"); diff --git a/arch/arm/mach-iop32x/include/mach/uncompress.h b/arch/arm/mach-iop32x/include/mach/uncompress.h index ed4ac3e28fa1..24d1dd4ea27f 100644 --- a/arch/arm/mach-iop32x/include/mach/uncompress.h +++ b/arch/arm/mach-iop32x/include/mach/uncompress.h @@ -23,7 +23,7 @@ static inline void flush(void) { } -static __inline__ void __arch_decomp_setup(unsigned long arch_id) +static inline void __arch_decomp_setup(unsigned long arch_id) { if (machine_is_iq80321()) uart_base = (volatile u8 *)IQ80321_UART; diff --git a/arch/arm/mach-iop33x/include/mach/uncompress.h b/arch/arm/mach-iop33x/include/mach/uncompress.h index 62b71cde1f79..9fc5a2aae8de 100644 --- a/arch/arm/mach-iop33x/include/mach/uncompress.h +++ b/arch/arm/mach-iop33x/include/mach/uncompress.h @@ -23,7 +23,7 @@ static inline void flush(void) { } -static __inline__ void __arch_decomp_setup(unsigned long arch_id) +static inline void __arch_decomp_setup(unsigned long arch_id) { if (machine_is_iq80331() || machine_is_iq80332()) uart_base = (volatile u32 *)IOP33X_UART0_PHYS; diff --git a/arch/arm/mach-ixp4xx/include/mach/uncompress.h b/arch/arm/mach-ixp4xx/include/mach/uncompress.h index 9e08b270cfc7..6c7c59cd7f12 100644 --- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h +++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h @@ -31,7 +31,7 @@ static void flush(void) { } -static __inline__ void __arch_decomp_setup(unsigned long arch_id) +static inline void __arch_decomp_setup(unsigned long arch_id) { /* * Some boards are using UART2 as console diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 3d24cc43385b..063e7e02d0cb 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c @@ -104,7 +104,7 @@ extern int swiotlb_late_init_with_default_size (size_t size); #error FULL_VALID_PDIR and ASSERT_PDIR_SANITY are mutually exclusive #endif -#define SBA_INLINE __inline__ +#define SBA_INLINE inline /* #define SBA_INLINE */ #ifdef DEBUG_SBA_INIT diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c index f39ef2b4ed72..e0620283dfc6 100644 --- a/arch/ia64/hp/sim/simeth.c +++ b/arch/ia64/hp/sim/simeth.c @@ -246,7 +246,7 @@ simeth_open(struct net_device *dev) } /* copied from lapbether.c */ -static __inline__ int dev_is_ethdev(struct net_device *dev) +static inline int dev_is_ethdev(struct net_device *dev) { return ( dev->type == ARPHRD_ETHER && strncmp(dev->name, "dummy", 5)); } diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h index 50440f3ddc43..eefee0660f27 100644 --- a/arch/ia64/include/asm/atomic.h +++ b/arch/ia64/include/asm/atomic.h @@ -29,7 +29,7 @@ #define atomic64_set(v,i) WRITE_ONCE(((v)->counter), (i)) #define ATOMIC_OP(op, c_op) \ -static __inline__ int \ +static inline int \ ia64_atomic_##op (int i, atomic_t *v) \ { \ __s32 old, new; \ @@ -44,7 +44,7 @@ ia64_atomic_##op (int i, atomic_t *v) \ } #define ATOMIC_FETCH_OP(op, c_op) \ -static __inline__ int \ +static inline int \ ia64_atomic_fetch_##op (int i, atomic_t *v) \ { \ __s32 old, new; \ @@ -124,7 +124,7 @@ ATOMIC_FETCH_OP(xor, ^) #undef ATOMIC_OP #define ATOMIC64_OP(op, c_op) \ -static __inline__ s64 \ +static inline s64 \ ia64_atomic64_##op (s64 i, atomic64_t *v) \ { \ s64 old, new; \ @@ -139,7 +139,7 @@ ia64_atomic64_##op (s64 i, atomic64_t *v) \ } #define ATOMIC64_FETCH_OP(op, c_op) \ -static __inline__ s64 \ +static inline s64 \ ia64_atomic64_fetch_##op (s64 i, atomic64_t *v) \ { \ s64 old, new; \ diff --git a/arch/ia64/include/asm/bitops.h b/arch/ia64/include/asm/bitops.h index 2f24ee6459d2..b369376d9e78 100644 --- a/arch/ia64/include/asm/bitops.h +++ b/arch/ia64/include/asm/bitops.h @@ -36,7 +36,7 @@ * * bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1). */ -static __inline__ void +static inline void set_bit (int nr, volatile void *addr) { __u32 bit, old, new; @@ -61,7 +61,7 @@ set_bit (int nr, volatile void *addr) * If it's called on the same region of memory simultaneously, the effect * may be that only one operation succeeds. */ -static __inline__ void +static inline void __set_bit (int nr, volatile void *addr) { *((__u32 *) addr + (nr >> 5)) |= (1 << (nr & 31)); @@ -77,7 +77,7 @@ __set_bit (int nr, volatile void *addr) * you should call smp_mb__before_atomic() and/or smp_mb__after_atomic() * in order to ensure changes are visible on other processors. */ -static __inline__ void +static inline void clear_bit (int nr, volatile void *addr) { __u32 mask, old, new; @@ -101,7 +101,7 @@ clear_bit (int nr, volatile void *addr) * clear_bit_unlock() is atomic and may not be reordered. It does * contain a memory barrier suitable for unlock type operations. */ -static __inline__ void +static inline void clear_bit_unlock (int nr, volatile void *addr) { __u32 mask, old, new; @@ -125,7 +125,7 @@ clear_bit_unlock (int nr, volatile void *addr) * Similarly to clear_bit_unlock, the implementation uses a store * with release semantics. See also arch_spin_unlock(). */ -static __inline__ void +static inline void __clear_bit_unlock(int nr, void *addr) { __u32 * const m = (__u32 *) addr + (nr >> 5); @@ -143,7 +143,7 @@ __clear_bit_unlock(int nr, void *addr) * If it's called on the same region of memory simultaneously, the effect * may be that only one operation succeeds. */ -static __inline__ void +static inline void __clear_bit (int nr, volatile void *addr) { *((__u32 *) addr + (nr >> 5)) &= ~(1 << (nr & 31)); @@ -158,7 +158,7 @@ __clear_bit (int nr, volatile void *addr) * Note that @nr may be almost arbitrarily large; this function is not * restricted to acting on a single-word quantity. */ -static __inline__ void +static inline void change_bit (int nr, volatile void *addr) { __u32 bit, old, new; @@ -183,7 +183,7 @@ change_bit (int nr, volatile void *addr) * If it's called on the same region of memory simultaneously, the effect * may be that only one operation succeeds. */ -static __inline__ void +static inline void __change_bit (int nr, volatile void *addr) { *((__u32 *) addr + (nr >> 5)) ^= (1 << (nr & 31)); @@ -197,7 +197,7 @@ __change_bit (int nr, volatile void *addr) * This operation is atomic and cannot be reordered. * It also implies the acquisition side of the memory barrier. */ -static __inline__ int +static inline int test_and_set_bit (int nr, volatile void *addr) { __u32 bit, old, new; @@ -232,7 +232,7 @@ test_and_set_bit (int nr, volatile void *addr) * If two examples of this operation race, one can appear to succeed * but actually fail. You must protect multiple accesses with a lock. */ -static __inline__ int +static inline int __test_and_set_bit (int nr, volatile void *addr) { __u32 *p = (__u32 *) addr + (nr >> 5); @@ -251,7 +251,7 @@ __test_and_set_bit (int nr, volatile void *addr) * This operation is atomic and cannot be reordered. * It also implies the acquisition side of the memory barrier. */ -static __inline__ int +static inline int test_and_clear_bit (int nr, volatile void *addr) { __u32 mask, old, new; @@ -277,7 +277,7 @@ test_and_clear_bit (int nr, volatile void *addr) * If two examples of this operation race, one can appear to succeed * but actually fail. You must protect multiple accesses with a lock. */ -static __inline__ int +static inline int __test_and_clear_bit(int nr, volatile void * addr) { __u32 *p = (__u32 *) addr + (nr >> 5); @@ -296,7 +296,7 @@ __test_and_clear_bit(int nr, volatile void * addr) * This operation is atomic and cannot be reordered. * It also implies the acquisition side of the memory barrier. */ -static __inline__ int +static inline int test_and_change_bit (int nr, volatile void *addr) { __u32 bit, old, new; @@ -320,7 +320,7 @@ test_and_change_bit (int nr, volatile void *addr) * * This operation is non-atomic and can be reordered. */ -static __inline__ int +static inline int __test_and_change_bit (int nr, void *addr) { __u32 old, bit = (1 << (nr & 31)); @@ -331,7 +331,7 @@ __test_and_change_bit (int nr, void *addr) return (old & bit) != 0; } -static __inline__ int +static inline int test_bit (int nr, const volatile void *addr) { return 1 & (((const volatile __u32 *) addr)[nr >> 5] >> (nr & 31)); @@ -359,7 +359,7 @@ ffz (unsigned long x) * * Undefined if no bit exists, so code should check against 0 first. */ -static __inline__ unsigned long +static inline unsigned long __ffs (unsigned long x) { unsigned long result; @@ -426,7 +426,7 @@ __fls (unsigned long x) * hweightN: returns the hamming weight (i.e. the number * of bits set) of a N-bit word */ -static __inline__ unsigned long __arch_hweight64(unsigned long x) +static inline unsigned long __arch_hweight64(unsigned long x) { unsigned long result; result = ia64_popcnt(x); diff --git a/arch/ia64/include/asm/delay.h b/arch/ia64/include/asm/delay.h index 0227ac586107..9f7e60496feb 100644 --- a/arch/ia64/include/asm/delay.h +++ b/arch/ia64/include/asm/delay.h @@ -20,14 +20,14 @@ #include <asm/intrinsics.h> #include <asm/processor.h> -static __inline__ void +static inline void ia64_set_itm (unsigned long val) { ia64_setreg(_IA64_REG_CR_ITM, val); ia64_srlz_d(); } -static __inline__ unsigned long +static inline unsigned long ia64_get_itm (void) { unsigned long result; @@ -37,27 +37,27 @@ ia64_get_itm (void) return result; } -static __inline__ void +static inline void ia64_set_itv (unsigned long val) { ia64_setreg(_IA64_REG_CR_ITV, val); ia64_srlz_d(); } -static __inline__ unsigned long +static inline unsigned long ia64_get_itv (void) { return ia64_getreg(_IA64_REG_CR_ITV); } -static __inline__ void +static inline void ia64_set_itc (unsigned long val) { ia64_setreg(_IA64_REG_AR_ITC, val); ia64_srlz_d(); } -static __inline__ unsigned long +static inline unsigned long ia64_get_itc (void) { unsigned long result; @@ -75,7 +75,7 @@ ia64_get_itc (void) extern void ia64_delay_loop (unsigned long loops); -static __inline__ void +static inline void __delay (unsigned long loops) { if (unlikely(loops < 1)) diff --git a/arch/ia64/include/asm/irq.h b/arch/ia64/include/asm/irq.h index 8b84a55ed38a..eab8defa30de 100644 --- a/arch/ia64/include/asm/irq.h +++ b/arch/ia64/include/asm/irq.h @@ -16,7 +16,7 @@ #include <linux/cpumask.h> #include <generated/nr-irqs.h> -static __inline__ int +static inline int irq_canonicalize (int irq) { /* diff --git a/arch/ia64/include/asm/page.h b/arch/ia64/include/asm/page.h index 5798bd2b462c..858317be10cb 100644 --- a/arch/ia64/include/asm/page.h +++ b/arch/ia64/include/asm/page.h @@ -154,7 +154,7 @@ typedef union ia64_va { extern unsigned int hpage_shift; #endif -static __inline__ int +static inline int get_order (unsigned long size) { long double d = size - 1; diff --git a/arch/ia64/include/asm/sn/leds.h b/arch/ia64/include/asm/sn/leds.h index 66cf8c4d92c9..48aabe95523f 100644 --- a/arch/ia64/include/asm/sn/leds.h +++ b/arch/ia64/include/asm/sn/leds.h @@ -22,7 +22,7 @@ * Basic macros for flashing the LEDS on an SGI SN. */ -static __inline__ void +static inline void set_led_bits(u8 value, u8 mask) { pda->led_state = (pda->led_state & ~mask) | (value & mask); diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h index 89782ad3fb88..4ece3afc8b00 100644 --- a/arch/ia64/include/asm/uaccess.h +++ b/arch/ia64/include/asm/uaccess.h @@ -258,7 +258,7 @@ extern unsigned long __strnlen_user (const char __user *, long); }) #define ARCH_HAS_TRANSLATE_MEM_PTR 1 -static __inline__ void * +static inline void * xlate_dev_mem_ptr(phys_addr_t p) { struct page *page; @@ -276,7 +276,7 @@ xlate_dev_mem_ptr(phys_addr_t p) /* * Convert a virtual cached kernel memory pointer to an uncached pointer */ -static __inline__ void * +static inline void * xlate_dev_kmem_ptr(void *p) { struct page *page; diff --git a/arch/ia64/oprofile/backtrace.c b/arch/ia64/oprofile/backtrace.c index 6a219a946050..c9c8282f7a73 100644 --- a/arch/ia64/oprofile/backtrace.c +++ b/arch/ia64/oprofile/backtrace.c @@ -32,7 +32,7 @@ typedef struct } ia64_backtrace_t; /* Returns non-zero if the PC is in the Interrupt Vector Table */ -static __inline__ int in_ivt_code(unsigned long pc) +static inline int in_ivt_code(unsigned long pc) { extern char ia64_ivt[]; return (pc >= (u_long)ia64_ivt && pc < (u_long)ia64_ivt+32768); @@ -41,7 +41,7 @@ static __inline__ int in_ivt_code(unsigned long pc) /* * Unwind to next stack frame. */ -static __inline__ int next_frame(ia64_backtrace_t *bt) +static inline int next_frame(ia64_backtrace_t *bt) { /* * Avoid unsightly console message from unw_unwind() when attempting diff --git a/arch/m68k/include/asm/blinken.h b/arch/m68k/include/asm/blinken.h index 0626582a7db4..2e5e74d74f82 100644 --- a/arch/m68k/include/asm/blinken.h +++ b/arch/m68k/include/asm/blinken.h @@ -19,7 +19,7 @@ extern unsigned char hp300_ledstate; -static __inline__ void blinken_leds(int on, int off) +static inline void blinken_leds(int on, int off) { if (MACH_IS_HP300) { diff --git a/arch/m68k/include/asm/checksum.h b/arch/m68k/include/asm/checksum.h index f9b94e4b94f9..3724307be4a1 100644 --- a/arch/m68k/include/asm/checksum.h +++ b/arch/m68k/include/asm/checksum.h @@ -116,7 +116,7 @@ static inline __sum16 ip_compute_csum(const void *buff, int len) } #define _HAVE_ARCH_IPV6_CSUM -static __inline__ __sum16 +static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, __u32 len, __u8 proto, __wsum sum) { diff --git a/arch/m68k/include/asm/dma.h b/arch/m68k/include/asm/dma.h index ae2021964e32..a451778fe112 100644 --- a/arch/m68k/include/asm/dma.h +++ b/arch/m68k/include/asm/dma.h @@ -123,7 +123,7 @@ extern unsigned int dma_device_address[MAX_M68K_DMA_CHANNELS]; #if !defined(CONFIG_M5272) /* enable/disable a specific DMA channel */ -static __inline__ void enable_dma(unsigned int dmanr) +static inline void enable_dma(unsigned int dmanr) { volatile unsigned short *dmawp; @@ -135,7 +135,7 @@ static __inline__ void enable_dma(unsigned int dmanr) dmawp[MCFDMA_DCR] |= MCFDMA_DCR_EEXT; } -static __inline__ void disable_dma(unsigned int dmanr) +static inline void disable_dma(unsigned int dmanr) { volatile unsigned short *dmawp; volatile unsigned char *dmapb; @@ -162,12 +162,12 @@ static __inline__ void disable_dma(unsigned int dmanr) * * This is a NOP for ColdFire. Provide a stub for compatibility. */ -static __inline__ void clear_dma_ff(unsigned int dmanr) +static inline void clear_dma_ff(unsigned int dmanr) { } /* set mode (above) for a specific DMA channel */ -static __inline__ void set_dma_mode(unsigned int dmanr, char mode) +static inline void set_dma_mode(unsigned int dmanr, char mode) { volatile unsigned char *dmabp; @@ -210,7 +210,7 @@ static __inline__ void set_dma_mode(unsigned int dmanr, char mode) } /* Set transfer address for specific DMA channel */ -static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int a) +static inline void set_dma_addr(unsigned int dmanr, unsigned int a) { volatile unsigned short *dmawp; volatile unsigned int *dmalp; @@ -247,7 +247,7 @@ static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int a) * Specific for Coldfire - sets device address. * Should be called after the mode set call, and before set DMA address. */ -static __inline__ void set_dma_device_addr(unsigned int dmanr, unsigned int a) +static inline void set_dma_device_addr(unsigned int dmanr, unsigned int a) { #ifdef DMA_DEBUG printk("set_dma_device_addr(dmanr=%d,a=%x)\n", dmanr, a); @@ -259,7 +259,7 @@ static __inline__ void set_dma_device_addr(unsigned int dmanr, unsigned int a) /* * NOTE 2: "count" represents _bytes_. */ -static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count) +static inline void set_dma_count(unsigned int dmanr, unsigned int count) { volatile unsigned short *dmawp; @@ -277,7 +277,7 @@ static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count) * still in progress will return unpredictable results. * Otherwise, it returns the number of _bytes_ left to transfer. */ -static __inline__ int get_dma_residue(unsigned int dmanr) +static inline int get_dma_residue(unsigned int dmanr) { volatile unsigned short *dmawp; unsigned short count; @@ -316,7 +316,7 @@ static __inline__ int get_dma_residue(unsigned int dmanr) */ /* enable/disable a specific DMA channel */ -static __inline__ void enable_dma(unsigned int dmanr) +static inline void enable_dma(unsigned int dmanr) { volatile unsigned int *dmalp; @@ -328,7 +328,7 @@ static __inline__ void enable_dma(unsigned int dmanr) dmalp[MCFDMA_DMR] |= MCFDMA_DMR_EN; } -static __inline__ void disable_dma(unsigned int dmanr) +static inline void disable_dma(unsigned int dmanr) { volatile unsigned int *dmalp; @@ -353,12 +353,12 @@ static __inline__ void disable_dma(unsigned int dmanr) * * This is a NOP for ColdFire. Provide a stub for compatibility. */ -static __inline__ void clear_dma_ff(unsigned int dmanr) +static inline void clear_dma_ff(unsigned int dmanr) { } /* set mode (above) for a specific DMA channel */ -static __inline__ void set_dma_mode(unsigned int dmanr, char mode) +static inline void set_dma_mode(unsigned int dmanr, char mode) { volatile unsigned int *dmalp; @@ -396,7 +396,7 @@ static __inline__ void set_dma_mode(unsigned int dmanr, char mode) } /* Set transfer address for specific DMA channel */ -static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int a) +static inline void set_dma_addr(unsigned int dmanr, unsigned int a) { volatile unsigned int *dmalp; @@ -431,7 +431,7 @@ static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int a) * Specific for Coldfire - sets device address. * Should be called after the mode set call, and before set DMA address. */ -static __inline__ void set_dma_device_addr(unsigned int dmanr, unsigned int a) +static inline void set_dma_device_addr(unsigned int dmanr, unsigned int a) { #ifdef DMA_DEBUG printk("set_dma_device_addr(dmanr=%d,a=%x)\n", dmanr, a); @@ -445,7 +445,7 @@ static __inline__ void set_dma_device_addr(unsigned int dmanr, unsigned int a) * * NOTE 3: While a 32-bit register, "count" is only a maximum 24-bit value. */ -static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count) +static inline void set_dma_count(unsigned int dmanr, unsigned int count) { volatile unsigned int *dmalp; @@ -463,7 +463,7 @@ static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count) * still in progress will return unpredictable results. * Otherwise, it returns the number of _bytes_ left to transfer. */ -static __inline__ int get_dma_residue(unsigned int dmanr) +static inline int get_dma_residue(unsigned int dmanr) { volatile unsigned int *dmalp; unsigned int count; diff --git a/arch/m68k/include/asm/floppy.h b/arch/m68k/include/asm/floppy.h index c3b9ad6732fc..7a658a5ca746 100644 --- a/arch/m68k/include/asm/floppy.h +++ b/arch/m68k/include/asm/floppy.h @@ -50,20 +50,20 @@ static int doing_pdma=0; extern spinlock_t dma_spin_lock; -static __inline__ unsigned long claim_dma_lock(void) +static inline unsigned long claim_dma_lock(void) { unsigned long flags; spin_lock_irqsave(&dma_spin_lock, flags); return flags; } -static __inline__ void release_dma_lock(unsigned long flags) +static inline void release_dma_lock(unsigned long flags) { spin_unlock_irqrestore(&dma_spin_lock, flags); } -static __inline__ unsigned char fd_inb(int port) +static inline unsigned char fd_inb(int port) { if(MACH_IS_Q40) return inb_p(port); @@ -72,7 +72,7 @@ static __inline__ unsigned char fd_inb(int port) return 0; } -static __inline__ void fd_outb(unsigned char value, int port) +static inline void fd_outb(unsigned char value, int port) { if(MACH_IS_Q40) outb_p(value, port); diff --git a/arch/m68k/include/asm/nettel.h b/arch/m68k/include/asm/nettel.h index 45716ead7b9d..4037377c0048 100644 --- a/arch/m68k/include/asm/nettel.h +++ b/arch/m68k/include/asm/nettel.h @@ -47,14 +47,14 @@ extern volatile unsigned short ppdata; * These functions defined to give quasi generic access to the * PPIO bits used for DTR/DCD. */ -static __inline__ unsigned int mcf_getppdata(void) +static inline unsigned int mcf_getppdata(void) { volatile unsigned short *pp; pp = (volatile unsigned short *) MCFSIM_PADAT; return((unsigned int) *pp); } -static __inline__ void mcf_setppdata(unsigned int mask, unsigned int bits) +static inline void mcf_setppdata(unsigned int mask, unsigned int bits) { volatile unsigned short *pp; pp = (volatile unsigned short *) MCFSIM_PADAT; @@ -86,12 +86,12 @@ static __inline__ void mcf_setppdata(unsigned int mask, unsigned int bits) * These functions defined to give quasi generic access to the * PPIO bits used for DTR/DCD. */ -static __inline__ unsigned int mcf_getppdata(void) +static inline unsigned int mcf_getppdata(void) { return readw(MCFSIM_PBDAT); } -static __inline__ void mcf_setppdata(unsigned int mask, unsigned int bits) +static inline void mcf_setppdata(unsigned int mask, unsigned int bits) { writew((readw(MCFSIM_PBDAT) & ~mask) | bits, MCFSIM_PBDAT); } diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c index 9bfa17015768..288b07530802 100644 --- a/arch/m68k/mac/iop.c +++ b/arch/m68k/mac/iop.c @@ -161,42 +161,42 @@ irqreturn_t iop_ism_irq(int, void *); * Private access functions */ -static __inline__ void iop_loadaddr(volatile struct mac_iop *iop, __u16 addr) +static inline void iop_loadaddr(volatile struct mac_iop *iop, __u16 addr) { iop->ram_addr_lo = addr; iop->ram_addr_hi = addr >> 8; } -static __inline__ __u8 iop_readb(volatile struct mac_iop *iop, __u16 addr) +static inline __u8 iop_readb(volatile struct mac_iop *iop, __u16 addr) { iop->ram_addr_lo = addr; iop->ram_addr_hi = addr >> 8; return iop->ram_data; } -static __inline__ void iop_writeb(volatile struct mac_iop *iop, __u16 addr, __u8 data) +static inline void iop_writeb(volatile struct mac_iop *iop, __u16 addr, __u8 data) { iop->ram_addr_lo = addr; iop->ram_addr_hi = addr >> 8; iop->ram_data = data; } -static __inline__ void iop_stop(volatile struct mac_iop *iop) +static inline void iop_stop(volatile struct mac_iop *iop) { iop->status_ctrl &= ~IOP_RUN; } -static __inline__ void iop_start(volatile struct mac_iop *iop) +static inline void iop_start(volatile struct mac_iop *iop) { iop->status_ctrl = IOP_RUN | IOP_AUTOINC; } -static __inline__ void iop_bypass(volatile struct mac_iop *iop) +static inline void iop_bypass(volatile struct mac_iop *iop) { iop->status_ctrl |= IOP_BYPASS; } -static __inline__ void iop_interrupt(volatile struct mac_iop *iop) +static inline void iop_interrupt(volatile struct mac_iop *iop) { iop->status_ctrl |= IOP_IRQ; } diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h index 9a82dd11c0e9..c516e4f85edc 100644 --- a/arch/mips/include/asm/atomic.h +++ b/arch/mips/include/asm/atomic.h @@ -53,7 +53,7 @@ #define atomic_set(v, i) WRITE_ONCE((v)->counter, (i)) #define ATOMIC_OP(op, c_op, asm_op) \ -static __inline__ void atomic_##op(int i, atomic_t * v) \ +static inline void atomic_##op(int i, atomic_t * v) \ { \ if (kernel_uses_llsc) { \ int temp; \ @@ -79,7 +79,7 @@ static __inline__ void atomic_##op(int i, atomic_t * v) \ } #define ATOMIC_OP_RETURN(op, c_op, asm_op) \ -static __inline__ int atomic_##op##_return_relaxed(int i, atomic_t * v) \ +static inline int atomic_##op##_return_relaxed(int i, atomic_t * v) \ { \ int result; \ \ @@ -113,7 +113,7 @@ static __inline__ int atomic_##op##_return_relaxed(int i, atomic_t * v) \ } #define ATOMIC_FETCH_OP(op, c_op, asm_op) \ -static __inline__ int atomic_fetch_##op##_relaxed(int i, atomic_t * v) \ +static inline int atomic_fetch_##op##_relaxed(int i, atomic_t * v) \ { \ int result; \ \ @@ -184,7 +184,7 @@ ATOMIC_OPS(xor, ^=, xor) * Atomically test @v and subtract @i if @v is greater or equal than @i. * The function returns the old value of @v minus @i. */ -static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) +static inline int atomic_sub_if_positive(int i, atomic_t * v) { int result; @@ -254,7 +254,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) #define atomic64_set(v, i) WRITE_ONCE((v)->counter, (i)) #define ATOMIC64_OP(op, c_op, asm_op) \ -static __inline__ void atomic64_##op(s64 i, atomic64_t * v) \ +static inline void atomic64_##op(s64 i, atomic64_t * v) \ { \ if (kernel_uses_llsc) { \ s64 temp; \ @@ -280,7 +280,7 @@ static __inline__ void atomic64_##op(s64 i, atomic64_t * v) \ } #define ATOMIC64_OP_RETURN(op, c_op, asm_op) \ -static __inline__ s64 atomic64_##op##_return_relaxed(s64 i, atomic64_t * v) \ +static inline s64 atomic64_##op##_return_relaxed(s64 i, atomic64_t * v) \ { \ s64 result; \ \ @@ -314,7 +314,7 @@ static __inline__ s64 atomic64_##op##_return_relaxed(s64 i, atomic64_t * v) \ } #define ATOMIC64_FETCH_OP(op, c_op, asm_op) \ -static __inline__ s64 atomic64_fetch_##op##_relaxed(s64 i, atomic64_t * v) \ +static inline s64 atomic64_fetch_##op##_relaxed(s64 i, atomic64_t * v) \ { \ s64 result; \ \ @@ -386,7 +386,7 @@ ATOMIC64_OPS(xor, ^=, xor) * Atomically test @v and subtract @i if @v is greater or equal than @i. * The function returns the old value of @v minus @i. */ -static __inline__ s64 atomic64_sub_if_positive(s64 i, atomic64_t * v) +static inline s64 atomic64_sub_if_positive(s64 i, atomic64_t * v) { s64 result; diff --git a/arch/mips/include/asm/checksum.h b/arch/mips/include/asm/checksum.h index dcebaaf8c862..88a98aea9fdb 100644 --- a/arch/mips/include/asm/checksum.h +++ b/arch/mips/include/asm/checksum.h @@ -215,7 +215,7 @@ static inline __sum16 ip_compute_csum(const void *buff, int len) } #define _HAVE_ARCH_IPV6_CSUM -static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, +static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, __u32 len, __u8 proto, __wsum sum) diff --git a/arch/mips/include/asm/dma.h b/arch/mips/include/asm/dma.h index be726b943530..85cc6b5df8c9 100644 --- a/arch/mips/include/asm/dma.h +++ b/arch/mips/include/asm/dma.h @@ -157,20 +157,20 @@ extern spinlock_t dma_spin_lock; -static __inline__ unsigned long claim_dma_lock(void) +static inline unsigned long claim_dma_lock(void) { unsigned long flags; spin_lock_irqsave(&dma_spin_lock, flags); return flags; } -static __inline__ void release_dma_lock(unsigned long flags) +static inline void release_dma_lock(unsigned long flags) { spin_unlock_irqrestore(&dma_spin_lock, flags); } /* enable/disable a specific DMA channel */ -static __inline__ void enable_dma(unsigned int dmanr) +static inline void enable_dma(unsigned int dmanr) { if (dmanr<=3) dma_outb(dmanr, DMA1_MASK_REG); @@ -178,7 +178,7 @@ static __inline__ void enable_dma(unsigned int dmanr) dma_outb(dmanr & 3, DMA2_MASK_REG); } -static __inline__ void disable_dma(unsigned int dmanr) +static inline void disable_dma(unsigned int dmanr) { if (dmanr<=3) dma_outb(dmanr | 4, DMA1_MASK_REG); @@ -193,7 +193,7 @@ static __inline__ void disable_dma(unsigned int dmanr) * --- In order to do that, the DMA routines below should --- * --- only be used while holding the DMA lock ! --- */ -static __inline__ void clear_dma_ff(unsigned int dmanr) +static inline void clear_dma_ff(unsigned int dmanr) { if (dmanr<=3) dma_outb(0, DMA1_CLEAR_FF_REG); @@ -202,7 +202,7 @@ static __inline__ void clear_dma_ff(unsigned int dmanr) } /* set mode (above) for a specific DMA channel */ -static __inline__ void set_dma_mode(unsigned int dmanr, char mode) +static inline void set_dma_mode(unsigned int dmanr, char mode) { if (dmanr<=3) dma_outb(mode | dmanr, DMA1_MODE_REG); @@ -215,7 +215,7 @@ static __inline__ void set_dma_mode(unsigned int dmanr, char mode) * the lower 16 bits of the DMA current address register, but a 64k boundary * may have been crossed. */ -static __inline__ void set_dma_page(unsigned int dmanr, char pagenr) +static inline void set_dma_page(unsigned int dmanr, char pagenr) { switch(dmanr) { case 0: @@ -246,7 +246,7 @@ static __inline__ void set_dma_page(unsigned int dmanr, char pagenr) /* Set transfer address & page bits for specific DMA channel. * Assumes dma flipflop is clear. */ -static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int a) +static inline void set_dma_addr(unsigned int dmanr, unsigned int a) { set_dma_page(dmanr, a>>16); if (dmanr <= 3) { @@ -267,7 +267,7 @@ static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int a) * Assumes dma flip-flop is clear. * NOTE 2: "count" represents _bytes_ and must be even for channels 5-7. */ -static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count) +static inline void set_dma_count(unsigned int dmanr, unsigned int count) { count--; if (dmanr <= 3) { @@ -288,7 +288,7 @@ static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count) * * Assumes DMA flip-flop is clear. */ -static __inline__ int get_dma_residue(unsigned int dmanr) +static inline int get_dma_residue(unsigned int dmanr) { unsigned int io_port = (dmanr<=3)? ((dmanr&3)<<1) + 1 + IO_DMA1_BASE : ((dmanr&3)<<2) + 2 + IO_DMA2_BASE; diff --git a/arch/mips/include/asm/jazz.h b/arch/mips/include/asm/jazz.h index a61970d01a81..9401780519eb 100644 --- a/arch/mips/include/asm/jazz.h +++ b/arch/mips/include/asm/jazz.h @@ -72,7 +72,7 @@ #ifndef __ASSEMBLY__ -static __inline__ void pica_set_led(unsigned int bits) +static inline void pica_set_led(unsigned int bits) { volatile unsigned int *led_register = (unsigned int *) PICA_LED; diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h index 02783e141c32..bdd7f714bf67 100644 --- a/arch/mips/include/asm/local.h +++ b/arch/mips/include/asm/local.h @@ -27,7 +27,7 @@ typedef struct /* * Same as above, but return the result value */ -static __inline__ long local_add_return(long i, local_t * l) +static inline long local_add_return(long i, local_t * l) { unsigned long result; @@ -74,7 +74,7 @@ static __inline__ long local_add_return(long i, local_t * l) return result; } -static __inline__ long local_sub_return(long i, local_t * l) +static inline long local_sub_return(long i, local_t * l) { unsigned long result; diff --git a/arch/mips/include/asm/string.h b/arch/mips/include/asm/string.h index 29030cb398ee..8764cba30e50 100644 --- a/arch/mips/include/asm/string.h +++ b/arch/mips/include/asm/string.h @@ -20,7 +20,7 @@ #ifndef IN_STRING_C #define __HAVE_ARCH_STRCPY -static __inline__ char *strcpy(char *__dest, __const__ char *__src) +static inline char *strcpy(char *__dest, __const__ char *__src) { char *__xdest = __dest; @@ -42,7 +42,7 @@ static __inline__ char *strcpy(char *__dest, __const__ char *__src) } #define __HAVE_ARCH_STRNCPY -static __inline__ char *strncpy(char *__dest, __const__ char *__src, size_t __n) +static inline char *strncpy(char *__dest, __const__ char *__src, size_t __n) { char *__xdest = __dest; @@ -70,7 +70,7 @@ static __inline__ char *strncpy(char *__dest, __const__ char *__src, size_t __n) } #define __HAVE_ARCH_STRCMP -static __inline__ int strcmp(__const__ char *__cs, __const__ char *__ct) +static inline int strcmp(__const__ char *__cs, __const__ char *__ct) { int __res; @@ -100,7 +100,7 @@ static __inline__ int strcmp(__const__ char *__cs, __const__ char *__ct) #endif /* !defined(IN_STRING_C) */ #define __HAVE_ARCH_STRNCMP -static __inline__ int +static inline int strncmp(__const__ char *__cs, __const__ char *__ct, size_t __count) { int __res; diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c index 7a12763d553a..c84b0d718dd4 100644 --- a/arch/mips/kernel/binfmt_elfn32.c +++ b/arch/mips/kernel/binfmt_elfn32.c @@ -82,7 +82,7 @@ struct elf_prpsinfo32 #define init_elf_binfmt init_elfn32_binfmt #define jiffies_to_timeval jiffies_to_old_timeval32 -static __inline__ void +static inline void jiffies_to_old_timeval32(unsigned long jiffies, struct old_timeval32 *value) { /* diff --git a/arch/nds32/include/asm/swab.h b/arch/nds32/include/asm/swab.h index 362a466f2976..78f6ee71e32a 100644 --- a/arch/nds32/include/asm/swab.h +++ b/arch/nds32/include/asm/swab.h @@ -7,7 +7,7 @@ #include <linux/types.h> #include <linux/compiler.h> -static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) +static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) { __asm__("wsbh %0, %0\n\t" /* word swap byte within halfword */ "rotri %0, %0, #16\n" @@ -16,7 +16,7 @@ static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) return x; } -static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x) +static inline __attribute_const__ __u16 ___arch__swab16(__u16 x) { __asm__("wsbh %0, %0\n" /* word swap byte within halfword */ :"=r"(x) diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h index 118953d41763..60efc1896b5e 100644 --- a/arch/parisc/include/asm/atomic.h +++ b/arch/parisc/include/asm/atomic.h @@ -56,7 +56,7 @@ extern arch_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned; * are atomic, so a reader never sees inconsistent values. */ -static __inline__ void atomic_set(atomic_t *v, int i) +static inline void atomic_set(atomic_t *v, int i) { unsigned long flags; _atomic_spin_lock_irqsave(v, flags); @@ -68,7 +68,7 @@ static __inline__ void atomic_set(atomic_t *v, int i) #define atomic_set_release(v, i) atomic_set((v), (i)) -static __inline__ int atomic_read(const atomic_t *v) +static inline int atomic_read(const atomic_t *v) { return READ_ONCE((v)->counter); } @@ -78,7 +78,7 @@ static __inline__ int atomic_read(const atomic_t *v) #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) #define ATOMIC_OP(op, c_op) \ -static __inline__ void atomic_##op(int i, atomic_t *v) \ +static inline void atomic_##op(int i, atomic_t *v) \ { \ unsigned long flags; \ \ @@ -88,7 +88,7 @@ static __inline__ void atomic_##op(int i, atomic_t *v) \ } \ #define ATOMIC_OP_RETURN(op, c_op) \ -static __inline__ int atomic_##op##_return(int i, atomic_t *v) \ +static inline int atomic_##op##_return(int i, atomic_t *v) \ { \ unsigned long flags; \ int ret; \ @@ -101,7 +101,7 @@ static __inline__ int atomic_##op##_return(int i, atomic_t *v) \ } #define ATOMIC_FETCH_OP(op, c_op) \ -static __inline__ int atomic_fetch_##op(int i, atomic_t *v) \ +static inline int atomic_fetch_##op(int i, atomic_t *v) \ { \ unsigned long flags; \ int ret; \ @@ -143,7 +143,7 @@ ATOMIC_OPS(xor, ^=) #define ATOMIC64_INIT(i) { (i) } #define ATOMIC64_OP(op, c_op) \ -static __inline__ void atomic64_##op(s64 i, atomic64_t *v) \ +static inline void atomic64_##op(s64 i, atomic64_t *v) \ { \ unsigned long flags; \ \ @@ -153,7 +153,7 @@ static __inline__ void atomic64_##op(s64 i, atomic64_t *v) \ } \ #define ATOMIC64_OP_RETURN(op, c_op) \ -static __inline__ s64 atomic64_##op##_return(s64 i, atomic64_t *v) \ +static inline s64 atomic64_##op##_return(s64 i, atomic64_t *v) \ { \ unsigned long flags; \ s64 ret; \ @@ -166,7 +166,7 @@ static __inline__ s64 atomic64_##op##_return(s64 i, atomic64_t *v) \ } #define ATOMIC64_FETCH_OP(op, c_op) \ -static __inline__ s64 atomic64_fetch_##op(s64 i, atomic64_t *v) \ +static inline s64 atomic64_fetch_##op(s64 i, atomic64_t *v) \ { \ unsigned long flags; \ s64 ret; \ @@ -201,7 +201,7 @@ ATOMIC64_OPS(xor, ^=) #undef ATOMIC64_OP_RETURN #undef ATOMIC64_OP -static __inline__ void +static inline void atomic64_set(atomic64_t *v, s64 i) { unsigned long flags; @@ -212,7 +212,7 @@ atomic64_set(atomic64_t *v, s64 i) _atomic_spin_unlock_irqrestore(v, flags); } -static __inline__ s64 +static inline s64 atomic64_read(const atomic64_t *v) { return READ_ONCE((v)->counter); diff --git a/arch/parisc/include/asm/bitops.h b/arch/parisc/include/asm/bitops.h index a09eaebfdfd0..26dccbf626e8 100644 --- a/arch/parisc/include/asm/bitops.h +++ b/arch/parisc/include/asm/bitops.h @@ -33,7 +33,7 @@ * __*_bit() are "relaxed" and don't use spinlock or volatile. */ -static __inline__ void set_bit(int nr, volatile unsigned long * addr) +static inline void set_bit(int nr, volatile unsigned long * addr) { unsigned long mask = 1UL << CHOP_SHIFTCOUNT(nr); unsigned long flags; @@ -44,7 +44,7 @@ static __inline__ void set_bit(int nr, volatile unsigned long * addr) _atomic_spin_unlock_irqrestore(addr, flags); } -static __inline__ void clear_bit(int nr, volatile unsigned long * addr) +static inline void clear_bit(int nr, volatile unsigned long * addr) { unsigned long mask = ~(1UL << CHOP_SHIFTCOUNT(nr)); unsigned long flags; @@ -55,7 +55,7 @@ static __inline__ void clear_bit(int nr, volatile unsigned long * addr) _atomic_spin_unlock_irqrestore(addr, flags); } -static __inline__ void change_bit(int nr, volatile unsigned long * addr) +static inline void change_bit(int nr, volatile unsigned long * addr) { unsigned long mask = 1UL << CHOP_SHIFTCOUNT(nr); unsigned long flags; @@ -66,7 +66,7 @@ static __inline__ void change_bit(int nr, volatile unsigned long * addr) _atomic_spin_unlock_irqrestore(addr, flags); } -static __inline__ int test_and_set_bit(int nr, volatile unsigned long * addr) +static inline int test_and_set_bit(int nr, volatile unsigned long * addr) { unsigned long mask = 1UL << CHOP_SHIFTCOUNT(nr); unsigned long old; @@ -84,7 +84,7 @@ static __inline__ int test_and_set_bit(int nr, volatile unsigned long * addr) return set; } -static __inline__ int test_and_clear_bit(int nr, volatile unsigned long * addr) +static inline int test_and_clear_bit(int nr, volatile unsigned long * addr) { unsigned long mask = 1UL << CHOP_SHIFTCOUNT(nr); unsigned long old; @@ -102,7 +102,7 @@ static __inline__ int test_and_clear_bit(int nr, volatile unsigned long * addr) return set; } -static __inline__ int test_and_change_bit(int nr, volatile unsigned long * addr) +static inline int test_and_change_bit(int nr, volatile unsigned long * addr) { unsigned long mask = 1UL << CHOP_SHIFTCOUNT(nr); unsigned long oldbit; @@ -140,7 +140,7 @@ static __inline__ int test_and_change_bit(int nr, volatile unsigned long * addr) * cycles for each mispredicted branch. */ -static __inline__ unsigned long __ffs(unsigned long x) +static inline unsigned long __ffs(unsigned long x) { unsigned long ret; @@ -178,7 +178,7 @@ static __inline__ unsigned long __ffs(unsigned long x) * This is defined the same way as the libc and compiler builtin * ffs routines, therefore differs in spirit from the above ffz (man ffs). */ -static __inline__ int ffs(int x) +static inline int ffs(int x) { return x ? (__ffs((unsigned long)x) + 1) : 0; } @@ -188,7 +188,7 @@ static __inline__ int ffs(int x) * fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. */ -static __inline__ int fls(unsigned int x) +static inline int fls(unsigned int x) { int ret; if (!x) diff --git a/arch/parisc/include/asm/checksum.h b/arch/parisc/include/asm/checksum.h index 3cbf1f1c1188..2e441a55adc9 100644 --- a/arch/parisc/include/asm/checksum.h +++ b/arch/parisc/include/asm/checksum.h @@ -121,7 +121,7 @@ static inline __sum16 ip_compute_csum(const void *buf, int len) #define _HAVE_ARCH_IPV6_CSUM -static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, +static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, __u32 len, __u8 proto, __wsum sum) @@ -189,7 +189,7 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, * Copy and checksum to user */ #define HAVE_CSUM_COPY_USER -static __inline__ __wsum csum_and_copy_to_user(const void *src, +static inline __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len, __wsum sum, int *err_ptr) diff --git a/arch/parisc/include/asm/compat.h b/arch/parisc/include/asm/compat.h index e03e3c849f40..e2269acf3d2b 100644 --- a/arch/parisc/include/asm/compat.h +++ b/arch/parisc/include/asm/compat.h @@ -190,7 +190,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr) return (u32)(unsigned long)uptr; } -static __inline__ void __user *arch_compat_alloc_user_space(long len) +static inline void __user *arch_compat_alloc_user_space(long len) { struct pt_regs *regs = ¤t->thread.regs; return (void __user *)regs->gr[30]; diff --git a/arch/parisc/include/asm/delay.h b/arch/parisc/include/asm/delay.h index 841b506b702a..e8f35d605bb2 100644 --- a/arch/parisc/include/asm/delay.h +++ b/arch/parisc/include/asm/delay.h @@ -2,7 +2,7 @@ #ifndef _ASM_PARISC_DELAY_H #define _ASM_PARISC_DELAY_H -static __inline__ void __delay(unsigned long loops) { +static inline void __delay(unsigned long loops) { asm volatile( " .balignl 64,0x34000034\n" " addib,UV -1,%0,.\n" diff --git a/arch/parisc/include/asm/dma.h b/arch/parisc/include/asm/dma.h index eea80ed34e6d..55170ca19ac9 100644 --- a/arch/parisc/include/asm/dma.h +++ b/arch/parisc/include/asm/dma.h @@ -71,12 +71,12 @@ #define DMA2_MASK_ALL_REG 0xDE /* all-channels mask (w) */ #define DMA2_EXT_MODE_REG (0x400 | DMA2_MODE_REG) -static __inline__ unsigned long claim_dma_lock(void) +static inline unsigned long claim_dma_lock(void) { return 0; } -static __inline__ void release_dma_lock(unsigned long flags) +static inline void release_dma_lock(unsigned long flags) { } @@ -89,7 +89,7 @@ static __inline__ void release_dma_lock(unsigned long flags) * * Assumes DMA flip-flop is clear. */ -static __inline__ int get_dma_residue(unsigned int dmanr) +static inline int get_dma_residue(unsigned int dmanr) { unsigned int io_port = (dmanr<=3)? ((dmanr&3)<<1) + 1 + IO_DMA1_BASE : ((dmanr&3)<<2) + 2 + IO_DMA2_BASE; @@ -104,7 +104,7 @@ static __inline__ int get_dma_residue(unsigned int dmanr) } /* enable/disable a specific DMA channel */ -static __inline__ void enable_dma(unsigned int dmanr) +static inline void enable_dma(unsigned int dmanr) { #ifdef CONFIG_SUPERIO if (dmanr<=3) @@ -114,7 +114,7 @@ static __inline__ void enable_dma(unsigned int dmanr) #endif } -static __inline__ void disable_dma(unsigned int dmanr) +static inline void disable_dma(unsigned int dmanr) { #ifdef CONFIG_SUPERIO if (dmanr<=3) @@ -134,12 +134,12 @@ static __inline__ void disable_dma(unsigned int dmanr) * --- In order to do that, the DMA routines below should --- * --- only be used while holding the DMA lock ! --- */ -static __inline__ void clear_dma_ff(unsigned int dmanr) +static inline void clear_dma_ff(unsigned int dmanr) { } /* set mode (above) for a specific DMA channel */ -static __inline__ void set_dma_mode(unsigned int dmanr, char mode) +static inline void set_dma_mode(unsigned int dmanr, char mode) { } @@ -148,7 +148,7 @@ static __inline__ void set_dma_mode(unsigned int dmanr, char mode) * the lower 16 bits of the DMA current address register, but a 64k boundary * may have been crossed. */ -static __inline__ void set_dma_page(unsigned int dmanr, char pagenr) +static inline void set_dma_page(unsigned int dmanr, char pagenr) { } @@ -156,7 +156,7 @@ static __inline__ void set_dma_page(unsigned int dmanr, char pagenr) /* Set transfer address & page bits for specific DMA channel. * Assumes dma flipflop is clear. */ -static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int a) +static inline void set_dma_addr(unsigned int dmanr, unsigned int a) { } @@ -169,7 +169,7 @@ static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int a) * Assumes dma flip-flop is clear. * NOTE 2: "count" represents _bytes_ and must be even for channels 5-7. */ -static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count) +static inline void set_dma_count(unsigned int dmanr, unsigned int count) { } diff --git a/arch/parisc/include/asm/ide.h b/arch/parisc/include/asm/ide.h index 34cdac01ed35..edd7fe03b90a 100644 --- a/arch/parisc/include/asm/ide.h +++ b/arch/parisc/include/asm/ide.h @@ -21,7 +21,7 @@ #define __ide_outsw outsw #define __ide_outsl outsl -static __inline__ void __ide_mm_insw(void __iomem *port, void *addr, u32 count) +static inline void __ide_mm_insw(void __iomem *port, void *addr, u32 count) { while (count--) { *(u16 *)addr = __raw_readw(port); @@ -29,7 +29,7 @@ static __inline__ void __ide_mm_insw(void __iomem *port, void *addr, u32 count) } } -static __inline__ void __ide_mm_insl(void __iomem *port, void *addr, u32 count) +static inline void __ide_mm_insl(void __iomem *port, void *addr, u32 count) { while (count--) { *(u32 *)addr = __raw_readl(port); @@ -37,7 +37,7 @@ static __inline__ void __ide_mm_insl(void __iomem *port, void *addr, u32 count) } } -static __inline__ void __ide_mm_outsw(void __iomem *port, void *addr, u32 count) +static inline void __ide_mm_outsw(void __iomem *port, void *addr, u32 count) { while (count--) { __raw_writew(*(u16 *)addr, port); @@ -45,7 +45,7 @@ static __inline__ void __ide_mm_outsw(void __iomem *port, void *addr, u32 count) } } -static __inline__ void __ide_mm_outsl(void __iomem *port, void *addr, u32 count) +static inline void __ide_mm_outsl(void __iomem *port, void *addr, u32 count) { while (count--) { __raw_writel(*(u32 *)addr, port); diff --git a/arch/parisc/include/asm/irq.h b/arch/parisc/include/asm/irq.h index 959e79cd2c14..b1c23a163114 100644 --- a/arch/parisc/include/asm/irq.h +++ b/arch/parisc/include/asm/irq.h @@ -27,7 +27,7 @@ #define NR_IRQS (CPU_IRQ_MAX + 1) -static __inline__ int irq_canonicalize(int irq) +static inline int irq_canonicalize(int irq) { return (irq == 2) ? 9 : irq; } diff --git a/arch/parisc/include/asm/spinlock.h b/arch/parisc/include/asm/spinlock.h index 197d2247e4db..cb5ba79d5f5a 100644 --- a/arch/parisc/include/asm/spinlock.h +++ b/arch/parisc/include/asm/spinlock.h @@ -70,7 +70,7 @@ static inline int arch_spin_trylock(arch_spinlock_t *x) /* Note that we have to ensure interrupts are disabled in case we're * interrupted by some other code that wants to grab the same read lock */ -static __inline__ void arch_read_lock(arch_rwlock_t *rw) +static inline void arch_read_lock(arch_rwlock_t *rw) { unsigned long flags; local_irq_save(flags); @@ -82,7 +82,7 @@ static __inline__ void arch_read_lock(arch_rwlock_t *rw) /* Note that we have to ensure interrupts are disabled in case we're * interrupted by some other code that wants to grab the same read lock */ -static __inline__ void arch_read_unlock(arch_rwlock_t *rw) +static inline void arch_read_unlock(arch_rwlock_t *rw) { unsigned long flags; local_irq_save(flags); @@ -94,7 +94,7 @@ static __inline__ void arch_read_unlock(arch_rwlock_t *rw) /* Note that we have to ensure interrupts are disabled in case we're * interrupted by some other code that wants to grab the same read lock */ -static __inline__ int arch_read_trylock(arch_rwlock_t *rw) +static inline int arch_read_trylock(arch_rwlock_t *rw) { unsigned long flags; retry: @@ -120,7 +120,7 @@ static __inline__ int arch_read_trylock(arch_rwlock_t *rw) /* Note that we have to ensure interrupts are disabled in case we're * interrupted by some other code that wants to read_trylock() this lock */ -static __inline__ void arch_write_lock(arch_rwlock_t *rw) +static inline void arch_write_lock(arch_rwlock_t *rw) { unsigned long flags; retry: @@ -142,7 +142,7 @@ static __inline__ void arch_write_lock(arch_rwlock_t *rw) local_irq_restore(flags); } -static __inline__ void arch_write_unlock(arch_rwlock_t *rw) +static inline void arch_write_unlock(arch_rwlock_t *rw) { rw->counter = 0; arch_spin_unlock(&rw->lock); @@ -150,7 +150,7 @@ static __inline__ void arch_write_unlock(arch_rwlock_t *rw) /* Note that we have to ensure interrupts are disabled in case we're * interrupted by some other code that wants to read_trylock() this lock */ -static __inline__ int arch_write_trylock(arch_rwlock_t *rw) +static inline int arch_write_trylock(arch_rwlock_t *rw) { unsigned long flags; int result = 0; diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h index 31c231ea56b7..52105b52b4c2 100644 --- a/arch/powerpc/include/asm/atomic.h +++ b/arch/powerpc/include/asm/atomic.h @@ -25,7 +25,7 @@ #define __atomic_release_fence() \ __asm__ __volatile__(PPC_RELEASE_BARRIER "" : : : "memory") -static __inline__ int atomic_read(const atomic_t *v) +static inline int atomic_read(const atomic_t *v) { int t; @@ -34,13 +34,13 @@ static __inline__ int atomic_read(const atomic_t *v) return t; } -static __inline__ void atomic_set(atomic_t *v, int i) +static inline void atomic_set(atomic_t *v, int i) { __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i)); } #define ATOMIC_OP(op, asm_op) \ -static __inline__ void atomic_##op(int a, atomic_t *v) \ +static inline void atomic_##op(int a, atomic_t *v) \ { \ int t; \ \ @@ -123,7 +123,7 @@ ATOMIC_OPS(xor, xor) #undef ATOMIC_OP_RETURN_RELAXED #undef ATOMIC_OP -static __inline__ void atomic_inc(atomic_t *v) +static inline void atomic_inc(atomic_t *v) { int t; @@ -139,7 +139,7 @@ static __inline__ void atomic_inc(atomic_t *v) } #define atomic_inc atomic_inc -static __inline__ int atomic_inc_return_relaxed(atomic_t *v) +static inline int atomic_inc_return_relaxed(atomic_t *v) { int t; @@ -156,7 +156,7 @@ static __inline__ int atomic_inc_return_relaxed(atomic_t *v) return t; } -static __inline__ void atomic_dec(atomic_t *v) +static inline void atomic_dec(atomic_t *v) { int t; @@ -172,7 +172,7 @@ static __inline__ void atomic_dec(atomic_t *v) } #define atomic_dec atomic_dec -static __inline__ int atomic_dec_return_relaxed(atomic_t *v) +static inline int atomic_dec_return_relaxed(atomic_t *v) { int t; @@ -210,7 +210,7 @@ static __inline__ int atomic_dec_return_relaxed(atomic_t *v) * Atomically adds @a to @v, so long as it was not @u. * Returns the old value of @v. */ -static __inline__ int atomic_fetch_add_unless(atomic_t *v, int a, int u) +static inline int atomic_fetch_add_unless(atomic_t *v, int a, int u) { int t; @@ -241,7 +241,7 @@ static __inline__ int atomic_fetch_add_unless(atomic_t *v, int a, int u) * Atomically increments @v by 1, so long as @v is non-zero. * Returns non-zero if @v was non-zero, and zero otherwise. */ -static __inline__ int atomic_inc_not_zero(atomic_t *v) +static inline int atomic_inc_not_zero(atomic_t *v) { int t1, t2; @@ -270,7 +270,7 @@ static __inline__ int atomic_inc_not_zero(atomic_t *v) * The function returns the old value of *v minus 1, even if * the atomic variable, v, was not decremented. */ -static __inline__ int atomic_dec_if_positive(atomic_t *v) +static inline int atomic_dec_if_positive(atomic_t *v) { int t; @@ -297,7 +297,7 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v) #define ATOMIC64_INIT(i) { (i) } -static __inline__ s64 atomic64_read(const atomic64_t *v) +static inline s64 atomic64_read(const atomic64_t *v) { s64 t; @@ -306,13 +306,13 @@ static __inline__ s64 atomic64_read(const atomic64_t *v) return t; } -static __inline__ void atomic64_set(atomic64_t *v, s64 i) +static inline void atomic64_set(atomic64_t *v, s64 i) { __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i)); } #define ATOMIC64_OP(op, asm_op) \ -static __inline__ void atomic64_##op(s64 a, atomic64_t *v) \ +static inline void atomic64_##op(s64 a, atomic64_t *v) \ { \ s64 t; \ \ @@ -394,7 +394,7 @@ ATOMIC64_OPS(xor, xor) #undef ATOMIC64_OP_RETURN_RELAXED #undef ATOMIC64_OP -static __inline__ void atomic64_inc(atomic64_t *v) +static inline void atomic64_inc(atomic64_t *v) { s64 t; @@ -409,7 +409,7 @@ static __inline__ void atomic64_inc(atomic64_t *v) } #define atomic64_inc atomic64_inc -static __inline__ s64 atomic64_inc_return_relaxed(atomic64_t *v) +static inline s64 atomic64_inc_return_relaxed(atomic64_t *v) { s64 t; @@ -425,7 +425,7 @@ static __inline__ s64 atomic64_inc_return_relaxed(atomic64_t *v) return t; } -static __inline__ void atomic64_dec(atomic64_t *v) +static inline void atomic64_dec(atomic64_t *v) { s64 t; @@ -440,7 +440,7 @@ static __inline__ void atomic64_dec(atomic64_t *v) } #define atomic64_dec atomic64_dec -static __inline__ s64 atomic64_dec_return_relaxed(atomic64_t *v) +static inline s64 atomic64_dec_return_relaxed(atomic64_t *v) { s64 t; @@ -463,7 +463,7 @@ static __inline__ s64 atomic64_dec_return_relaxed(atomic64_t *v) * Atomically test *v and decrement if it is greater than 0. * The function returns the old value of *v minus 1. */ -static __inline__ s64 atomic64_dec_if_positive(atomic64_t *v) +static inline s64 atomic64_dec_if_positive(atomic64_t *v) { s64 t; @@ -502,7 +502,7 @@ static __inline__ s64 atomic64_dec_if_positive(atomic64_t *v) * Atomically adds @a to @v, so long as it was not @u. * Returns the old value of @v. */ -static __inline__ s64 atomic64_fetch_add_unless(atomic64_t *v, s64 a, s64 u) +static inline s64 atomic64_fetch_add_unless(atomic64_t *v, s64 a, s64 u) { s64 t; @@ -532,7 +532,7 @@ static __inline__ s64 atomic64_fetch_add_unless(atomic64_t *v, s64 a, s64 u) * Atomically increments @v by 1, so long as @v is non-zero. * Returns non-zero if @v was non-zero, and zero otherwise. */ -static __inline__ int atomic64_inc_not_zero(atomic64_t *v) +static inline int atomic64_inc_not_zero(atomic64_t *v) { s64 t1, t2; diff --git a/arch/powerpc/include/asm/bitops.h b/arch/powerpc/include/asm/bitops.h index 603aed229af7..bd0dfd1ecf32 100644 --- a/arch/powerpc/include/asm/bitops.h +++ b/arch/powerpc/include/asm/bitops.h @@ -64,7 +64,7 @@ /* Macro for generating the ***_bits() functions */ #define DEFINE_BITOP(fn, op, prefix) \ -static __inline__ void fn(unsigned long mask, \ +static inline void fn(unsigned long mask, \ volatile unsigned long *_p) \ { \ unsigned long old; \ @@ -86,22 +86,22 @@ DEFINE_BITOP(clear_bits, andc, "") DEFINE_BITOP(clear_bits_unlock, andc, PPC_RELEASE_BARRIER) DEFINE_BITOP(change_bits, xor, "") -static __inline__ void set_bit(int nr, volatile unsigned long *addr) +static inline void set_bit(int nr, volatile unsigned long *addr) { set_bits(BIT_MASK(nr), addr + BIT_WORD(nr)); } -static __inline__ void clear_bit(int nr, volatile unsigned long *addr) +static inline void clear_bit(int nr, volatile unsigned long *addr) { clear_bits(BIT_MASK(nr), addr + BIT_WORD(nr)); } -static __inline__ void clear_bit_unlock(int nr, volatile unsigned long *addr) +static inline void clear_bit_unlock(int nr, volatile unsigned long *addr) { clear_bits_unlock(BIT_MASK(nr), addr + BIT_WORD(nr)); } -static __inline__ void change_bit(int nr, volatile unsigned long *addr) +static inline void change_bit(int nr, volatile unsigned long *addr) { change_bits(BIT_MASK(nr), addr + BIT_WORD(nr)); } @@ -109,7 +109,7 @@ static __inline__ void change_bit(int nr, volatile unsigned long *addr) /* Like DEFINE_BITOP(), with changes to the arguments to 'op' and the output * operands. */ #define DEFINE_TESTOP(fn, op, prefix, postfix, eh) \ -static __inline__ unsigned long fn( \ +static inline unsigned long fn( \ unsigned long mask, \ volatile unsigned long *_p) \ { \ @@ -138,33 +138,33 @@ DEFINE_TESTOP(test_and_clear_bits, andc, PPC_ATOMIC_ENTRY_BARRIER, DEFINE_TESTOP(test_and_change_bits, xor, PPC_ATOMIC_ENTRY_BARRIER, PPC_ATOMIC_EXIT_BARRIER, 0) -static __inline__ int test_and_set_bit(unsigned long nr, +static inline int test_and_set_bit(unsigned long nr, volatile unsigned long *addr) { return test_and_set_bits(BIT_MASK(nr), addr + BIT_WORD(nr)) != 0; } -static __inline__ int test_and_set_bit_lock(unsigned long nr, +static inline int test_and_set_bit_lock(unsigned long nr, volatile unsigned long *addr) { return test_and_set_bits_lock(BIT_MASK(nr), addr + BIT_WORD(nr)) != 0; } -static __inline__ int test_and_clear_bit(unsigned long nr, +static inline int test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) { return test_and_clear_bits(BIT_MASK(nr), addr + BIT_WORD(nr)) != 0; } -static __inline__ int test_and_change_bit(unsigned long nr, +static inline int test_and_change_bit(unsigned long nr, volatile unsigned long *addr) { return test_and_change_bits(BIT_MASK(nr), addr + BIT_WORD(nr)) != 0; } #ifdef CONFIG_PPC64 -static __inline__ unsigned long clear_bit_unlock_return_word(int nr, +static inline unsigned long clear_bit_unlock_return_word(int nr, volatile unsigned long *addr) { unsigned long old, t; @@ -193,7 +193,7 @@ static __inline__ unsigned long clear_bit_unlock_return_word(int nr, #include <asm-generic/bitops/non-atomic.h> -static __inline__ void __clear_bit_unlock(int nr, volatile unsigned long *addr) +static inline void __clear_bit_unlock(int nr, volatile unsigned long *addr) { __asm__ __volatile__(PPC_RELEASE_BARRIER "" ::: "memory"); __clear_bit(nr, addr); @@ -215,14 +215,14 @@ static __inline__ void __clear_bit_unlock(int nr, volatile unsigned long *addr) * fls: find last (most-significant) bit set. * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. */ -static __inline__ int fls(unsigned int x) +static inline int fls(unsigned int x) { return 32 - __builtin_clz(x); } #include <asm-generic/bitops/builtin-__fls.h> -static __inline__ int fls64(__u64 x) +static inline int fls64(__u64 x) { return 64 - __builtin_clzll(x); } diff --git a/arch/powerpc/include/asm/dma.h b/arch/powerpc/include/asm/dma.h index 1b4f0254868f..d5be698b831a 100644 --- a/arch/powerpc/include/asm/dma.h +++ b/arch/powerpc/include/asm/dma.h @@ -166,20 +166,20 @@ extern spinlock_t dma_spin_lock; -static __inline__ unsigned long claim_dma_lock(void) +static inline unsigned long claim_dma_lock(void) { unsigned long flags; spin_lock_irqsave(&dma_spin_lock, flags); return flags; } -static __inline__ void release_dma_lock(unsigned long flags) +static inline void release_dma_lock(unsigned long flags) { spin_unlock_irqrestore(&dma_spin_lock, flags); } /* enable/disable a specific DMA channel */ -static __inline__ void enable_dma(unsigned int dmanr) +static inline void enable_dma(unsigned int dmanr) { unsigned char ucDmaCmd = 0x00; @@ -195,7 +195,7 @@ static __inline__ void enable_dma(unsigned int dmanr) } } -static __inline__ void disable_dma(unsigned int dmanr) +static inline void disable_dma(unsigned int dmanr) { if (dmanr <= 3) dma_outb(dmanr | 4, DMA1_MASK_REG); @@ -210,7 +210,7 @@ static __inline__ void disable_dma(unsigned int dmanr) * --- In order to do that, the DMA routines below should --- * --- only be used while interrupts are disabled! --- */ -static __inline__ void clear_dma_ff(unsigned int dmanr) +static inline void clear_dma_ff(unsigned int dmanr) { if (dmanr <= 3) dma_outb(0, DMA1_CLEAR_FF_REG); @@ -219,7 +219,7 @@ static __inline__ void clear_dma_ff(unsigned int dmanr) } /* set mode (above) for a specific DMA channel */ -static __inline__ void set_dma_mode(unsigned int dmanr, char mode) +static inline void set_dma_mode(unsigned int dmanr, char mode) { if (dmanr <= 3) dma_outb(mode | dmanr, DMA1_MODE_REG); @@ -232,7 +232,7 @@ static __inline__ void set_dma_mode(unsigned int dmanr, char mode) * the lower 16 bits of the DMA current address register, but a 64k boundary * may have been crossed. */ -static __inline__ void set_dma_page(unsigned int dmanr, int pagenr) +static inline void set_dma_page(unsigned int dmanr, int pagenr) { switch (dmanr) { case 0: @@ -269,7 +269,7 @@ static __inline__ void set_dma_page(unsigned int dmanr, int pagenr) /* Set transfer address & page bits for specific DMA channel. * Assumes dma flipflop is clear. */ -static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int phys) +static inline void set_dma_addr(unsigned int dmanr, unsigned int phys) { if (dmanr <= 3) { dma_outb(phys & 0xff, @@ -294,7 +294,7 @@ static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int phys) * Assumes dma flip-flop is clear. * NOTE 2: "count" represents _bytes_ and must be even for channels 5-7. */ -static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count) +static inline void set_dma_count(unsigned int dmanr, unsigned int count) { count--; if (dmanr <= 3) { @@ -319,7 +319,7 @@ static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count) * * Assumes DMA flip-flop is clear. */ -static __inline__ int get_dma_residue(unsigned int dmanr) +static inline int get_dma_residue(unsigned int dmanr) { unsigned int io_port = (dmanr <= 3) ? ((dmanr & 3) << 1) + 1 + IO_DMA1_BASE diff --git a/arch/powerpc/include/asm/edac.h b/arch/powerpc/include/asm/edac.h index 5571e23d253e..f331c7f8525f 100644 --- a/arch/powerpc/include/asm/edac.h +++ b/arch/powerpc/include/asm/edac.h @@ -16,7 +16,7 @@ * ECC scrubbing. It reads memory and then writes back the original * value, allowing the hardware to detect and correct memory errors. */ -static __inline__ void edac_atomic_scrub(void *va, u32 size) +static inline void edac_atomic_scrub(void *va, u32 size) { unsigned int *virt_addr = va; unsigned int temp; diff --git a/arch/powerpc/include/asm/irq.h b/arch/powerpc/include/asm/irq.h index 814dfab7e392..fc7be7ab4f9e 100644 --- a/arch/powerpc/include/asm/irq.h +++ b/arch/powerpc/include/asm/irq.h @@ -28,7 +28,7 @@ extern atomic_t ppc_n_lost_interrupts; extern irq_hw_number_t virq_to_hw(unsigned int virq); -static __inline__ int irq_canonicalize(int irq) +static inline int irq_canonicalize(int irq) { return irq; } diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h index fdd00939270b..95702e9dc1d0 100644 --- a/arch/powerpc/include/asm/local.h +++ b/arch/powerpc/include/asm/local.h @@ -17,18 +17,18 @@ typedef struct #define LOCAL_INIT(i) { (i) } -static __inline__ long local_read(local_t *l) +static inline long local_read(local_t *l) { return READ_ONCE(l->v); } -static __inline__ void local_set(local_t *l, long i) +static inline void local_set(local_t *l, long i) { WRITE_ONCE(l->v, i); } #define LOCAL_OP(op, c_op) \ -static __inline__ void local_##op(long i, local_t *l) \ +static inline void local_##op(long i, local_t *l) \ { \ unsigned long flags; \ \ @@ -38,7 +38,7 @@ static __inline__ void local_##op(long i, local_t *l) \ } #define LOCAL_OP_RETURN(op, c_op) \ -static __inline__ long local_##op##_return(long a, local_t *l) \ +static inline long local_##op##_return(long a, local_t *l) \ { \ long t; \ unsigned long flags; \ @@ -76,7 +76,7 @@ LOCAL_OPS(sub, -=) #define local_sub_and_test(a, l) (local_sub_return((a), (l)) == 0) #define local_dec_and_test(l) (local_dec_return((l)) == 0) -static __inline__ long local_cmpxchg(local_t *l, long o, long n) +static inline long local_cmpxchg(local_t *l, long o, long n) { long t; unsigned long flags; @@ -90,7 +90,7 @@ static __inline__ long local_cmpxchg(local_t *l, long o, long n) return t; } -static __inline__ long local_xchg(local_t *l, long n) +static inline long local_xchg(local_t *l, long n) { long t; unsigned long flags; @@ -112,7 +112,7 @@ static __inline__ long local_xchg(local_t *l, long n) * Atomically adds @a to @l, so long as it was not @u. * Returns non-zero if @l was not @u, and zero otherwise. */ -static __inline__ int local_add_unless(local_t *l, long a, long u) +static inline int local_add_unless(local_t *l, long a, long u) { unsigned long flags; int ret = 0; diff --git a/arch/sh/include/asm/pgtable_64.h b/arch/sh/include/asm/pgtable_64.h index 1778bc5971e7..e629deadc580 100644 --- a/arch/sh/include/asm/pgtable_64.h +++ b/arch/sh/include/asm/pgtable_64.h @@ -29,7 +29,7 @@ */ #define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval) -static __inline__ void set_pte(pte_t *pteptr, pte_t pteval) +static inline void set_pte(pte_t *pteptr, pte_t pteval) { unsigned long long x = ((unsigned long long) pteval.pte_low); unsigned long long *xp = (unsigned long long *) pteptr; diff --git a/arch/sh/include/asm/processor_32.h b/arch/sh/include/asm/processor_32.h index 0e0ecc0132e3..7cee0b150911 100644 --- a/arch/sh/include/asm/processor_32.h +++ b/arch/sh/include/asm/processor_32.h @@ -135,7 +135,7 @@ extern void release_thread(struct task_struct *); * FPU lazy state save handling. */ -static __inline__ void disable_fpu(void) +static inline void disable_fpu(void) { unsigned long __dummy; @@ -147,7 +147,7 @@ static __inline__ void disable_fpu(void) : "r" (SR_FD)); } -static __inline__ void enable_fpu(void) +static inline void enable_fpu(void) { unsigned long __dummy; diff --git a/arch/sh/include/cpu-sh3/cpu/dac.h b/arch/sh/include/cpu-sh3/cpu/dac.h index fd02331608a8..67ae1ae03c47 100644 --- a/arch/sh/include/cpu-sh3/cpu/dac.h +++ b/arch/sh/include/cpu-sh3/cpu/dac.h @@ -15,7 +15,7 @@ #define DACR_DAE 0x20 -static __inline__ void sh_dac_enable(int channel) +static inline void sh_dac_enable(int channel) { unsigned char v; v = __raw_readb(DACR); @@ -24,7 +24,7 @@ static __inline__ void sh_dac_enable(int channel) __raw_writeb(v,DACR); } -static __inline__ void sh_dac_disable(int channel) +static inline void sh_dac_disable(int channel) { unsigned char v; v = __raw_readb(DACR); @@ -33,7 +33,7 @@ static __inline__ void sh_dac_disable(int channel) __raw_writeb(v,DACR); } -static __inline__ void sh_dac_output(u8 value, int channel) +static inline void sh_dac_output(u8 value, int channel) { if(channel) __raw_writeb(value,DADR1); else __raw_writeb(value,DADR0); diff --git a/arch/x86/um/asm/checksum.h b/arch/x86/um/asm/checksum.h index 2a56cac64687..8f1c7f32d420 100644 --- a/arch/x86/um/asm/checksum.h +++ b/arch/x86/um/asm/checksum.h @@ -28,7 +28,7 @@ extern __wsum csum_partial(const void *buff, int len, __wsum sum); * access_ok(). */ -static __inline__ +static inline __wsum csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum) { @@ -44,7 +44,7 @@ __wsum csum_partial_copy_nocheck(const void *src, void *dst, * better 64-bit) boundary */ -static __inline__ +static inline __wsum csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr) { diff --git a/arch/x86/um/asm/checksum_32.h b/arch/x86/um/asm/checksum_32.h index b9ac7c9eb72c..a2ac4682b43d 100644 --- a/arch/x86/um/asm/checksum_32.h +++ b/arch/x86/um/asm/checksum_32.h @@ -11,7 +11,7 @@ static inline __sum16 ip_compute_csum(const void *buff, int len) } #define _HAVE_ARCH_IPV6_CSUM -static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, +static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, __u32 len, __u8 proto, __wsum sum) @@ -39,7 +39,7 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, * Copy and checksum to user */ #define HAVE_CSUM_COPY_USER -static __inline__ __wsum csum_and_copy_to_user(const void *src, +static inline __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len, __wsum sum, int *err_ptr) { diff --git a/arch/xtensa/include/asm/checksum.h b/arch/xtensa/include/asm/checksum.h index 8b687176ad72..af273c6ca619 100644 --- a/arch/xtensa/include/asm/checksum.h +++ b/arch/xtensa/include/asm/checksum.h @@ -66,7 +66,7 @@ __wsum csum_partial_copy_from_user(const void __user *src, void *dst, * Fold a partial checksum */ -static __inline__ __sum16 csum_fold(__wsum sum) +static inline __sum16 csum_fold(__wsum sum) { unsigned int __dummy; __asm__("extui %1, %0, 16, 16\n\t" @@ -87,7 +87,7 @@ static __inline__ __sum16 csum_fold(__wsum sum) * This is a version of ip_compute_csum() optimized for IP headers, * which always checksum on 4 octet boundaries. */ -static __inline__ __sum16 ip_fast_csum(const void *iph, unsigned int ihl) +static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) { unsigned int sum, tmp, endaddr; @@ -122,7 +122,7 @@ static __inline__ __sum16 ip_fast_csum(const void *iph, unsigned int ihl) return csum_fold(sum); } -static __inline__ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, +static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len, __u8 proto, __wsum sum) { @@ -155,7 +155,7 @@ static __inline__ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, * computes the checksum of the TCP/UDP pseudo-header * returns a 16-bit checksum, already complemented */ -static __inline__ __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, +static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, __u32 len, __u8 proto, __wsum sum) { @@ -167,13 +167,13 @@ static __inline__ __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, * in icmp.c */ -static __inline__ __sum16 ip_compute_csum(const void *buff, int len) +static inline __sum16 ip_compute_csum(const void *buff, int len) { return csum_fold (csum_partial(buff, len, 0)); } #define _HAVE_ARCH_IPV6_CSUM -static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, +static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, __u32 len, __u8 proto, __wsum sum) @@ -239,7 +239,7 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, * Copy and checksum to user */ #define HAVE_CSUM_COPY_USER -static __inline__ __wsum csum_and_copy_to_user(const void *src, +static inline __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len, __wsum sum, int *err_ptr) { diff --git a/arch/xtensa/include/asm/cmpxchg.h b/arch/xtensa/include/asm/cmpxchg.h index 7ccc5cbf441b..fc735a66fe01 100644 --- a/arch/xtensa/include/asm/cmpxchg.h +++ b/arch/xtensa/include/asm/cmpxchg.h @@ -70,7 +70,7 @@ __cmpxchg_u32(volatile int *p, int old, int new) extern void __cmpxchg_called_with_bad_pointer(void); -static __inline__ unsigned long +static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size) { switch (size) { @@ -201,7 +201,7 @@ static inline u32 xchg_small(volatile void *ptr, u32 x, int size) extern void __xchg_called_with_bad_pointer(void); -static __inline__ unsigned long +static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size) { switch (size) { diff --git a/arch/xtensa/include/asm/irq.h b/arch/xtensa/include/asm/irq.h index 0f71a51dab25..161a323865b0 100644 --- a/arch/xtensa/include/asm/irq.h +++ b/arch/xtensa/include/asm/irq.h @@ -23,7 +23,7 @@ #define NR_IRQS (XTENSA_NR_IRQS + PLATFORM_NR_IRQS + 1) #define XTENSA_PIC_LINUX_IRQ(hwirq) ((hwirq) + 1) -static __inline__ int irq_canonicalize(int irq) +static inline int irq_canonicalize(int irq) { return (irq); } diff --git a/block/partitions/amiga.c b/block/partitions/amiga.c index 560936617d9c..7434b0a0f86c 100644 --- a/block/partitions/amiga.c +++ b/block/partitions/amiga.c @@ -16,7 +16,7 @@ #include "check.h" #include "amiga.h" -static __inline__ u32 +static inline u32 checksum_block(__be32 *m, int size) { u32 sum = 0; diff --git a/drivers/atm/he.c b/drivers/atm/he.c index 211607986134..bff867332728 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c @@ -178,7 +178,7 @@ static const struct atmdev_ops he_ops = /* section 2.12 connection memory access */ -static __inline__ void +static inline void he_writel_internal(struct he_dev *he_dev, unsigned val, unsigned addr, unsigned flags) { @@ -324,7 +324,7 @@ he_readl_internal(struct he_dev *he_dev, unsigned addr, unsigned flags) #define he_writel_rsr7(dev, val, cid) \ he_writel_rcm(dev, val, 0x00000 | (cid << 3) | 7) -static __inline__ struct atm_vcc* +static inline struct atm_vcc* __find_vcc(struct he_dev *he_dev, unsigned cid) { struct hlist_head *head; @@ -2049,7 +2049,7 @@ he_irq_handler(int irq, void *dev_id) } -static __inline__ void +static inline void __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid) { struct he_tpdrq *new_tail; diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index df51680e8931..2581fa4a2d58 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c @@ -1782,13 +1782,13 @@ set_tct(struct idt77252_dev *card, struct vc_map *vc) /* */ /*****************************************************************************/ -static __inline__ int +static inline int idt77252_fbq_level(struct idt77252_dev *card, int queue) { return (readl(SAR_REG_STAT) >> (16 + (queue << 2))) & 0x0f; } -static __inline__ int +static inline int idt77252_fbq_full(struct idt77252_dev *card, int queue) { return (readl(SAR_REG_STAT) >> (16 + (queue << 2))) == 0x0f; @@ -2015,7 +2015,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags) return idt77252_send_skb(vcc, skb, 1); } -static __inline__ unsigned int +static inline unsigned int idt77252_fls(unsigned int x) { int r = 1; diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h index a45bb22275a7..a4bb4ead677f 100644 --- a/drivers/gpu/drm/mga/mga_drv.h +++ b/drivers/gpu/drm/mga/mga_drv.h @@ -661,7 +661,7 @@ do { \ /* Simple idle test. */ -static __inline__ int mga_is_idle(drm_mga_private_t *dev_priv) +static inline int mga_is_idle(drm_mga_private_t *dev_priv) { u32 status = MGA_READ(MGA_STATUS) & MGA_ENGINE_IDLE_MASK; return (status == MGA_ENDPRDMASTS); diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c index e5f6b735f575..67f261c59111 100644 --- a/drivers/gpu/drm/mga/mga_state.c +++ b/drivers/gpu/drm/mga/mga_state.c @@ -65,7 +65,7 @@ static void mga_emit_clip_rect(drm_mga_private_t *dev_priv, ADVANCE_DMA(); } -static __inline__ void mga_g200_emit_context(drm_mga_private_t *dev_priv) +static inline void mga_g200_emit_context(drm_mga_private_t *dev_priv) { drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_mga_context_regs_t *ctx = &sarea_priv->context_state; @@ -88,7 +88,7 @@ static __inline__ void mga_g200_emit_context(drm_mga_private_t *dev_priv) ADVANCE_DMA(); } -static __inline__ void mga_g400_emit_context(drm_mga_private_t *dev_priv) +static inline void mga_g400_emit_context(drm_mga_private_t *dev_priv) { drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_mga_context_regs_t *ctx = &sarea_priv->context_state; @@ -115,7 +115,7 @@ static __inline__ void mga_g400_emit_context(drm_mga_private_t *dev_priv) ADVANCE_DMA(); } -static __inline__ void mga_g200_emit_tex0(drm_mga_private_t *dev_priv) +static inline void mga_g200_emit_tex0(drm_mga_private_t *dev_priv) { drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[0]; @@ -143,7 +143,7 @@ static __inline__ void mga_g200_emit_tex0(drm_mga_private_t *dev_priv) ADVANCE_DMA(); } -static __inline__ void mga_g400_emit_tex0(drm_mga_private_t *dev_priv) +static inline void mga_g400_emit_tex0(drm_mga_private_t *dev_priv) { drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[0]; @@ -183,7 +183,7 @@ static __inline__ void mga_g400_emit_tex0(drm_mga_private_t *dev_priv) ADVANCE_DMA(); } -static __inline__ void mga_g400_emit_tex1(drm_mga_private_t *dev_priv) +static inline void mga_g400_emit_tex1(drm_mga_private_t *dev_priv) { drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[1]; @@ -222,7 +222,7 @@ static __inline__ void mga_g400_emit_tex1(drm_mga_private_t *dev_priv) ADVANCE_DMA(); } -static __inline__ void mga_g200_emit_pipe(drm_mga_private_t *dev_priv) +static inline void mga_g200_emit_pipe(drm_mga_private_t *dev_priv) { drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; unsigned int pipe = sarea_priv->warp_pipe; @@ -249,7 +249,7 @@ static __inline__ void mga_g200_emit_pipe(drm_mga_private_t *dev_priv) ADVANCE_DMA(); } -static __inline__ void mga_g400_emit_pipe(drm_mga_private_t *dev_priv) +static inline void mga_g400_emit_pipe(drm_mga_private_t *dev_priv) { drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; unsigned int pipe = sarea_priv->warp_pipe; diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h index ba8c30ed91d1..8482ebd484b9 100644 --- a/drivers/gpu/drm/r128/r128_drv.h +++ b/drivers/gpu/drm/r128/r128_drv.h @@ -423,7 +423,7 @@ do { \ #define CCE_PACKET3(pkt, n) (R128_CCE_PACKET3 | \ (pkt) | ((n) << 16)) -static __inline__ void r128_update_ring_snapshot(drm_r128_private_t *dev_priv) +static inline void r128_update_ring_snapshot(drm_r128_private_t *dev_priv) { drm_r128_ring_buffer_t *ring = &dev_priv->ring; ring->space = (GET_RING_HEAD(dev_priv) - ring->tail) * sizeof(u32); diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c index 9d74c9d914cb..3a3e42405ffa 100644 --- a/drivers/gpu/drm/r128/r128_state.c +++ b/drivers/gpu/drm/r128/r128_state.c @@ -86,7 +86,7 @@ static void r128_emit_clip_rects(drm_r128_private_t *dev_priv, ADVANCE_RING(); } -static __inline__ void r128_emit_core(drm_r128_private_t *dev_priv) +static inline void r128_emit_core(drm_r128_private_t *dev_priv) { drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_context_regs_t *ctx = &sarea_priv->context_state; @@ -101,7 +101,7 @@ static __inline__ void r128_emit_core(drm_r128_private_t *dev_priv) ADVANCE_RING(); } -static __inline__ void r128_emit_context(drm_r128_private_t *dev_priv) +static inline void r128_emit_context(drm_r128_private_t *dev_priv) { drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_context_regs_t *ctx = &sarea_priv->context_state; @@ -127,7 +127,7 @@ static __inline__ void r128_emit_context(drm_r128_private_t *dev_priv) ADVANCE_RING(); } -static __inline__ void r128_emit_setup(drm_r128_private_t *dev_priv) +static inline void r128_emit_setup(drm_r128_private_t *dev_priv) { drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_context_regs_t *ctx = &sarea_priv->context_state; @@ -143,7 +143,7 @@ static __inline__ void r128_emit_setup(drm_r128_private_t *dev_priv) ADVANCE_RING(); } -static __inline__ void r128_emit_masks(drm_r128_private_t *dev_priv) +static inline void r128_emit_masks(drm_r128_private_t *dev_priv) { drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_context_regs_t *ctx = &sarea_priv->context_state; @@ -162,7 +162,7 @@ static __inline__ void r128_emit_masks(drm_r128_private_t *dev_priv) ADVANCE_RING(); } -static __inline__ void r128_emit_window(drm_r128_private_t *dev_priv) +static inline void r128_emit_window(drm_r128_private_t *dev_priv) { drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_context_regs_t *ctx = &sarea_priv->context_state; @@ -177,7 +177,7 @@ static __inline__ void r128_emit_window(drm_r128_private_t *dev_priv) ADVANCE_RING(); } -static __inline__ void r128_emit_tex0(drm_r128_private_t *dev_priv) +static inline void r128_emit_tex0(drm_r128_private_t *dev_priv) { drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_context_regs_t *ctx = &sarea_priv->context_state; @@ -203,7 +203,7 @@ static __inline__ void r128_emit_tex0(drm_r128_private_t *dev_priv) ADVANCE_RING(); } -static __inline__ void r128_emit_tex1(drm_r128_private_t *dev_priv) +static inline void r128_emit_tex1(drm_r128_private_t *dev_priv) { drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[1]; diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c index c96830ccc0ec..02f2a309ea8d 100644 --- a/drivers/gpu/drm/via/via_irq.c +++ b/drivers/gpu/drm/via/via_irq.c @@ -152,7 +152,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg) return IRQ_NONE; } -static __inline__ void viadrv_acknowledge_irqs(drm_via_private_t *dev_priv) +static inline void viadrv_acknowledge_irqs(drm_via_private_t *dev_priv) { u32 status; diff --git a/drivers/gpu/drm/via/via_verifier.c b/drivers/gpu/drm/via/via_verifier.c index fb2609434df7..400fe11b128d 100644 --- a/drivers/gpu/drm/via/via_verifier.c +++ b/drivers/gpu/drm/via/via_verifier.c @@ -235,7 +235,7 @@ static hazard_t table1[256]; static hazard_t table2[256]; static hazard_t table3[256]; -static __inline__ int +static inline int eat_words(const uint32_t **buf, const uint32_t *buf_end, unsigned num_words) { if ((buf_end - *buf) >= num_words) { @@ -250,7 +250,7 @@ eat_words(const uint32_t **buf, const uint32_t *buf_end, unsigned num_words) * Partially stolen from drm_memory.h */ -static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq, +static inline drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq, unsigned long offset, unsigned long size, struct drm_device *dev) @@ -287,7 +287,7 @@ static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq, * very little CPU time. */ -static __inline__ int finish_current_sequence(drm_via_state_t * cur_seq) +static inline int finish_current_sequence(drm_via_state_t * cur_seq) { switch (cur_seq->unfinished) { case z_address: @@ -344,7 +344,7 @@ static __inline__ int finish_current_sequence(drm_via_state_t * cur_seq) return 0; } -static __inline__ int +static inline int investigate_hazard(uint32_t cmd, hazard_t hz, drm_via_state_t *cur_seq) { register uint32_t tmp, *tmp_addr; @@ -517,7 +517,7 @@ investigate_hazard(uint32_t cmd, hazard_t hz, drm_via_state_t *cur_seq) return 2; } -static __inline__ int +static inline int via_check_prim_list(uint32_t const **buffer, const uint32_t * buf_end, drm_via_state_t *cur_seq) { @@ -621,7 +621,7 @@ via_check_prim_list(uint32_t const **buffer, const uint32_t * buf_end, return ret; } -static __inline__ verifier_state_t +static inline verifier_state_t via_check_header2(uint32_t const **buffer, const uint32_t *buf_end, drm_via_state_t *hc_state) { @@ -713,7 +713,7 @@ via_check_header2(uint32_t const **buffer, const uint32_t *buf_end, return state_command; } -static __inline__ verifier_state_t +static inline verifier_state_t via_parse_header2(drm_via_private_t *dev_priv, uint32_t const **buffer, const uint32_t *buf_end, int *fire_count) { @@ -762,7 +762,7 @@ via_parse_header2(drm_via_private_t *dev_priv, uint32_t const **buffer, return state_command; } -static __inline__ int verify_mmio_address(uint32_t address) +static inline int verify_mmio_address(uint32_t address) { if ((address > 0x3FF) && (address < 0xC00)) { DRM_ERROR("Invalid VIDEO DMA command. " @@ -780,7 +780,7 @@ static __inline__ int verify_mmio_address(uint32_t address) return 0; } -static __inline__ int +static inline int verify_video_tail(uint32_t const **buffer, const uint32_t * buf_end, uint32_t dwords) { @@ -800,7 +800,7 @@ verify_video_tail(uint32_t const **buffer, const uint32_t * buf_end, return 0; } -static __inline__ verifier_state_t +static inline verifier_state_t via_check_header1(uint32_t const **buffer, const uint32_t * buf_end) { uint32_t cmd; @@ -832,7 +832,7 @@ via_check_header1(uint32_t const **buffer, const uint32_t * buf_end) return ret; } -static __inline__ verifier_state_t +static inline verifier_state_t via_parse_header1(drm_via_private_t *dev_priv, uint32_t const **buffer, const uint32_t *buf_end) { @@ -850,7 +850,7 @@ via_parse_header1(drm_via_private_t *dev_priv, uint32_t const **buffer, return state_command; } -static __inline__ verifier_state_t +static inline verifier_state_t via_check_vheader5(uint32_t const **buffer, const uint32_t *buf_end) { uint32_t data; @@ -883,7 +883,7 @@ via_check_vheader5(uint32_t const **buffer, const uint32_t *buf_end) } -static __inline__ verifier_state_t +static inline verifier_state_t via_parse_vheader5(drm_via_private_t *dev_priv, uint32_t const **buffer, const uint32_t *buf_end) { @@ -901,7 +901,7 @@ via_parse_vheader5(drm_via_private_t *dev_priv, uint32_t const **buffer, return state_command; } -static __inline__ verifier_state_t +static inline verifier_state_t via_check_vheader6(uint32_t const **buffer, const uint32_t * buf_end) { uint32_t data; @@ -938,7 +938,7 @@ via_check_vheader6(uint32_t const **buffer, const uint32_t * buf_end) return state_command; } -static __inline__ verifier_state_t +static inline verifier_state_t via_parse_vheader6(drm_via_private_t *dev_priv, uint32_t const **buffer, const uint32_t *buf_end) { diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c index 5595f6a274e7..53926e6d99fb 100644 --- a/drivers/media/pci/ivtv/ivtv-ioctl.c +++ b/drivers/media/pci/ivtv/ivtv-ioctl.c @@ -1605,7 +1605,7 @@ static int ivtv_try_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder } #ifdef CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS -static __inline__ void warn_deprecated_ioctl(const char *name) +static inline void warn_deprecated_ioctl(const char *name) { pr_warn_once("warning: the %s ioctl is deprecated. Don't use it, as it will be removed soon\n", name); diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c index 3e7631160384..e8c007d3da28 100644 --- a/drivers/net/ethernet/sun/sungem.c +++ b/drivers/net/ethernet/sun/sungem.c @@ -640,7 +640,7 @@ static int gem_abnormal_irq(struct net_device *dev, struct gem *gp, u32 gem_stat return 0; } -static __inline__ void gem_tx(struct net_device *dev, struct gem *gp, u32 gem_status) +static inline void gem_tx(struct net_device *dev, struct gem *gp, u32 gem_status) { int entry, limit; @@ -710,7 +710,7 @@ static __inline__ void gem_tx(struct net_device *dev, struct gem *gp, u32 gem_st } } -static __inline__ void gem_post_rxds(struct gem *gp, int limit) +static inline void gem_post_rxds(struct gem *gp, int limit) { int cluster_start, curr, count, kick; @@ -742,7 +742,7 @@ static __inline__ void gem_post_rxds(struct gem *gp, int limit) #define ALIGNED_RX_SKB_ADDR(addr) \ ((((unsigned long)(addr) + (64UL - 1UL)) & ~(64UL - 1UL)) - (unsigned long)(addr)) -static __inline__ struct sk_buff *gem_alloc_skb(struct net_device *dev, int size, +static inline struct sk_buff *gem_alloc_skb(struct net_device *dev, int size, gfp_t gfp_flags) { struct sk_buff *skb = alloc_skb(size + 64, gfp_flags); @@ -988,7 +988,7 @@ static void gem_tx_timeout(struct net_device *dev) gem_schedule_reset(gp); } -static __inline__ int gem_intme(int entry) +static inline int gem_intme(int entry) { /* Algorithm: IRQ every 1/2 of descriptors. */ if (!(entry & ((TX_RING_SIZE>>1)-1))) diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index d007dfeba5c3..e4bfd1e5635f 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c @@ -108,7 +108,7 @@ struct hme_tx_logent { #define TX_LOG_LEN 128 static struct hme_tx_logent tx_log[TX_LOG_LEN]; static int txlog_cur_entry; -static __inline__ void tx_add_log(struct happy_meal *hp, unsigned int a, unsigned int s) +static inline void tx_add_log(struct happy_meal *hp, unsigned int a, unsigned int s) { struct hme_tx_logent *tlp; unsigned long flags; @@ -123,7 +123,7 @@ static __inline__ void tx_add_log(struct happy_meal *hp, unsigned int a, unsigne txlog_cur_entry = (txlog_cur_entry + 1) & (TX_LOG_LEN - 1); local_irq_restore(flags); } -static __inline__ void tx_dump_log(void) +static inline void tx_dump_log(void) { int i, this; @@ -136,7 +136,7 @@ static __inline__ void tx_dump_log(void) this = (this + 1) & (TX_LOG_LEN - 1); } } -static __inline__ void tx_dump_ring(struct happy_meal *hp) +static inline void tx_dump_ring(struct happy_meal *hp) { struct hmeal_init_block *hb = hp->happy_block; struct happy_meal_txd *tp = &hb->happy_meal_txd[0]; diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c index 04bb409707fc..9b7e0189ba9b 100644 --- a/drivers/net/hamradio/baycom_ser_fdx.c +++ b/drivers/net/hamradio/baycom_ser_fdx.c @@ -188,7 +188,7 @@ static inline void ser12_set_divisor(struct net_device *dev, */ } -static __inline__ void ser12_rx(struct net_device *dev, struct baycom_state *bc, struct timespec64 *ts, unsigned char curs) +static inline void ser12_rx(struct net_device *dev, struct baycom_state *bc, struct timespec64 *ts, unsigned char curs) { int timediff; int bdus8 = bc->baud_us >> 3; diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index 0f1217b506ad..f5cf7fb06de8 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c @@ -71,7 +71,7 @@ static struct lapbethdev *lapbeth_get_x25_dev(struct net_device *dev) return NULL; } -static __inline__ int dev_is_ethdev(struct net_device *dev) +static inline int dev_is_ethdev(struct net_device *dev) { return dev->type == ARPHRD_ETHER && strncmp(dev->name, "dummy", 5); } diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c index f9e7fc7e9978..2f5370432b3f 100644 --- a/drivers/net/wan/n2.c +++ b/drivers/net/wan/n2.c @@ -145,13 +145,13 @@ static card_t **new_card = &first_card; &(card)->ports[port] : NULL) -static __inline__ u8 sca_get_page(card_t *card) +static inline u8 sca_get_page(card_t *card) { return inb(card->io + N2_PSR) & PSR_PAGEBITS; } -static __inline__ void openwin(card_t *card, u8 page) +static inline void openwin(card_t *card, u8 page) { u8 psr = inb(card->io + N2_PSR); outb((psr & ~PSR_PAGEBITS) | page, card->io + N2_PSR); diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c index 73e37bb877a4..2d116780464a 100644 --- a/drivers/parisc/led.c +++ b/drivers/parisc/led.c @@ -345,7 +345,7 @@ static void led_LCD_driver(unsigned char leds) ** (analog to dev_get_info() from net/core/dev.c) ** */ -static __inline__ int led_get_net_activity(void) +static inline int led_get_net_activity(void) { #ifndef CONFIG_NET return 0; @@ -397,7 +397,7 @@ static __inline__ int led_get_net_activity(void) ** calculate if there was disk-io in the system ** */ -static __inline__ int led_get_diskio_activity(void) +static inline int led_get_diskio_activity(void) { static unsigned long last_pgpgin, last_pgpgout; unsigned long events[NR_VM_EVENT_ITEMS]; diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index 296668caf7e5..593e19eab71b 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c @@ -88,7 +88,7 @@ #define DBG_RES(x...) #endif -#define SBA_INLINE __inline__ +#define SBA_INLINE inline #define DEFAULT_DMA_HINT_REG 0 diff --git a/drivers/parport/parport_gsc.h b/drivers/parport/parport_gsc.h index 4c4d3c6cd77e..3474064a9285 100644 --- a/drivers/parport/parport_gsc.h +++ b/drivers/parport/parport_gsc.h @@ -27,13 +27,13 @@ #define parport_readb gsc_readb #define parport_writeb gsc_writeb #else -static __inline__ unsigned char parport_readb( unsigned long port ) +static inline unsigned char parport_readb( unsigned long port ) { udelay(DELAY_TIME); return gsc_readb(port); } -static __inline__ void parport_writeb( unsigned char value, unsigned long port ) +static inline void parport_writeb( unsigned char value, unsigned long port ) { gsc_writeb(value,port); udelay(DELAY_TIME); diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index f9df800e7067..587091457a9f 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -4277,7 +4277,7 @@ lpfc_info(struct Scsi_Host *host) * This routine modifies fcp_poll_timer field of @phba by cfg_poll_tmo. * The default value of cfg_poll_tmo is 10 milliseconds. **/ -static __inline__ void lpfc_poll_rearm_timer(struct lpfc_hba * phba) +static inline void lpfc_poll_rearm_timer(struct lpfc_hba * phba) { unsigned long poll_tmo_expires = (jiffies + msecs_to_jiffies(phba->cfg_poll_tmo)); diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c index a366ff1a3959..e28828c27507 100644 --- a/drivers/scsi/pcmcia/sym53c500_cs.c +++ b/drivers/scsi/pcmcia/sym53c500_cs.c @@ -232,7 +232,7 @@ SYM53C500_int_host_reset(int io_port) chip_init(io_port); } -static __inline__ int +static inline int SYM53C500_pio_read(int fast_pio, int base, unsigned char *request, unsigned int reqlen) { int i; @@ -287,7 +287,7 @@ SYM53C500_pio_read(int fast_pio, int base, unsigned char *request, unsigned int return 0; } -static __inline__ int +static inline int SYM53C500_pio_write(int fast_pio, int base, unsigned char *request, unsigned int reqlen) { int i = 0; diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h index bf063c664352..2b6ea8bd8994 100644 --- a/drivers/scsi/qla2xxx/qla_inline.h +++ b/drivers/scsi/qla2xxx/qla_inline.h @@ -39,7 +39,7 @@ qla24xx_calc_iocbs(scsi_qla_host_t *vha, uint16_t dsds) * Returns: * register value. */ -static __inline__ uint16_t +static inline uint16_t qla2x00_debounce_register(volatile uint16_t __iomem *addr) { volatile uint16_t first; diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 98e60a34afd9..301ccd53f30d 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -342,7 +342,7 @@ qla2x00_restart_timer(scsi_qla_host_t *vha, unsigned long interval) mod_timer(&vha->timer, jiffies + interval * HZ); } -static __inline__ void +static inline void qla2x00_stop_timer(scsi_qla_host_t *vha) { del_timer_sync(&vha->timer); diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c index 8330fd809a05..738df4354c4d 100644 --- a/drivers/tty/amiserial.c +++ b/drivers/tty/amiserial.c @@ -171,7 +171,7 @@ static inline int serial_paranoia_check(struct serial_state *info, #define SER_CTS (1<<4) #define SER_DSR (1<<3) -static __inline__ void rtsdtr_ctrl(int bits) +static inline void rtsdtr_ctrl(int bits) { ciab.pra = ((bits & (SER_RTS | SER_DTR)) ^ (SER_RTS | SER_DTR)) | (ciab.pra & ~(SER_RTS | SER_DTR)); } diff --git a/drivers/tty/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c index 8c810733df3d..8ccf8b7ee8bb 100644 --- a/drivers/tty/serial/ip22zilog.c +++ b/drivers/tty/serial/ip22zilog.c @@ -490,7 +490,7 @@ static irqreturn_t ip22zilog_interrupt(int irq, void *dev_id) /* A convenient way to quickly get R0 status. The caller must _not_ hold the * port lock, it is acquired here. */ -static __inline__ unsigned char ip22zilog_read_channel_status(struct uart_port *port) +static inline unsigned char ip22zilog_read_channel_status(struct uart_port *port) { struct zilog_channel *channel; unsigned char status; diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c index 72131b5e132e..ec62843a39f4 100644 --- a/drivers/tty/serial/sunsab.c +++ b/drivers/tty/serial/sunsab.c @@ -92,7 +92,7 @@ static char *sab82532_version[16] = { #define SAB82532_RECV_FIFO_SIZE 32 /* Standard async fifo sizes */ #define SAB82532_XMIT_FIFO_SIZE 32 -static __inline__ void sunsab_tec_wait(struct uart_sunsab_port *up) +static inline void sunsab_tec_wait(struct uart_sunsab_port *up) { int timeout = up->tec_timeout; @@ -100,7 +100,7 @@ static __inline__ void sunsab_tec_wait(struct uart_sunsab_port *up) udelay(1); } -static __inline__ void sunsab_cec_wait(struct uart_sunsab_port *up) +static inline void sunsab_cec_wait(struct uart_sunsab_port *up) { int timeout = up->cec_timeout; diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c index bc7af8b08a72..5c7f1648f54d 100644 --- a/drivers/tty/serial/sunzilog.c +++ b/drivers/tty/serial/sunzilog.c @@ -590,7 +590,7 @@ static irqreturn_t sunzilog_interrupt(int irq, void *dev_id) /* A convenient way to quickly get R0 status. The caller must _not_ hold the * port lock, it is acquired here. */ -static __inline__ unsigned char sunzilog_read_channel_status(struct uart_port *port) +static inline unsigned char sunzilog_read_channel_status(struct uart_port *port) { struct zilog_channel __iomem *channel; unsigned char status; diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index c9235a2f42f8..0ff640da865d 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -200,10 +200,10 @@ static void fbcon_set_palette(struct vc_data *vc, const unsigned char *table); /* * Internal routines */ -static __inline__ void ywrap_up(struct vc_data *vc, int count); -static __inline__ void ywrap_down(struct vc_data *vc, int count); -static __inline__ void ypan_up(struct vc_data *vc, int count); -static __inline__ void ypan_down(struct vc_data *vc, int count); +static inline void ywrap_up(struct vc_data *vc, int count); +static inline void ywrap_down(struct vc_data *vc, int count); +static inline void ypan_up(struct vc_data *vc, int count); +static inline void ypan_down(struct vc_data *vc, int count); static void fbcon_bmove_rec(struct vc_data *vc, struct fbcon_display *p, int sy, int sx, int dy, int dx, int height, int width, u_int y_break); static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var, @@ -1475,7 +1475,7 @@ static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var, } } -static __inline__ void ywrap_up(struct vc_data *vc, int count) +static inline void ywrap_up(struct vc_data *vc, int count) { struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]]; struct fbcon_ops *ops = info->fbcon_par; @@ -1494,7 +1494,7 @@ static __inline__ void ywrap_up(struct vc_data *vc, int count) scrollback_current = 0; } -static __inline__ void ywrap_down(struct vc_data *vc, int count) +static inline void ywrap_down(struct vc_data *vc, int count) { struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]]; struct fbcon_ops *ops = info->fbcon_par; @@ -1513,7 +1513,7 @@ static __inline__ void ywrap_down(struct vc_data *vc, int count) scrollback_current = 0; } -static __inline__ void ypan_up(struct vc_data *vc, int count) +static inline void ypan_up(struct vc_data *vc, int count) { struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]]; struct fbcon_display *p = &fb_display[vc->vc_num]; @@ -1537,7 +1537,7 @@ static __inline__ void ypan_up(struct vc_data *vc, int count) scrollback_current = 0; } -static __inline__ void ypan_up_redraw(struct vc_data *vc, int t, int count) +static inline void ypan_up_redraw(struct vc_data *vc, int t, int count) { struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]]; struct fbcon_ops *ops = info->fbcon_par; @@ -1561,7 +1561,7 @@ static __inline__ void ypan_up_redraw(struct vc_data *vc, int t, int count) scrollback_current = 0; } -static __inline__ void ypan_down(struct vc_data *vc, int count) +static inline void ypan_down(struct vc_data *vc, int count) { struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]]; struct fbcon_display *p = &fb_display[vc->vc_num]; @@ -1585,7 +1585,7 @@ static __inline__ void ypan_down(struct vc_data *vc, int count) scrollback_current = 0; } -static __inline__ void ypan_down_redraw(struct vc_data *vc, int t, int count) +static inline void ypan_down_redraw(struct vc_data *vc, int t, int count) { struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]]; struct fbcon_ops *ops = info->fbcon_par; diff --git a/drivers/video/fbdev/ffb.c b/drivers/video/fbdev/ffb.c index cd2d1db239a2..2baf8e8c9b82 100644 --- a/drivers/video/fbdev/ffb.c +++ b/drivers/video/fbdev/ffb.c @@ -412,7 +412,7 @@ static int ffb_sync(struct fb_info *p) return 0; } -static __inline__ void ffb_rop(struct ffb_par *par, u32 rop) +static inline void ffb_rop(struct ffb_par *par, u32 rop) { if (par->rop_cache != rop) { FFBFifo(par, 1); diff --git a/drivers/video/fbdev/intelfb/intelfbdrv.c b/drivers/video/fbdev/intelfb/intelfbdrv.c index a76c61512c60..840d355992f9 100644 --- a/drivers/video/fbdev/intelfb/intelfbdrv.c +++ b/drivers/video/fbdev/intelfb/intelfbdrv.c @@ -270,7 +270,7 @@ MODULE_PARM_DESC(mode, #define OPT_INTVAL(opt, name) simple_strtoul(opt + strlen(name) + 1, NULL, 0) #define OPT_STRVAL(opt, name) (opt + strlen(name)) -static __inline__ char * get_opt_string(const char *this_opt, const char *name) +static inline char * get_opt_string(const char *this_opt, const char *name) { const char *p; int i; @@ -288,7 +288,7 @@ static __inline__ char * get_opt_string(const char *this_opt, const char *name) return ret; } -static __inline__ int get_opt_int(const char *this_opt, const char *name, +static inline int get_opt_int(const char *this_opt, const char *name, int *ret) { if (!ret) @@ -301,7 +301,7 @@ static __inline__ int get_opt_int(const char *this_opt, const char *name, return 1; } -static __inline__ int get_opt_bool(const char *this_opt, const char *name, +static inline int get_opt_bool(const char *this_opt, const char *name, bool *ret) { if (!ret) @@ -922,7 +922,7 @@ __inline__ int intelfb_var_to_depth(const struct fb_var_screeninfo *var) } -static __inline__ int var_to_refresh(const struct fb_var_screeninfo *var) +static inline int var_to_refresh(const struct fb_var_screeninfo *var) { int xtot = var->xres + var->left_margin + var->right_margin + var->hsync_len; diff --git a/drivers/video/fbdev/intelfb/intelfbhw.c b/drivers/video/fbdev/intelfb/intelfbhw.c index 57aff7450bce..bbd258330f21 100644 --- a/drivers/video/fbdev/intelfb/intelfbhw.c +++ b/drivers/video/fbdev/intelfb/intelfbhw.c @@ -1025,7 +1025,7 @@ static int calc_pll_params(int index, int clock, u32 *retm1, u32 *retm2, return 0; } -static __inline__ int check_overflow(u32 value, u32 limit, +static inline int check_overflow(u32 value, u32 limit, const char *description) { if (value > limit) { diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c index 3110791a2f1c..b631c7250cae 100644 --- a/drivers/w1/masters/matrox_w1.c +++ b/drivers/w1/masters/matrox_w1.c @@ -64,7 +64,7 @@ struct matrox_device * * Port mapping. */ -static __inline__ u8 matrox_w1_read_reg(struct matrox_device *dev, u8 reg) +static inline u8 matrox_w1_read_reg(struct matrox_device *dev, u8 reg) { u8 ret; @@ -75,7 +75,7 @@ static __inline__ u8 matrox_w1_read_reg(struct matrox_device *dev, u8 reg) return ret; } -static __inline__ void matrox_w1_write_reg(struct matrox_device *dev, u8 reg, u8 val) +static inline void matrox_w1_write_reg(struct matrox_device *dev, u8 reg, u8 val) { writeb(reg, dev->port_index); writeb(val, dev->port_data); diff --git a/fs/coda/coda_linux.h b/fs/coda/coda_linux.h index d5ebd36fb2cc..3263fdb982ec 100644 --- a/fs/coda/coda_linux.h +++ b/fs/coda/coda_linux.h @@ -66,18 +66,18 @@ static inline struct coda_inode_info *ITOC(struct inode *inode) return container_of(inode, struct coda_inode_info, vfs_inode); } -static __inline__ struct CodaFid *coda_i2f(struct inode *inode) +static inline struct CodaFid *coda_i2f(struct inode *inode) { return &(ITOC(inode)->c_fid); } -static __inline__ char *coda_i2s(struct inode *inode) +static inline char *coda_i2s(struct inode *inode) { return coda_f2s(&(ITOC(inode)->c_fid)); } /* this will not zap the inode away */ -static __inline__ void coda_flag_inode(struct inode *inode, int flag) +static inline void coda_flag_inode(struct inode *inode, int flag) { struct coda_inode_info *cii = ITOC(inode); diff --git a/fs/freevxfs/vxfs_inode.c b/fs/freevxfs/vxfs_inode.c index 1f41b25ef38b..a0b32934b1e4 100644 --- a/fs/freevxfs/vxfs_inode.c +++ b/fs/freevxfs/vxfs_inode.c @@ -74,7 +74,7 @@ vxfs_dumpi(struct vxfs_inode_info *vip, ino_t ino) * vxfs_transmod returns a Linux mode_t for a given * VxFS inode structure. */ -static __inline__ umode_t +static inline umode_t vxfs_transmod(struct vxfs_inode_info *vip) { umode_t ret = vip->vii_mode & ~VXFS_TYPE_MASK; diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h index 755e256a9103..f399f4a16fc9 100644 --- a/fs/nfsd/nfsfh.h +++ b/fs/nfsd/nfsfh.h @@ -166,7 +166,7 @@ __be32 fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct __be32 fh_update(struct svc_fh *); void fh_put(struct svc_fh *); -static __inline__ struct svc_fh * +static inline struct svc_fh * fh_copy(struct svc_fh *dst, struct svc_fh *src) { WARN_ON(src->fh_dentry || src->fh_locked); @@ -182,7 +182,7 @@ fh_copy_shallow(struct knfsd_fh *dst, struct knfsd_fh *src) memcpy(&dst->fh_base, &src->fh_base, src->fh_size); } -static __inline__ struct svc_fh * +static inline struct svc_fh * fh_init(struct svc_fh *fhp, int maxsize) { memset(fhp, 0, sizeof(*fhp)); diff --git a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h index 6a0705b433d2..6df8569eb3b3 100644 --- a/include/acpi/platform/acgcc.h +++ b/include/acpi/platform/acgcc.h @@ -26,7 +26,7 @@ typedef __builtin_va_list va_list; #endif #endif -#define ACPI_INLINE __inline__ +#define ACPI_INLINE inline /* Function name is used for debug output. Non-ANSI, compiler-dependent */ diff --git a/include/asm-generic/ide_iops.h b/include/asm-generic/ide_iops.h index 81dfa3ee5e06..c7028674a03d 100644 --- a/include/asm-generic/ide_iops.h +++ b/include/asm-generic/ide_iops.h @@ -6,7 +6,7 @@ #define __ide_outsw outsw #define __ide_outsl outsl -static __inline__ void __ide_mm_insw(void __iomem *port, void *addr, u32 count) +static inline void __ide_mm_insw(void __iomem *port, void *addr, u32 count) { while (count--) { *(u16 *)addr = readw(port); @@ -14,7 +14,7 @@ static __inline__ void __ide_mm_insw(void __iomem *port, void *addr, u32 count) } } -static __inline__ void __ide_mm_insl(void __iomem *port, void *addr, u32 count) +static inline void __ide_mm_insl(void __iomem *port, void *addr, u32 count) { while (count--) { *(u32 *)addr = readl(port); @@ -22,7 +22,7 @@ static __inline__ void __ide_mm_insl(void __iomem *port, void *addr, u32 count) } } -static __inline__ void __ide_mm_outsw(void __iomem *port, void *addr, u32 count) +static inline void __ide_mm_outsw(void __iomem *port, void *addr, u32 count) { while (count--) { writew(*(u16 *)addr, port); @@ -30,7 +30,7 @@ static __inline__ void __ide_mm_outsw(void __iomem *port, void *addr, u32 count) } } -static __inline__ void __ide_mm_outsl(void __iomem * port, void *addr, u32 count) +static inline void __ide_mm_outsl(void __iomem * port, void *addr, u32 count) { while (count--) { writel(*(u32 *)addr, port); diff --git a/include/linux/atalk.h b/include/linux/atalk.h index f6034ba774be..c2128e3ca431 100644 --- a/include/linux/atalk.h +++ b/include/linux/atalk.h @@ -60,7 +60,7 @@ struct ddpehdr { /* And netatalk apps expect to stick the type in themselves */ }; -static __inline__ struct ddpehdr *ddp_hdr(struct sk_buff *skb) +static inline struct ddpehdr *ddp_hdr(struct sk_buff *skb) { return (struct ddpehdr *)skb_transport_header(skb); } @@ -88,7 +88,7 @@ struct elapaarp { __u8 pa_dst_node; } __attribute__ ((packed)); -static __inline__ struct elapaarp *aarp_hdr(struct sk_buff *skb) +static inline struct elapaarp *aarp_hdr(struct sk_buff *skb) { return (struct elapaarp *)skb_transport_header(skb); } diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h index cacc4dd27794..933a2c5f5379 100644 --- a/include/linux/hdlc.h +++ b/include/linux/hdlc.h @@ -71,7 +71,7 @@ static inline struct hdlc_device* dev_to_hdlc(struct net_device *dev) return netdev_priv(dev); } -static __inline__ void debug_frame(const struct sk_buff *skb) +static inline void debug_frame(const struct sk_buff *skb) { int i; @@ -98,7 +98,7 @@ int attach_hdlc_protocol(struct net_device *dev, struct hdlc_proto *proto, /* May be used by hardware driver to gain control over HDLC device */ int detach_hdlc_protocol(struct net_device *dev); -static __inline__ __be16 hdlc_type_trans(struct sk_buff *skb, +static inline __be16 hdlc_type_trans(struct sk_buff *skb, struct net_device *dev) { hdlc_device *hdlc = dev_to_hdlc(dev); diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h index 3515ca64e638..1ce82b2a3c9c 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h @@ -195,7 +195,7 @@ static inline bool inet_ifa_match(__be32 addr, const struct in_ifaddr *ifa) * Check if a mask is acceptable. */ -static __inline__ bool bad_mask(__be32 mask, __be32 addr) +static inline bool bad_mask(__be32 mask, __be32 addr) { __u32 hmask; if (addr & (mask = ~mask)) @@ -270,14 +270,14 @@ static inline void in_dev_put(struct in_device *idev) #endif /* __KERNEL__ */ -static __inline__ __be32 inet_make_mask(int logmask) +static inline __be32 inet_make_mask(int logmask) { if (logmask) return htonl(~((1U<<(32-logmask))-1)); return 0; } -static __inline__ int inet_mask_len(__be32 mask) +static inline int inet_mask_len(__be32 mask) { __u32 hmask = ntohl(mask); if (!hmask) diff --git a/include/linux/parport.h b/include/linux/parport.h index 397607a0c0eb..a28dc3e22074 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h @@ -385,7 +385,7 @@ extern void parport_release(struct pardevice *dev); * timeslice is half a second, but it can be adjusted via the /proc * interface. **/ -static __inline__ int parport_yield(struct pardevice *dev) +static inline int parport_yield(struct pardevice *dev) { unsigned long int timeslip = (jiffies - dev->time); if ((dev->port->waithead == NULL) || (timeslip < dev->timeslice)) @@ -403,7 +403,7 @@ static __inline__ int parport_yield(struct pardevice *dev) * parport_claim_or_block(), and the return value is the same as for * parport_claim_or_block(). **/ -static __inline__ int parport_yield_blocking(struct pardevice *dev) +static inline int parport_yield_blocking(struct pardevice *dev) { unsigned long int timeslip = (jiffies - dev->time); if ((dev->port->waithead == NULL) || (timeslip < dev->timeslice)) diff --git a/include/linux/parport_pc.h b/include/linux/parport_pc.h index 3d6fc576d6a1..ea368c35a5e7 100644 --- a/include/linux/parport_pc.h +++ b/include/linux/parport_pc.h @@ -60,7 +60,7 @@ struct parport_pc_via_data u8 viacfg_parport_base; }; -static __inline__ void parport_pc_write_data(struct parport *p, unsigned char d) +static inline void parport_pc_write_data(struct parport *p, unsigned char d) { #ifdef DEBUG_PARPORT printk (KERN_DEBUG "parport_pc_write_data(%p,0x%02x)\n", p, d); @@ -68,7 +68,7 @@ static __inline__ void parport_pc_write_data(struct parport *p, unsigned char d) outb(d, DATA(p)); } -static __inline__ unsigned char parport_pc_read_data(struct parport *p) +static inline unsigned char parport_pc_read_data(struct parport *p) { unsigned char val = inb (DATA (p)); #ifdef DEBUG_PARPORT @@ -125,7 +125,7 @@ static inline void dump_parport_state (char *str, struct parport *p) /* __parport_pc_frob_control differs from parport_pc_frob_control in that * it doesn't do any extra masking. */ -static __inline__ unsigned char __parport_pc_frob_control (struct parport *p, +static inline unsigned char __parport_pc_frob_control (struct parport *p, unsigned char mask, unsigned char val) { @@ -143,17 +143,17 @@ static __inline__ unsigned char __parport_pc_frob_control (struct parport *p, return ctr; } -static __inline__ void parport_pc_data_reverse (struct parport *p) +static inline void parport_pc_data_reverse (struct parport *p) { __parport_pc_frob_control (p, 0x20, 0x20); } -static __inline__ void parport_pc_data_forward (struct parport *p) +static inline void parport_pc_data_forward (struct parport *p) { __parport_pc_frob_control (p, 0x20, 0x00); } -static __inline__ void parport_pc_write_control (struct parport *p, +static inline void parport_pc_write_control (struct parport *p, unsigned char d) { const unsigned char wm = (PARPORT_CONTROL_STROBE | @@ -171,7 +171,7 @@ static __inline__ void parport_pc_write_control (struct parport *p, __parport_pc_frob_control (p, wm, d & wm); } -static __inline__ unsigned char parport_pc_read_control(struct parport *p) +static inline unsigned char parport_pc_read_control(struct parport *p) { const unsigned char rm = (PARPORT_CONTROL_STROBE | PARPORT_CONTROL_AUTOFD | @@ -181,7 +181,7 @@ static __inline__ unsigned char parport_pc_read_control(struct parport *p) return priv->ctr & rm; /* Use soft copy */ } -static __inline__ unsigned char parport_pc_frob_control (struct parport *p, +static inline unsigned char parport_pc_frob_control (struct parport *p, unsigned char mask, unsigned char val) { @@ -208,18 +208,18 @@ static __inline__ unsigned char parport_pc_frob_control (struct parport *p, return __parport_pc_frob_control (p, mask, val); } -static __inline__ unsigned char parport_pc_read_status(struct parport *p) +static inline unsigned char parport_pc_read_status(struct parport *p) { return inb(STATUS(p)); } -static __inline__ void parport_pc_disable_irq(struct parport *p) +static inline void parport_pc_disable_irq(struct parport *p) { __parport_pc_frob_control (p, 0x10, 0x00); } -static __inline__ void parport_pc_enable_irq(struct parport *p) +static inline void parport_pc_enable_irq(struct parport *p) { __parport_pc_frob_control (p, 0x10, 0x10); } diff --git a/include/net/ax25.h b/include/net/ax25.h index 8b7eb46ad72d..19a0dececa4a 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h @@ -282,7 +282,7 @@ static inline struct ax25_cb *sk_to_ax25(const struct sock *sk) #define ax25_cb_hold(__ax25) \ refcount_inc(&((__ax25)->refcount)) -static __inline__ void ax25_cb_put(ax25_cb *ax25) +static inline void ax25_cb_put(ax25_cb *ax25) { if (refcount_dec_and_test(&ax25->refcount)) { kfree(ax25->digipeat); diff --git a/include/net/checksum.h b/include/net/checksum.h index 97bf4885a962..150ec007aea5 100644 --- a/include/net/checksum.h +++ b/include/net/checksum.h @@ -37,7 +37,7 @@ __wsum csum_and_copy_from_user (const void __user *src, void *dst, #endif #ifndef HAVE_CSUM_COPY_USER -static __inline__ __wsum csum_and_copy_to_user +static inline __wsum csum_and_copy_to_user (const void *src, void __user *dst, int len, __wsum sum, int *err_ptr) { sum = csum_partial(src, len, sum); diff --git a/include/net/dn_nsp.h b/include/net/dn_nsp.h index f83932b864a9..4508a58e6049 100644 --- a/include/net/dn_nsp.h +++ b/include/net/dn_nsp.h @@ -136,7 +136,7 @@ struct srcobj_fmt { * numbers used in NSP. Similar in operation to the functions * of the same name in TCP. */ -static __inline__ int dn_before(__u16 seq1, __u16 seq2) +static inline int dn_before(__u16 seq1, __u16 seq2) { seq1 &= 0x0fff; seq2 &= 0x0fff; @@ -145,7 +145,7 @@ static __inline__ int dn_before(__u16 seq1, __u16 seq2) } -static __inline__ int dn_after(__u16 seq1, __u16 seq2) +static inline int dn_after(__u16 seq1, __u16 seq2) { seq1 &= 0x0fff; seq2 &= 0x0fff; @@ -153,23 +153,23 @@ static __inline__ int dn_after(__u16 seq1, __u16 seq2) return (int)((seq2 - seq1) & 0x0fff) > 2048; } -static __inline__ int dn_equal(__u16 seq1, __u16 seq2) +static inline int dn_equal(__u16 seq1, __u16 seq2) { return ((seq1 ^ seq2) & 0x0fff) == 0; } -static __inline__ int dn_before_or_equal(__u16 seq1, __u16 seq2) +static inline int dn_before_or_equal(__u16 seq1, __u16 seq2) { return (dn_before(seq1, seq2) || dn_equal(seq1, seq2)); } -static __inline__ void seq_add(__u16 *seq, __u16 off) +static inline void seq_add(__u16 *seq, __u16 off) { (*seq) += off; (*seq) &= 0x0fff; } -static __inline__ int seq_next(__u16 seq1, __u16 seq2) +static inline int seq_next(__u16 seq1, __u16 seq2) { return dn_equal(seq1 + 1, seq2); } @@ -177,7 +177,7 @@ static __inline__ int seq_next(__u16 seq1, __u16 seq2) /* * Can we delay the ack ? */ -static __inline__ int sendack(__u16 seq) +static inline int sendack(__u16 seq) { return (int)((seq & 0x1000) ? 0 : 1); } @@ -185,7 +185,7 @@ static __inline__ int sendack(__u16 seq) /* * Is socket congested ? */ -static __inline__ int dn_congested(struct sock *sk) +static inline int dn_congested(struct sock *sk) { return atomic_read(&sk->sk_rmem_alloc) > (sk->sk_rcvbuf >> 1); } diff --git a/include/net/ip.h b/include/net/ip.h index 29d89de39822..a7cc3560a1dd 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -614,7 +614,7 @@ static inline void ip_ipgre_mc_map(__be32 naddr, const unsigned char *broadcast, #include <linux/ipv6.h> #endif -static __inline__ void inet_reset_saddr(struct sock *sk) +static inline void inet_reset_saddr(struct sock *sk) { inet_sk(sk)->inet_rcv_saddr = inet_sk(sk)->inet_saddr = 0; #if IS_ENABLED(CONFIG_IPV6) diff --git a/include/net/ip6_checksum.h b/include/net/ip6_checksum.h index 7bec95df4f80..4cd870dfa627 100644 --- a/include/net/ip6_checksum.h +++ b/include/net/ip6_checksum.h @@ -51,7 +51,7 @@ static inline __wsum ip6_gro_compute_pseudo(struct sk_buff *skb, int proto) skb_gro_len(skb), proto, 0)); } -static __inline__ __sum16 tcp_v6_check(int len, +static inline __sum16 tcp_v6_check(int len, const struct in6_addr *saddr, const struct in6_addr *daddr, __wsum base) diff --git a/include/net/ipx.h b/include/net/ipx.h index baf090390998..cf89ef92a5f7 100644 --- a/include/net/ipx.h +++ b/include/net/ipx.h @@ -47,7 +47,7 @@ struct ipxhdr { /* From af_ipx.c */ extern int sysctl_ipx_pprop_broadcasting; -static __inline__ struct ipxhdr *ipx_hdr(struct sk_buff *skb) +static inline struct ipxhdr *ipx_hdr(struct sk_buff *skb) { return (struct ipxhdr *)skb_transport_header(skb); } @@ -139,7 +139,7 @@ void ipx_proc_exit(void); const char *ipx_frame_name(__be16); const char *ipx_device_name(struct ipx_interface *intrfc); -static __inline__ void ipxitf_hold(struct ipx_interface *intrfc) +static inline void ipxitf_hold(struct ipx_interface *intrfc) { refcount_inc(&intrfc->refcnt); } @@ -157,18 +157,18 @@ int ipxrtr_route_skb(struct sk_buff *skb); struct ipx_route *ipxrtr_lookup(__be32 net); int ipxrtr_ioctl(unsigned int cmd, void __user *arg); -static __inline__ void ipxitf_put(struct ipx_interface *intrfc) +static inline void ipxitf_put(struct ipx_interface *intrfc) { if (refcount_dec_and_test(&intrfc->refcnt)) ipxitf_down(intrfc); } -static __inline__ void ipxrtr_hold(struct ipx_route *rt) +static inline void ipxrtr_hold(struct ipx_route *rt) { refcount_inc(&rt->refcnt); } -static __inline__ void ipxrtr_put(struct ipx_route *rt) +static inline void ipxrtr_put(struct ipx_route *rt) { if (refcount_dec_and_test(&rt->refcnt)) kfree(rt); diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h index 3948cf111dd0..266275a945b4 100644 --- a/include/net/llc_c_ev.h +++ b/include/net/llc_c_ev.h @@ -120,7 +120,7 @@ struct llc_conn_state_ev { u8 cfm_prim; }; -static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb) +static inline struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb) { return (struct llc_conn_state_ev *)skb->cb; } @@ -216,7 +216,7 @@ int llc_conn_ev_qlfy_set_status_refuse(struct sock *sk, struct sk_buff *skb); int llc_conn_ev_qlfy_set_status_conflict(struct sock *sk, struct sk_buff *skb); int llc_conn_ev_qlfy_set_status_rst_done(struct sock *sk, struct sk_buff *skb); -static __inline__ int llc_conn_space(struct sock *sk, struct sk_buff *skb) +static inline int llc_conn_space(struct sock *sk, struct sk_buff *skb) { return atomic_read(&sk->sk_rmem_alloc) + skb->truesize < (unsigned int)sk->sk_rcvbuf; diff --git a/include/net/llc_conn.h b/include/net/llc_conn.h index df528a623548..27880d1bfd99 100644 --- a/include/net/llc_conn.h +++ b/include/net/llc_conn.h @@ -85,12 +85,12 @@ static inline struct llc_sock *llc_sk(const struct sock *sk) return (struct llc_sock *)sk; } -static __inline__ void llc_set_backlog_type(struct sk_buff *skb, char type) +static inline void llc_set_backlog_type(struct sk_buff *skb, char type) { skb->cb[sizeof(skb->cb) - 1] = type; } -static __inline__ char llc_backlog_type(struct sk_buff *skb) +static inline char llc_backlog_type(struct sk_buff *skb) { return skb->cb[sizeof(skb->cb) - 1]; } diff --git a/include/net/llc_s_ev.h b/include/net/llc_s_ev.h index 84db3a59ed28..00439d3e9f5d 100644 --- a/include/net/llc_s_ev.h +++ b/include/net/llc_s_ev.h @@ -44,7 +44,7 @@ struct llc_sap_state_ev { struct llc_addr daddr; }; -static __inline__ struct llc_sap_state_ev *llc_sap_ev(struct sk_buff *skb) +static inline struct llc_sap_state_ev *llc_sap_ev(struct sk_buff *skb) { return (struct llc_sap_state_ev *)skb->cb; } diff --git a/include/net/netrom.h b/include/net/netrom.h index 80f15b1c1a48..3ae501d08709 100644 --- a/include/net/netrom.h +++ b/include/net/netrom.h @@ -123,7 +123,7 @@ struct nr_node { #define nr_node_hold(__nr_node) \ refcount_inc(&((__nr_node)->refcount)) -static __inline__ void nr_node_put(struct nr_node *nr_node) +static inline void nr_node_put(struct nr_node *nr_node) { if (refcount_dec_and_test(&nr_node->refcount)) { kfree(nr_node); @@ -133,7 +133,7 @@ static __inline__ void nr_node_put(struct nr_node *nr_node) #define nr_neigh_hold(__nr_neigh) \ refcount_inc(&((__nr_neigh)->refcount)) -static __inline__ void nr_neigh_put(struct nr_neigh *nr_neigh) +static inline void nr_neigh_put(struct nr_neigh *nr_neigh) { if (refcount_dec_and_test(&nr_neigh->refcount)) { if (nr_neigh->ax25) @@ -145,13 +145,13 @@ static __inline__ void nr_neigh_put(struct nr_neigh *nr_neigh) /* nr_node_lock and nr_node_unlock also hold/put the node's refcounter. */ -static __inline__ void nr_node_lock(struct nr_node *nr_node) +static inline void nr_node_lock(struct nr_node *nr_node) { nr_node_hold(nr_node); spin_lock_bh(&nr_node->node_lock); } -static __inline__ void nr_node_unlock(struct nr_node *nr_node) +static inline void nr_node_unlock(struct nr_node *nr_node) { spin_unlock_bh(&nr_node->node_lock); nr_node_put(nr_node); diff --git a/include/net/scm.h b/include/net/scm.h index 1ce365f4c256..b77be632b440 100644 --- a/include/net/scm.h +++ b/include/net/scm.h @@ -44,16 +44,16 @@ void __scm_destroy(struct scm_cookie *scm); struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl); #ifdef CONFIG_SECURITY_NETWORK -static __inline__ void unix_get_peersec_dgram(struct socket *sock, struct scm_cookie *scm) +static inline void unix_get_peersec_dgram(struct socket *sock, struct scm_cookie *scm) { security_socket_getpeersec_dgram(sock, NULL, &scm->secid); } #else -static __inline__ void unix_get_peersec_dgram(struct socket *sock, struct scm_cookie *scm) +static inline void unix_get_peersec_dgram(struct socket *sock, struct scm_cookie *scm) { } #endif /* CONFIG_SECURITY_NETWORK */ -static __inline__ void scm_set_cred(struct scm_cookie *scm, +static inline void scm_set_cred(struct scm_cookie *scm, struct pid *pid, kuid_t uid, kgid_t gid) { scm->pid = get_pid(pid); @@ -62,20 +62,20 @@ static __inline__ void scm_set_cred(struct scm_cookie *scm, scm->creds.gid = gid; } -static __inline__ void scm_destroy_cred(struct scm_cookie *scm) +static inline void scm_destroy_cred(struct scm_cookie *scm) { put_pid(scm->pid); scm->pid = NULL; } -static __inline__ void scm_destroy(struct scm_cookie *scm) +static inline void scm_destroy(struct scm_cookie *scm) { scm_destroy_cred(scm); if (scm->fp) __scm_destroy(scm); } -static __inline__ int scm_send(struct socket *sock, struct msghdr *msg, +static inline int scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *scm, bool forcecreds) { memset(scm, 0, sizeof(*scm)); @@ -110,7 +110,7 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct sc { } #endif /* CONFIG_SECURITY_NETWORK */ -static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg, +static inline void scm_recv(struct socket *sock, struct msghdr *msg, struct scm_cookie *scm, int flags) { if (!msg->msg_control) { diff --git a/include/net/udplite.h b/include/net/udplite.h index 9185e45b997f..747859a3a00f 100644 --- a/include/net/udplite.h +++ b/include/net/udplite.h @@ -17,7 +17,7 @@ extern struct udp_table udplite_table; /* * Checksum computation is all in software, hence simpler getfrag. */ -static __inline__ int udplite_getfrag(void *from, char *to, int offset, +static inline int udplite_getfrag(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb) { struct msghdr *msg = from; diff --git a/include/net/x25.h b/include/net/x25.h index ed1acc3044ac..4cb533479d61 100644 --- a/include/net/x25.h +++ b/include/net/x25.h @@ -242,12 +242,12 @@ struct x25_neigh *x25_get_neigh(struct net_device *); void x25_link_free(void); /* x25_neigh.c */ -static __inline__ void x25_neigh_hold(struct x25_neigh *nb) +static inline void x25_neigh_hold(struct x25_neigh *nb) { refcount_inc(&nb->refcnt); } -static __inline__ void x25_neigh_put(struct x25_neigh *nb) +static inline void x25_neigh_put(struct x25_neigh *nb) { if (refcount_dec_and_test(&nb->refcnt)) kfree(nb); @@ -265,12 +265,12 @@ void x25_route_device_down(struct net_device *dev); int x25_route_ioctl(unsigned int, void __user *); void x25_route_free(void); -static __inline__ void x25_route_hold(struct x25_route *rt) +static inline void x25_route_hold(struct x25_route *rt) { refcount_inc(&rt->refcnt); } -static __inline__ void x25_route_put(struct x25_route *rt) +static inline void x25_route_put(struct x25_route *rt) { if (refcount_dec_and_test(&rt->refcnt)) kfree(rt); diff --git a/include/net/xfrm.h b/include/net/xfrm.h index b22db30c3d88..3264fe5e6083 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -839,7 +839,7 @@ static inline bool addr4_match(__be32 a1, __be32 a2, u8 prefixlen) return !((a1 ^ a2) & htonl(~0UL << (32 - prefixlen))); } -static __inline__ +static inline __be16 xfrm_flowi_sport(const struct flowi *fl, const union flowi_uli *uli) { __be16 port; @@ -866,7 +866,7 @@ __be16 xfrm_flowi_sport(const struct flowi *fl, const union flowi_uli *uli) return port; } -static __inline__ +static inline __be16 xfrm_flowi_dport(const struct flowi *fl, const union flowi_uli *uli) { __be16 port; @@ -1232,7 +1232,7 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir, } #endif -static __inline__ +static inline xfrm_address_t *xfrm_flowi_daddr(const struct flowi *fl, unsigned short family) { switch (family){ @@ -1244,7 +1244,7 @@ xfrm_address_t *xfrm_flowi_daddr(const struct flowi *fl, unsigned short family) return NULL; } -static __inline__ +static inline xfrm_address_t *xfrm_flowi_saddr(const struct flowi *fl, unsigned short family) { switch (family){ @@ -1256,7 +1256,7 @@ xfrm_address_t *xfrm_flowi_saddr(const struct flowi *fl, unsigned short family) return NULL; } -static __inline__ +static inline void xfrm_flowi_addr_get(const struct flowi *fl, xfrm_address_t *saddr, xfrm_address_t *daddr, unsigned short family) @@ -1273,7 +1273,7 @@ void xfrm_flowi_addr_get(const struct flowi *fl, } } -static __inline__ int +static inline int __xfrm4_state_addr_check(const struct xfrm_state *x, const xfrm_address_t *daddr, const xfrm_address_t *saddr) { @@ -1283,7 +1283,7 @@ __xfrm4_state_addr_check(const struct xfrm_state *x, return 0; } -static __inline__ int +static inline int __xfrm6_state_addr_check(const struct xfrm_state *x, const xfrm_address_t *daddr, const xfrm_address_t *saddr) { @@ -1295,7 +1295,7 @@ __xfrm6_state_addr_check(const struct xfrm_state *x, return 0; } -static __inline__ int +static inline int xfrm_state_addr_check(const struct xfrm_state *x, const xfrm_address_t *daddr, const xfrm_address_t *saddr, unsigned short family) @@ -1309,7 +1309,7 @@ xfrm_state_addr_check(const struct xfrm_state *x, return 0; } -static __inline__ int +static inline int xfrm_state_addr_flow_check(const struct xfrm_state *x, const struct flowi *fl, unsigned short family) { diff --git a/include/video/newport.h b/include/video/newport.h index bcbb3d1b6bf9..108bc554c4b8 100644 --- a/include/video/newport.h +++ b/include/video/newport.h @@ -426,7 +426,7 @@ static inline unsigned short newport_vc2_get(struct newport_regs *regs, #define NCMAP_REGADDR_RREG 0x00000060 #define NCMAP_PROTOCOL (0x00008000 | 0x00040000 | 0x00800000) -static __inline__ void newport_cmap_setaddr(struct newport_regs *regs, +static inline void newport_cmap_setaddr(struct newport_regs *regs, unsigned short addr) { regs->set.dcbmode = (NPORT_DMODE_ACMALL | NCMAP_PROTOCOL | @@ -437,7 +437,7 @@ static __inline__ void newport_cmap_setaddr(struct newport_regs *regs, NCMAP_REGADDR_PBUF | NPORT_DMODE_W3); } -static __inline__ void newport_cmap_setrgb(struct newport_regs *regs, +static inline void newport_cmap_setrgb(struct newport_regs *regs, unsigned char red, unsigned char green, unsigned char blue) @@ -450,7 +450,7 @@ static __inline__ void newport_cmap_setrgb(struct newport_regs *regs, /* Miscellaneous NEWPORT routines. */ #define BUSY_TIMEOUT 100000 -static __inline__ int newport_wait(struct newport_regs *regs) +static inline int newport_wait(struct newport_regs *regs) { int t = BUSY_TIMEOUT; @@ -460,7 +460,7 @@ static __inline__ int newport_wait(struct newport_regs *regs) return !t; } -static __inline__ int newport_bfwait(struct newport_regs *regs) +static inline int newport_bfwait(struct newport_regs *regs) { int t = BUSY_TIMEOUT; @@ -547,7 +547,7 @@ static __inline__ int newport_bfwait(struct newport_regs *regs) #define WAYSLOW_DCB_XMAP9_PROTOCOL DCB_CYCLES (12, 12, 0) #define R_DCB_XMAP9_PROTOCOL DCB_CYCLES (2, 1, 3) -static __inline__ void +static inline void xmap9FIFOWait (struct newport_regs *rex) { rex->set.dcbmode = DCB_XMAP0 | XM9_CRS_FIFO_AVAIL | @@ -558,7 +558,7 @@ xmap9FIFOWait (struct newport_regs *rex) ; } -static __inline__ void +static inline void xmap9SetModeReg (struct newport_regs *rex, unsigned int modereg, unsigned int data24, int cfreq) { if (cfreq > 119) diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c index 550c6ca007cc..3fc33d0aaf78 100644 --- a/net/appletalk/atalk_proc.c +++ b/net/appletalk/atalk_proc.c @@ -14,7 +14,7 @@ #include <linux/export.h> -static __inline__ struct atalk_iface *atalk_get_interface_idx(loff_t pos) +static inline struct atalk_iface *atalk_get_interface_idx(loff_t pos) { struct atalk_iface *i; @@ -75,7 +75,7 @@ static int atalk_seq_interface_show(struct seq_file *seq, void *v) return 0; } -static __inline__ struct atalk_route *atalk_get_route_idx(loff_t pos) +static inline struct atalk_route *atalk_get_route_idx(loff_t pos) { struct atalk_route *r; diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index a8cb6b2e20c1..56c6cf30919e 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -1272,7 +1272,7 @@ static int atalk_getname(struct socket *sock, struct sockaddr *uaddr, } #if IS_ENABLED(CONFIG_IPDDP) -static __inline__ int is_ip_over_ddp(struct sk_buff *skb) +static inline int is_ip_over_ddp(struct sk_buff *skb) { return skb->data[12] == 22; } diff --git a/net/core/neighbour.c b/net/core/neighbour.c index f79e61c570ea..80ce922fc065 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -967,7 +967,7 @@ static void neigh_periodic_work(struct work_struct *work) write_unlock_bh(&tbl->lock); } -static __inline__ int neigh_max_probes(struct neighbour *n) +static inline int neigh_max_probes(struct neighbour *n) { struct neigh_parms *p = n->parms; return NEIGH_VAR(p, UCAST_PROBES) + NEIGH_VAR(p, APP_PROBES) + diff --git a/net/core/scm.c b/net/core/scm.c index 31a38239c92f..5c926550177d 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -42,7 +42,7 @@ * setu(g)id. */ -static __inline__ int scm_check_creds(struct ucred *creds) +static inline int scm_check_creds(struct ucred *creds) { const struct cred *cred = current_cred(); kuid_t uid = make_kuid(cred->user_ns, creds->uid); diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c index e4161e0c86aa..25b82903387a 100644 --- a/net/decnet/dn_nsp_in.c +++ b/net/decnet/dn_nsp_in.c @@ -575,7 +575,7 @@ static void dn_nsp_linkservice(struct sock *sk, struct sk_buff *skb) * bh_lock_sock() (its already held when this is called) which * also allows data and other data to be queued to a socket. */ -static __inline__ int dn_queue_skb(struct sock *sk, struct sk_buff *skb, int sig, struct sk_buff_head *queue) +static inline int dn_queue_skb(struct sock *sk, struct sk_buff *skb, int sig, struct sk_buff_head *queue) { int err; diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c index 00f2ed721ec1..ac909dbfb12d 100644 --- a/net/decnet/dn_nsp_out.c +++ b/net/decnet/dn_nsp_out.c @@ -521,7 +521,7 @@ void dn_send_conn_conf(struct sock *sk, gfp_t gfp) } -static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg, +static inline void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg, unsigned short reason, gfp_t gfp, struct dst_entry *dst, int ddl, unsigned char *dd, __le16 rem, __le16 loc) diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index aea918135ec3..ea2168c2639a 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c @@ -166,7 +166,7 @@ static void dn_dst_ifdown(struct dst_entry *dst, struct net_device *dev, int how } } -static __inline__ unsigned int dn_hash(__le16 src, __le16 dst) +static inline unsigned int dn_hash(__le16 src, __le16 dst) { __u16 tmp = (__u16 __force)(src ^ dst); tmp ^= (tmp >> 3); diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c index 33fefb0aebca..cce0e4f3535c 100644 --- a/net/decnet/dn_table.c +++ b/net/decnet/dn_table.c @@ -406,7 +406,7 @@ static void dn_rtmsg_fib(int event, struct dn_fib_node *f, int z, u32 tb_id, rtnl_set_sk_err(&init_net, RTNLGRP_DECnet_ROUTE, err); } -static __inline__ int dn_hash_dump_bucket(struct sk_buff *skb, +static inline int dn_hash_dump_bucket(struct sk_buff *skb, struct netlink_callback *cb, struct dn_fib_table *tb, struct dn_zone *dz, @@ -435,7 +435,7 @@ static __inline__ int dn_hash_dump_bucket(struct sk_buff *skb, return skb->len; } -static __inline__ int dn_hash_dump_zone(struct sk_buff *skb, +static inline int dn_hash_dump_zone(struct sk_buff *skb, struct netlink_callback *cb, struct dn_fib_table *tb, struct dn_zone *dz) diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index ef37e0574f54..e166243fb592 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -97,7 +97,7 @@ bool ipv6_mod_enabled(void) } EXPORT_SYMBOL_GPL(ipv6_mod_enabled); -static __inline__ struct ipv6_pinfo *inet6_sk_generic(struct sock *sk) +static inline struct ipv6_pinfo *inet6_sk_generic(struct sock *sk) { const int offset = sk->sk_prot->obj_size - sizeof(struct ipv6_pinfo); diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 62c997201970..d17f624ba640 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -109,7 +109,7 @@ static const struct inet6_protocol icmpv6_protocol = { }; /* Called with BH disabled */ -static __inline__ struct sock *icmpv6_xmit_lock(struct net *net) +static inline struct sock *icmpv6_xmit_lock(struct net *net) { struct sock *sk; @@ -124,7 +124,7 @@ static __inline__ struct sock *icmpv6_xmit_lock(struct net *net) return sk; } -static __inline__ void icmpv6_xmit_unlock(struct sock *sk) +static inline void icmpv6_xmit_unlock(struct sock *sk) { spin_unlock(&sk->sk_lock.slock); } diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 827fe7385078..49ee72152aba 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -589,7 +589,7 @@ static int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) return 0; } -static __inline__ int udpv6_err(struct sk_buff *skb, +static inline int udpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, u8 type, u8 code, int offset, __be32 info) { diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c index 3c03f6512c5f..8148858e3489 100644 --- a/net/lapb/lapb_iface.c +++ b/net/lapb/lapb_iface.c @@ -47,12 +47,12 @@ static void lapb_free_cb(struct lapb_cb *lapb) kfree(lapb); } -static __inline__ void lapb_hold(struct lapb_cb *lapb) +static inline void lapb_hold(struct lapb_cb *lapb) { refcount_inc(&lapb->refcnt); } -static __inline__ void lapb_put(struct lapb_cb *lapb) +static inline void lapb_put(struct lapb_cb *lapb) { if (refcount_dec_and_test(&lapb->refcnt)) lapb_free_cb(lapb); diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c index 82cb93f66b9b..6d467c8b1d70 100644 --- a/net/llc/llc_input.c +++ b/net/llc/llc_input.c @@ -72,7 +72,7 @@ void llc_set_station_handler(void (*handler)(struct sk_buff *skb)) * * This function returns which LLC component must handle this PDU. */ -static __inline__ int llc_pdu_type(struct sk_buff *skb) +static inline int llc_pdu_type(struct sk_buff *skb) { int type = LLC_DEST_CONN; /* I-PDU or S-PDU type */ struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb); diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index 441222c8e223..ec609a45cf8f 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c @@ -345,7 +345,7 @@ struct snd_amd7930 { static struct snd_amd7930 *amd7930_list; /* Idle the AMD7930 chip. The amd->lock is not held. */ -static __inline__ void amd7930_idle(struct snd_amd7930 *amd) +static inline void amd7930_idle(struct snd_amd7930 *amd) { unsigned long flags; @@ -356,7 +356,7 @@ static __inline__ void amd7930_idle(struct snd_amd7930 *amd) } /* Enable chip interrupts. The amd->lock is not held. */ -static __inline__ void amd7930_enable_ints(struct snd_amd7930 *amd) +static inline void amd7930_enable_ints(struct snd_amd7930 *amd) { unsigned long flags; @@ -367,7 +367,7 @@ static __inline__ void amd7930_enable_ints(struct snd_amd7930 *amd) } /* Disable chip interrupts. The amd->lock is not held. */ -static __inline__ void amd7930_disable_ints(struct snd_amd7930 *amd) +static inline void amd7930_disable_ints(struct snd_amd7930 *amd) { unsigned long flags; -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* Re: [RFC PATCH 1/5] treewide: replace __inline__ by inline 2019-08-29 8:32 ` [RFC PATCH 1/5] treewide: replace __inline__ by inline Rasmus Villemoes @ 2019-08-29 16:29 ` Joe Perches 0 siblings, 0 replies; 66+ messages in thread From: Joe Perches @ 2019-08-29 16:29 UTC (permalink / raw) To: Rasmus Villemoes, x86, linux-kernel Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, ndesaulniers On Thu, 2019-08-29 at 10:32 +0200, Rasmus Villemoes wrote: > Currently, compiler_types.h #defines __inline__ as inline. However, > that defeats the purpose of gcc providing __inline__ as an alternate > spelling of that keyword - namely, that it is always accessible under > that name, even if one chooses to #define inline, which we also do in > order to attach attribute(gnu_inline), and sometimes imply > attribute(always_inline), etc. > > Note that it is quite possible that some header file defines a static > inline function before the include chain has reached compiler_types.h, > but in that case both the existing __inline__ as well as the new > inline spelling refer to gcc's keyword, and the redefinitions in > compiler_types.h have no effect anyway. > > For those static inline definitions that appear after compiler_types.h > has been processed, this is obviously a no-op due to the #define > __inline__ inline. > > We will need to be able to use the __inline__ keyword to make use of > the "asm inline()" feature from gcc 9. This is preparation for > removing the #define. > > Generated by > > git grep --files-with-matches -w __inline__ | \ > grep -vE '^(usr|Documentation|scripts)/' | \ > grep -v /uapi/ | \ > xargs sed -i -e 's/static *__inline__/static inline/' bikeshed: Perhaps better to use xargs sed -i -e 's/\b__inline__\b/inline/g' As static and __inline__ do not have to be on the same line. for instance: (and I didn't look thoroughly) This misses one of the uses of __static__ in drivers/scsi/qla2xx/qla_os.c The patch has: > diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c [] > @@ -342,7 +342,7 @@ qla2x00_restart_timer(scsi_qla_host_t *vha, unsigned long interval) > mod_timer(&vha->timer, jiffies + interval * HZ); > } > > -static __inline__ void > +static inline void > qla2x00_stop_timer(scsi_qla_host_t *vha) > { > del_timer_sync(&vha->timer); But the code is: drivers/scsi/qla2xxx/qla_os.c-318-/* TODO Convert to inlines drivers/scsi/qla2xxx/qla_os.c-319- * drivers/scsi/qla2xxx/qla_os.c-320- * Timer routines drivers/scsi/qla2xxx/qla_os.c-321- */ drivers/scsi/qla2xxx/qla_os.c-322- drivers/scsi/qla2xxx/qla_os.c:323:__inline__ void drivers/scsi/qla2xxx/qla_os.c-324-qla2x00_start_timer(scsi_qla_host_t *vha, unsigned long interval) drivers/scsi/qla2xxx/qla_os.c-325-{ drivers/scsi/qla2xxx/qla_os.c-326- timer_setup(&vha->timer, qla2x00_timer, 0); drivers/scsi/qla2xxx/qla_os.c-327- vha->timer.expires = jiffies + interval * HZ; drivers/scsi/qla2xxx/qla_os.c-328- add_timer(&vha->timer); -- drivers/scsi/qla2xxx/qla_os.c-340- } drivers/scsi/qla2xxx/qla_os.c-341- drivers/scsi/qla2xxx/qla_os.c-342- mod_timer(&vha->timer, jiffies + interval * HZ); drivers/scsi/qla2xxx/qla_os.c-343-} drivers/scsi/qla2xxx/qla_os.c-344- drivers/scsi/qla2xxx/qla_os.c:345:static __inline__ void drivers/scsi/qla2xxx/qla_os.c-346-qla2x00_stop_timer(scsi_qla_host_t *vha) drivers/scsi/qla2xxx/qla_os.c-347-{ drivers/scsi/qla2xxx/qla_os.c-348- del_timer_sync(&vha->timer); drivers/scsi/qla2xxx/qla_os.c-349- vha->timer_active = 0; drivers/scsi/qla2xxx/qla_os.c-350-} The possible impacted files using 's/\b__inline__\b/inline/' $ git grep -w '__inline__' -- '*.[ch]' | grep -vP 'static\s+__inline__' (only hand selected matches) arch/alpha/include/asm/compiler.h:#undef __inline__ arch/alpha/include/asm/floppy.h:__inline__ void virtual_dma_init(void) arch/ia64/hp/common/sba_iommu.c:#define SBA_INLINE __inline__ drivers/parisc/sba_iommu.c:#define SBA_INLINE __inline__ drivers/scsi/qla2xxx/qla_os.c:__inline__ void drivers/video/fbdev/intelfb/intelfbdrv.c:__inline__ int intelfb_var_to_depth(const struct fb_var_screeninfo *var) ^ permalink raw reply [flat|nested] 66+ messages in thread
* [RFC PATCH 2/5] compiler_types.h: don't #define __inline__ 2019-08-29 8:32 [RFC PATCH 0/5] make use of gcc 9's "asm inline()" Rasmus Villemoes 2019-08-29 8:32 ` [RFC PATCH 1/5] treewide: replace __inline__ by inline Rasmus Villemoes @ 2019-08-29 8:32 ` Rasmus Villemoes 2019-08-29 8:32 ` [RFC PATCH 3/5] compiler-gcc.h: add asm_inline definition Rasmus Villemoes ` (5 subsequent siblings) 7 siblings, 0 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-08-29 8:32 UTC (permalink / raw) To: x86, linux-kernel Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, ndesaulniers, Rasmus Villemoes The spelling __inline__ should be reserved for uses where one really wants to refer to the inline keyword, regardless of whether or not the spelling "inline" has been #defined to something else. Most users of __inline__ have been converted to inline, for the remaining, this represents a small change of semantics. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- include/linux/compiler_types.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index 599c27b56c29..4a8b63e3a31d 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -150,7 +150,6 @@ struct ftrace_likely_data { __maybe_unused notrace #endif -#define __inline__ inline #define __inline inline /* -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* [RFC PATCH 3/5] compiler-gcc.h: add asm_inline definition 2019-08-29 8:32 [RFC PATCH 0/5] make use of gcc 9's "asm inline()" Rasmus Villemoes 2019-08-29 8:32 ` [RFC PATCH 1/5] treewide: replace __inline__ by inline Rasmus Villemoes 2019-08-29 8:32 ` [RFC PATCH 2/5] compiler_types.h: don't #define __inline__ Rasmus Villemoes @ 2019-08-29 8:32 ` Rasmus Villemoes 2019-08-29 8:32 ` [RFC PATCH 4/5] x86: alternative.h: use asm_inline for all alternative variants Rasmus Villemoes ` (4 subsequent siblings) 7 siblings, 0 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-08-29 8:32 UTC (permalink / raw) To: x86, linux-kernel Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, ndesaulniers, Rasmus Villemoes This adds an asm_inline macro which expands to "asm inline" when gcc is new enough (>= 9.1), and just asm for older gccs and other compilers. Using asm inline("foo") instead of asm("foo") overrules gcc's heuristic estimate of the size of the code represented by the asm() statement, and makes gcc use the minimum possible size instead. That can in turn affect gcc's inlining decisions. I wasn't sure whether to make this a function-like macro or not - this way, it can be combined with volatile as asm_inline volatile() but perhaps we'd prefer to spell that asm_inline_volatile() anyway. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- include/linux/compiler-gcc.h | 4 ++++ include/linux/compiler_types.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index d7ee4c6bad48..abd7abf7d06b 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -172,3 +172,7 @@ #endif #define __no_fgcse __attribute__((optimize("-fno-gcse"))) + +#if GCC_VERSION >= 90100 +#define asm_inline __asm__ __inline__ +#endif diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index 4a8b63e3a31d..3d354b166a94 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -188,6 +188,10 @@ struct ftrace_likely_data { #define asm_volatile_goto(x...) asm goto(x) #endif +#ifndef asm_inline +#define asm_inline __asm__ +#endif + #ifndef __no_fgcse # define __no_fgcse #endif -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* [RFC PATCH 4/5] x86: alternative.h: use asm_inline for all alternative variants 2019-08-29 8:32 [RFC PATCH 0/5] make use of gcc 9's "asm inline()" Rasmus Villemoes ` (2 preceding siblings ...) 2019-08-29 8:32 ` [RFC PATCH 3/5] compiler-gcc.h: add asm_inline definition Rasmus Villemoes @ 2019-08-29 8:32 ` Rasmus Villemoes 2019-08-29 8:32 ` [RFC PATCH 5/5] x86: bug.h: use asm_inline in _BUG_FLAGS definitions Rasmus Villemoes ` (3 subsequent siblings) 7 siblings, 0 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-08-29 8:32 UTC (permalink / raw) To: x86, linux-kernel Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, ndesaulniers, Rasmus Villemoes Most, if not all, uses of the alternative* family just provide one or two instructions in .text, but the string literal can be quite large, causing gcc to overestimate the size of the generated code. That in turn affects its decisions about inlining of the function containing the alternative() asm statement. gcc >= 9.1 allows one to overrule the estimated size by using "asm inline" instead of just "asm". So replace asm by the helper asm_inline, which for older gccs just expands to asm. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- arch/x86/include/asm/alternative.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index 094fbc9c0b1c..13adca37c99a 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -201,10 +201,10 @@ static inline int alternatives_text_reserved(void *start, void *end) * without volatile and memory clobber. */ #define alternative(oldinstr, newinstr, feature) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) : : : "memory") + asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, feature) : : : "memory") #define alternative_2(oldinstr, newinstr1, feature1, newinstr2, feature2) \ - asm volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2) ::: "memory") + asm_inline volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2) ::: "memory") /* * Alternative inline assembly with input. @@ -218,7 +218,7 @@ static inline int alternatives_text_reserved(void *start, void *end) * Leaving an unused argument 0 to keep API compatibility. */ #define alternative_input(oldinstr, newinstr, feature, input...) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ + asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ : : "i" (0), ## input) /* @@ -231,18 +231,18 @@ static inline int alternatives_text_reserved(void *start, void *end) */ #define alternative_input_2(oldinstr, newinstr1, feature1, newinstr2, \ feature2, input...) \ - asm volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ + asm_inline volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ newinstr2, feature2) \ : : "i" (0), ## input) /* Like alternative_input, but with a single output argument */ #define alternative_io(oldinstr, newinstr, feature, output, input...) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ + asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ : output : "i" (0), ## input) /* Like alternative_io, but for replacing a direct call with another one. */ #define alternative_call(oldfunc, newfunc, feature, output, input...) \ - asm volatile (ALTERNATIVE("call %P[old]", "call %P[new]", feature) \ + asm_inline volatile (ALTERNATIVE("call %P[old]", "call %P[new]", feature) \ : output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input) /* @@ -253,7 +253,7 @@ static inline int alternatives_text_reserved(void *start, void *end) */ #define alternative_call_2(oldfunc, newfunc1, feature1, newfunc2, feature2, \ output, input...) \ - asm volatile (ALTERNATIVE_2("call %P[old]", "call %P[new1]", feature1,\ + asm_inline volatile (ALTERNATIVE_2("call %P[old]", "call %P[new1]", feature1,\ "call %P[new2]", feature2) \ : output, ASM_CALL_CONSTRAINT \ : [old] "i" (oldfunc), [new1] "i" (newfunc1), \ -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* [RFC PATCH 5/5] x86: bug.h: use asm_inline in _BUG_FLAGS definitions 2019-08-29 8:32 [RFC PATCH 0/5] make use of gcc 9's "asm inline()" Rasmus Villemoes ` (3 preceding siblings ...) 2019-08-29 8:32 ` [RFC PATCH 4/5] x86: alternative.h: use asm_inline for all alternative variants Rasmus Villemoes @ 2019-08-29 8:32 ` Rasmus Villemoes 2019-08-29 16:05 ` [RFC PATCH 0/5] make use of gcc 9's "asm inline()" Linus Torvalds ` (2 subsequent siblings) 7 siblings, 0 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-08-29 8:32 UTC (permalink / raw) To: x86, linux-kernel Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, ndesaulniers, Rasmus Villemoes This helps preventing a BUG* or WARN* in some static inline from preventing that (or one of its callers) being inlined, so should allow gcc to make better informed inlining decisions. For example, with gcc 9.2, tcp_fastopen_no_cookie() vanishes from net/ipv4/tcp_fastopen.o. It does not itself have any BUG or WARN, but it calls dst_metric() which has a WARN_ON_ONCE - and despite that WARN_ON_ONCE vanishing since the condition is compile-time false, dst_metric() is apparently sufficiently "large" that when it gets inlined into tcp_fastopen_no_cookie(), the latter becomes too large for inlining. Overall, if one asks size(1), .text decreases a little and .data increases by about the same amount (x86-64 defconfig) $ size vmlinux.{before,after} text data bss dec hex filename 19709726 5202600 1630280 26542606 195020e vmlinux.before 19709330 5203068 1630280 26542678 1950256 vmlinux.after while bloat-o-meter says add/remove: 10/28 grow/shrink: 103/51 up/down: 3669/-2854 (815) ... Total: Before=14783683, After=14784498, chg +0.01% Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- arch/x86/include/asm/bug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index 6804d6642767..facba9bc30ca 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -32,7 +32,7 @@ #define _BUG_FLAGS(ins, flags) \ do { \ - asm volatile("1:\t" ins "\n" \ + asm_inline volatile("1:\t" ins "\n" \ ".pushsection __bug_table,\"aw\"\n" \ "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ "\t" __BUG_REL(%c0) "\t# bug_entry::file\n" \ @@ -49,7 +49,7 @@ do { \ #define _BUG_FLAGS(ins, flags) \ do { \ - asm volatile("1:\t" ins "\n" \ + asm_inline volatile("1:\t" ins "\n" \ ".pushsection __bug_table,\"aw\"\n" \ "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ "\t.word %c0" "\t# bug_entry::flags\n" \ -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* Re: [RFC PATCH 0/5] make use of gcc 9's "asm inline()" 2019-08-29 8:32 [RFC PATCH 0/5] make use of gcc 9's "asm inline()" Rasmus Villemoes ` (4 preceding siblings ...) 2019-08-29 8:32 ` [RFC PATCH 5/5] x86: bug.h: use asm_inline in _BUG_FLAGS definitions Rasmus Villemoes @ 2019-08-29 16:05 ` Linus Torvalds 2019-08-30 7:45 ` Rasmus Villemoes 2019-08-29 17:36 ` Nick Desaulniers 2019-08-30 23:15 ` [PATCH v2 0/6] " Rasmus Villemoes 7 siblings, 1 reply; 66+ messages in thread From: Linus Torvalds @ 2019-08-29 16:05 UTC (permalink / raw) To: Rasmus Villemoes Cc: the arch/x86 maintainers, Linux List Kernel Mailing, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Miguel Ojeda, Nick Desaulniers On Thu, Aug 29, 2019 at 1:32 AM Rasmus Villemoes <linux@rasmusvillemoes.dk> wrote: > > But since we #define the identifier inline to attach some attributes, > we have to use the alternate spelling __inline__ of that > keyword. Unfortunately, we also currently #define that one (to > inline), so we first have to get rid of all (mis)uses of > __inline__. Hence the huge diffstat. Ugh. Not pretty, but I guess we're stuck with it. However, it worries me a bit that you excluide the UAPI headers where we still use "__inline__", and now the semantics of that will change for the kernel (for some odd gcc versions). I suspect we should just bite the bullet and you should do it to the uapi headers too. We already use "inline" in a lot of them, so it's not the case that we're using __inline__ because of some namespace issue, as far as I can tell. One option might be to just use "__inline" for the asm_inline thing. We have way fewer of those. That would make the noise much less for this patch series. Linus ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [RFC PATCH 0/5] make use of gcc 9's "asm inline()" 2019-08-29 16:05 ` [RFC PATCH 0/5] make use of gcc 9's "asm inline()" Linus Torvalds @ 2019-08-30 7:45 ` Rasmus Villemoes 0 siblings, 0 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-08-30 7:45 UTC (permalink / raw) To: Linus Torvalds Cc: the arch/x86 maintainers, Linux List Kernel Mailing, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Miguel Ojeda, Nick Desaulniers, Masahiro Yamada On 29/08/2019 18.05, Linus Torvalds wrote: > On Thu, Aug 29, 2019 at 1:32 AM Rasmus Villemoes > <linux@rasmusvillemoes.dk> wrote: >> >> But since we #define the identifier inline to attach some attributes, >> we have to use the alternate spelling __inline__ of that >> keyword. Unfortunately, we also currently #define that one (to >> inline), so we first have to get rid of all (mis)uses of >> __inline__. Hence the huge diffstat. > > Ugh. Not pretty, but I guess we're stuck with it. > > However, it worries me a bit that you excluide the UAPI headers where > we still use "__inline__", and now the semantics of that will change > for the kernel (for some odd gcc versions). Yeah, as I wrote I was aware of that, but didn't have any good ideas, so I was fishing. Doing #ifdef __KERNEL__ #define __uapi_inline inline #else #define __uapi_inline __inline__ #endif was one of the bad ideas... > I suspect we should just bite the bullet and you should do it to the > uapi headers too. We already use "inline" in a lot of them, so it's > not the case that we're using __inline__ because of some namespace > issue, as far as I can tell. > > One option might be to just use "__inline" for the asm_inline thing. > We have way fewer of those. That would make the noise much less for > this patch series. Ah, interesting. I didn't know that was also a compiler provided alias. It seems to be entirely undocumented - https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html just mentions the __inline__ (and __asm__) spellings. But it's clear as day in the gcc sources { "__inline", RID_INLINE, 0 }, { "__inline__", RID_INLINE, 0 }, and has been that way since forever, AFAICT. So yes, let's just start by getting rid of the __inline define and fix the staging (+acpi,zstd) users, to allow asm_inline to progress. I'll respin. Rasmus ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [RFC PATCH 0/5] make use of gcc 9's "asm inline()" 2019-08-29 8:32 [RFC PATCH 0/5] make use of gcc 9's "asm inline()" Rasmus Villemoes ` (5 preceding siblings ...) 2019-08-29 16:05 ` [RFC PATCH 0/5] make use of gcc 9's "asm inline()" Linus Torvalds @ 2019-08-29 17:36 ` Nick Desaulniers 2019-08-29 18:15 ` Linus Torvalds 2019-08-29 19:41 ` Masahiro Yamada 2019-08-30 23:15 ` [PATCH v2 0/6] " Rasmus Villemoes 7 siblings, 2 replies; 66+ messages in thread From: Nick Desaulniers @ 2019-08-29 17:36 UTC (permalink / raw) To: Rasmus Villemoes Cc: maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, Masahiro Yamada, clang-built-linux, Joe Perches + Masahiro, who sent patches earlier this week also looking to clean up our redefinition of `inline` more. https://lkml.org/lkml/2019/8/28/44 On Thu, Aug 29, 2019 at 1:32 AM Rasmus Villemoes <linux@rasmusvillemoes.dk> wrote: > > gcc 9 provides a way to override the otherwise crude heuristic that > gcc uses to estimate the size of the code represented by an asm() > statement. From the gcc docs > > If you use 'asm inline' instead of just 'asm', then for inlining > purposes the size of the asm is taken as the minimum size, ignoring > how many instructions GCC thinks it is. Hi Rasmus, Thanks for the RFC and including me in the discussion. Can you link me to the release notes this came from, and the bug related to this features development? I'm curious what "the size of the asm" means, and how it differs precisely from "how many instructions GCC thinks it is." I would think those are one and the same? Or maybe "the size of the asm" means the size in bytes when assembled to machine code, as opposed to the count of assembly instructions? It looks like LLVM estimates based on instruction count, not assembled byte size: https://github.com/llvm/llvm-project/blob/6289ee941d6f8fc222225fb6845efce477bf5094/llvm/lib/CodeGen/TargetInstrInfo.cpp#L75-L125 (That's an arch independent version, that only has an override for hexagon) I'd imagine it would be possible to implement a machine-code-size based estimate. That one snippet alludes to a problem with the existing `asm` GNU C extension. (I personally have fixed bugs in LLVM where forgetting to measure the estimated size of inline assembly leads to instruction selection that can't represent the appropriate jump ranges. Knowing the size of inline assembly is important for the inliner's cost model, and AIUI gets difficult for some of the assembler directives) If the internal heuristic had an issue, I'm curious to know more about the design decision that led to the introduction of a new GNU C extension rather than adjustments to the existing heuristic or cost model, and I assume the bug would have more info? (Maybe giving developers choice between two different cost models? Did actual code break changing the existing `asm` cost model? Feels like a choice between an imprecise and a precise cost model, but at this point I'm speculating too far ahead.) In particular the reuse of the keyword `inline` in the new GNU C extension is problematic for our code, as your patchset clearly illustrates. I understand that adding new keywords to a language is impossibly difficult (how many different meanings does `static` have now, in different contexts) and thus the reuse of them in differing parse contexts is common (reuse of `auto` in C++11 comes to mind, though it's not a differing parse context). I think if the GCC developers were aware that we redefine the `inline` keyword via C preprocessor, they may have chosen a different design. But as you illustrate, the changes we'd have to make to the kernel are not insurmountable. Tangent: There are many GNU C extensions I love and I hope ISO will adopt. I've been talking with Hans Boehm about joining up ISO WG14 specifically to help standardize them. But then again, I don't like standards that I can't download (the ratified version, not a draft version). I also think it's better for implementers to have more say over standards, and the W3C/WHATWG split is a very very interesting case study in this regard. That said, I wish more LLVM folks were included in the design discussion of GNU C extensions; as trying to reimplement new language features can flush out edge cases that allow us to nail down behavior in the spec (let alone have a spec) ASAP. The only way I find out about new GNU C extensions is when someone in the kernel goes to use them, and Clang doesn't support it, then the build is broken until we support them. :( > > For compatibility with older compilers, we obviously want a > > #if new enough > #define asm_inline asm inline > #else > #define asm_inline asm > #endif Requesting a feature test macro to the GCC developers would be great; then we could use feature detection in one place rather than brittle version checks in multiple places. Imagine the C preprocessor would define something like HAS_GNU_ASM_INLINE, then writing a guard would be simple, and other compilers could define the same preprocessor token when they add support. GCC already does this for a recent extension to inline asm for x86 (I forget the feature name, something to do with hinting at the flags or output IIRC, Redhat had a blog post and we recently implemented support). > > But since we #define the identifier inline to attach some attributes, > we have to use the alternate spelling __inline__ of that > keyword. Unfortunately, we also currently #define that one (to > inline), so we first have to get rid of all (mis)uses of > __inline__. Hence the huge diffstat. I think patch 1 should be > regenerated and applied just before -rc1. > > There are a few remaining users of __inline__, in particular in uapi > headers, which I'm not sure what to do about (kernel-side users of > those will get slightly different semantics since we no longer > automatically attach the __attribute__((__gnu_inline__)) etc.). So RFC. No thoughts on uapi, but I think we should break this work logically into two: 1. remove our redefinition of inline 2. implement asm_inline for GCC I think what you have for 2 so far is ok, but I need to spend more time thinking about it. For 1: Our redefinition of inline currently looks like: 146 #define inline inline __attribute__((__always_inline__)) __gnu_inline \ 147 __maybe_unused notrace So we have: 1. always_inline attribute 2. gnu_inline attribute 3. maybe_unused 4. notrace I'm not convinced that always_inline works as intended. An inliner can still refuse to inline something if it doesn't have the machinery to perform all of the transformations required for inlining or it's not safe to do so. The C preprocessor is the one true always inline (and type safety be damned). It would be interesting to study the effects of removing that attribute. Android's Java runtime, ART uses this everywhere for all functions, and it's not clear that adding attribute always_inline everywhere is an "optimization." Research folks at Google are playing with finding better inlining heuristics via machine learning, which is quite exciting. I introduced gnu_inline; it's like the one semantically different thing from C89 to C99 IIRC. I introduced it because a few places in the kernel were redefining KBUILD_CFLAGS, dropping `-std=gnu89`. It seems now that there's only a few places left that do that, and they're all under arch/x86/ (see: https://github.com/ClangBuiltLinux/linux/issues/618#issuecomment-525712390). Note that it's a little tricky to undo this; someone just reported yesterday that I broke kexec, and we're working on cleaning that up, but I think doing that then adding a check to not redefine KBUILD_CFLAGS (cc Joe) to scripts/checkpatch.pl would doable. If we fixed that, than we could use `-fgnu_inline` (or w/e the spelling is) command line flag instead of the compiler attribute. Masahiro is playing around with the maybe_unused part. Seems to be a difference in GCC and Clang warning on unused static inline functions. I think this can be solved with correct usage of #ifdef guards for the appropriate CONFIG_'s, rather than __maybe_unused. notrace's definition is pretty complicated, I have no idea what any of those attributes do... But maybe all of that is moot, if we just use __inline__. Looking more at your patchset after typing this all out, seems like that will work. > > The two x86 changes cause smaller code gen differences than I'd > expect, but I think we do want the asm_inline thing available sooner > or later, so this is just to get the ball rolling. Is it a net win for all arch's? Or just x86? `differences` being an improvement or a regression? > > Rasmus Villemoes (5): > treewide: replace __inline__ by inline > compiler_types.h: don't #define __inline__ > compiler-gcc.h: add asm_inline definition > x86: alternative.h: use asm_inline for all alternative variants > x86: bug.h: use asm_inline in _BUG_FLAGS definitions > > arch/alpha/include/asm/atomic.h | 12 +++--- > arch/alpha/include/asm/bitops.h | 6 +-- > arch/alpha/include/asm/dma.h | 22 +++++----- > arch/alpha/include/asm/floppy.h | 2 +- > arch/alpha/include/asm/irq.h | 2 +- > arch/alpha/include/asm/local.h | 4 +- > arch/alpha/include/asm/smp.h | 2 +- > .../arm/mach-iop32x/include/mach/uncompress.h | 2 +- > .../arm/mach-iop33x/include/mach/uncompress.h | 2 +- > .../arm/mach-ixp4xx/include/mach/uncompress.h | 2 +- > arch/ia64/hp/common/sba_iommu.c | 2 +- > arch/ia64/hp/sim/simeth.c | 2 +- > arch/ia64/include/asm/atomic.h | 8 ++-- > arch/ia64/include/asm/bitops.h | 34 ++++++++-------- > arch/ia64/include/asm/delay.h | 14 +++---- > arch/ia64/include/asm/irq.h | 2 +- > arch/ia64/include/asm/page.h | 2 +- > arch/ia64/include/asm/sn/leds.h | 2 +- > arch/ia64/include/asm/uaccess.h | 4 +- > arch/ia64/oprofile/backtrace.c | 4 +- > arch/m68k/include/asm/blinken.h | 2 +- > arch/m68k/include/asm/checksum.h | 2 +- > arch/m68k/include/asm/dma.h | 32 +++++++-------- > arch/m68k/include/asm/floppy.h | 8 ++-- > arch/m68k/include/asm/nettel.h | 8 ++-- > arch/m68k/mac/iop.c | 14 +++---- > arch/mips/include/asm/atomic.h | 16 ++++---- > arch/mips/include/asm/checksum.h | 2 +- > arch/mips/include/asm/dma.h | 20 +++++----- > arch/mips/include/asm/jazz.h | 2 +- > arch/mips/include/asm/local.h | 4 +- > arch/mips/include/asm/string.h | 8 ++-- > arch/mips/kernel/binfmt_elfn32.c | 2 +- > arch/nds32/include/asm/swab.h | 4 +- > arch/parisc/include/asm/atomic.h | 20 +++++----- > arch/parisc/include/asm/bitops.h | 18 ++++----- > arch/parisc/include/asm/checksum.h | 4 +- > arch/parisc/include/asm/compat.h | 2 +- > arch/parisc/include/asm/delay.h | 2 +- > arch/parisc/include/asm/dma.h | 20 +++++----- > arch/parisc/include/asm/ide.h | 8 ++-- > arch/parisc/include/asm/irq.h | 2 +- > arch/parisc/include/asm/spinlock.h | 12 +++--- > arch/powerpc/include/asm/atomic.h | 40 +++++++++---------- > arch/powerpc/include/asm/bitops.h | 28 ++++++------- > arch/powerpc/include/asm/dma.h | 20 +++++----- > arch/powerpc/include/asm/edac.h | 2 +- > arch/powerpc/include/asm/irq.h | 2 +- > arch/powerpc/include/asm/local.h | 14 +++---- > arch/sh/include/asm/pgtable_64.h | 2 +- > arch/sh/include/asm/processor_32.h | 4 +- > arch/sh/include/cpu-sh3/cpu/dac.h | 6 +-- > arch/x86/include/asm/alternative.h | 14 +++---- > arch/x86/include/asm/bug.h | 4 +- > arch/x86/um/asm/checksum.h | 4 +- > arch/x86/um/asm/checksum_32.h | 4 +- > arch/xtensa/include/asm/checksum.h | 14 +++---- > arch/xtensa/include/asm/cmpxchg.h | 4 +- > arch/xtensa/include/asm/irq.h | 2 +- > block/partitions/amiga.c | 2 +- > drivers/atm/he.c | 6 +-- > drivers/atm/idt77252.c | 6 +-- > drivers/gpu/drm/mga/mga_drv.h | 2 +- > drivers/gpu/drm/mga/mga_state.c | 14 +++---- > drivers/gpu/drm/r128/r128_drv.h | 2 +- > drivers/gpu/drm/r128/r128_state.c | 14 +++---- > drivers/gpu/drm/via/via_irq.c | 2 +- > drivers/gpu/drm/via/via_verifier.c | 30 +++++++------- > drivers/media/pci/ivtv/ivtv-ioctl.c | 2 +- > drivers/net/ethernet/sun/sungem.c | 8 ++-- > drivers/net/ethernet/sun/sunhme.c | 6 +-- > drivers/net/hamradio/baycom_ser_fdx.c | 2 +- > drivers/net/wan/lapbether.c | 2 +- > drivers/net/wan/n2.c | 4 +- > drivers/parisc/led.c | 4 +- > drivers/parisc/sba_iommu.c | 2 +- > drivers/parport/parport_gsc.h | 4 +- > drivers/scsi/lpfc/lpfc_scsi.c | 2 +- > drivers/scsi/pcmcia/sym53c500_cs.c | 4 +- > drivers/scsi/qla2xxx/qla_inline.h | 2 +- > drivers/scsi/qla2xxx/qla_os.c | 2 +- > drivers/tty/amiserial.c | 2 +- > drivers/tty/serial/ip22zilog.c | 2 +- > drivers/tty/serial/sunsab.c | 4 +- > drivers/tty/serial/sunzilog.c | 2 +- > drivers/video/fbdev/core/fbcon.c | 20 +++++----- > drivers/video/fbdev/ffb.c | 2 +- > drivers/video/fbdev/intelfb/intelfbdrv.c | 8 ++-- > drivers/video/fbdev/intelfb/intelfbhw.c | 2 +- > drivers/w1/masters/matrox_w1.c | 4 +- > fs/coda/coda_linux.h | 6 +-- > fs/freevxfs/vxfs_inode.c | 2 +- > fs/nfsd/nfsfh.h | 4 +- > include/acpi/platform/acgcc.h | 2 +- > include/asm-generic/ide_iops.h | 8 ++-- > include/linux/atalk.h | 4 +- > include/linux/compiler-gcc.h | 4 ++ > include/linux/compiler_types.h | 5 ++- > include/linux/hdlc.h | 4 +- > include/linux/inetdevice.h | 6 +-- > include/linux/parport.h | 4 +- > include/linux/parport_pc.h | 22 +++++----- > include/net/ax25.h | 2 +- > include/net/checksum.h | 2 +- > include/net/dn_nsp.h | 16 ++++---- > include/net/ip.h | 2 +- > include/net/ip6_checksum.h | 2 +- > include/net/ipx.h | 10 ++--- > include/net/llc_c_ev.h | 4 +- > include/net/llc_conn.h | 4 +- > include/net/llc_s_ev.h | 2 +- > include/net/netrom.h | 8 ++-- > include/net/scm.h | 14 +++---- > include/net/udplite.h | 2 +- > include/net/x25.h | 8 ++-- > include/net/xfrm.h | 18 ++++----- > include/video/newport.h | 12 +++--- > net/appletalk/atalk_proc.c | 4 +- > net/appletalk/ddp.c | 2 +- > net/core/neighbour.c | 2 +- > net/core/scm.c | 2 +- > net/decnet/dn_nsp_in.c | 2 +- > net/decnet/dn_nsp_out.c | 2 +- > net/decnet/dn_route.c | 2 +- > net/decnet/dn_table.c | 4 +- > net/ipv6/af_inet6.c | 2 +- > net/ipv6/icmp.c | 4 +- > net/ipv6/udp.c | 2 +- > net/lapb/lapb_iface.c | 4 +- > net/llc/llc_input.c | 2 +- > sound/sparc/amd7930.c | 6 +-- > 131 files changed, 449 insertions(+), 442 deletions(-) > > -- > 2.20.1 > -- Thanks, ~Nick Desaulniers ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [RFC PATCH 0/5] make use of gcc 9's "asm inline()" 2019-08-29 17:36 ` Nick Desaulniers @ 2019-08-29 18:15 ` Linus Torvalds 2019-08-29 18:26 ` Nadav Amit 2019-08-29 18:42 ` Borislav Petkov 2019-08-29 19:41 ` Masahiro Yamada 1 sibling, 2 replies; 66+ messages in thread From: Linus Torvalds @ 2019-08-29 18:15 UTC (permalink / raw) To: Nick Desaulniers Cc: Rasmus Villemoes, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Miguel Ojeda, Masahiro Yamada, clang-built-linux, Joe Perches On Thu, Aug 29, 2019 at 10:36 AM Nick Desaulniers <ndesaulniers@google.com> wrote: > > I'm curious what "the size of the asm" means, and how it differs > precisely from "how many instructions GCC thinks it is." I would > think those are one and the same? Or maybe "the size of the asm" > means the size in bytes when assembled to machine code, as opposed to > the count of assembly instructions? The problem is that we do different sections in the inline asm, and the instruction counts are completely bogus as a result. The actual instruction in the code stream may be just a single instruction. But the out-of-line sections can be multiple instructions and/or a data section that contains exception information. So we want the asm inlined, because the _inline_ part (and the hot instruction) is small, even though the asm technically maybe generates many more bytes of additional data. The worst offenders for this tend to be - various exception tables for user accesses etc - "alternatives" where we list two or more different asm alternatives and then pick the right one at boot time depending on CPU ID flags - "BUG_ON()" instructions where there's a "ud2" instruction and various data annotations going with it so gcc may be "technically correct" that the inline asm statement contains ten instructions or more, but the actual instruction _code_ footprint in the asm is likely just a single instruction or two. The statement counting is also completely off by the fact that some of the "statements" are assembler directives (ie the ".pushsection"/".popsection" lines etc). So some of it is that the instruction counting is off, but the largest part is that it's just not relevant to the code footprint in that function. Un-inlining a function because it contains a single inline asm instruction is not productive. Yes, it might result in a smaller binary over-all (because all those other non-code sections do take up some space), but it actually results in a bigger code footprint. Linus ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [RFC PATCH 0/5] make use of gcc 9's "asm inline()" 2019-08-29 18:15 ` Linus Torvalds @ 2019-08-29 18:26 ` Nadav Amit 2019-08-29 18:42 ` Borislav Petkov 1 sibling, 0 replies; 66+ messages in thread From: Nadav Amit @ 2019-08-29 18:26 UTC (permalink / raw) To: Nick Desaulniers Cc: Rasmus Villemoes, Linus Torvalds, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Miguel Ojeda, Masahiro Yamada, clang-built-linux, Joe Perches > On Aug 29, 2019, at 11:15 AM, Linus Torvalds <torvalds@linux-foundation.org> wrote: > > On Thu, Aug 29, 2019 at 10:36 AM Nick Desaulniers > <ndesaulniers@google.com> wrote: >> I'm curious what "the size of the asm" means, and how it differs >> precisely from "how many instructions GCC thinks it is." I would >> think those are one and the same? Or maybe "the size of the asm" >> means the size in bytes when assembled to machine code, as opposed to >> the count of assembly instructions? > > The problem is that we do different sections in the inline asm, and > the instruction counts are completely bogus as a result. > > The actual instruction in the code stream may be just a single > instruction. But the out-of-line sections can be multiple instructions > and/or a data section that contains exception information. > > So we want the asm inlined, because the _inline_ part (and the hot > instruction) is small, even though the asm technically maybe generates > many more bytes of additional data. > > The worst offenders for this tend to be > > - various exception tables for user accesses etc > > - "alternatives" where we list two or more different asm alternatives > and then pick the right one at boot time depending on CPU ID flags > > - "BUG_ON()" instructions where there's a "ud2" instruction and > various data annotations going with it > > so gcc may be "technically correct" that the inline asm statement > contains ten instructions or more, but the actual instruction _code_ > footprint in the asm is likely just a single instruction or two. > > The statement counting is also completely off by the fact that some of > the "statements" are assembler directives (ie the > ".pushsection"/".popsection" lines etc). So some of it is that the > instruction counting is off, but the largest part is that it's just > not relevant to the code footprint in that function. > > Un-inlining a function because it contains a single inline asm > instruction is not productive. Yes, it might result in a smaller > binary over-all (because all those other non-code sections do take up > some space), but it actually results in a bigger code footprint. For the record, here is my failing attempt to address the issue without GCC support: https://lore.kernel.org/lkml/20181003213100.189959-9-namit@vmware.com/T/ ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [RFC PATCH 0/5] make use of gcc 9's "asm inline()" 2019-08-29 18:15 ` Linus Torvalds 2019-08-29 18:26 ` Nadav Amit @ 2019-08-29 18:42 ` Borislav Petkov 1 sibling, 0 replies; 66+ messages in thread From: Borislav Petkov @ 2019-08-29 18:42 UTC (permalink / raw) To: Linus Torvalds Cc: Nick Desaulniers, Rasmus Villemoes, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Miguel Ojeda, Masahiro Yamada, clang-built-linux, Joe Perches On Thu, Aug 29, 2019 at 11:15:04AM -0700, Linus Torvalds wrote: > Un-inlining a function because it contains a single inline asm > instruction is not productive. Yes, it might result in a smaller > binary over-all (because all those other non-code sections do take up > some space), but it actually results in a bigger code footprint. ... and also, like one of the gcc guys said at the time, we should be careful when using this asm inlining, because, well, if we inline it everywhere just like always_inline functions and the code footprint grows considerably, then we get what we deserve. So the onus is on us to keep such sequences small. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [RFC PATCH 0/5] make use of gcc 9's "asm inline()" 2019-08-29 17:36 ` Nick Desaulniers 2019-08-29 18:15 ` Linus Torvalds @ 2019-08-29 19:41 ` Masahiro Yamada 1 sibling, 0 replies; 66+ messages in thread From: Masahiro Yamada @ 2019-08-29 19:41 UTC (permalink / raw) To: Nick Desaulniers Cc: Rasmus Villemoes, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, clang-built-linux, Joe Perches On Fri, Aug 30, 2019 at 2:36 AM Nick Desaulniers <ndesaulniers@google.com> wrote: > > + Masahiro, who sent patches earlier this week also looking to clean > up our redefinition of `inline` more. > https://lkml.org/lkml/2019/8/28/44 I think you noticed what I was trying to do. Yes, my work for cleaning 'inline' was initially motivated by the 'asm inline' of GCC 9. The ultimate goal is to stop macrofying 'inline', but I am not sure whether or not it is achievable. > On Thu, Aug 29, 2019 at 1:32 AM Rasmus Villemoes > <linux@rasmusvillemoes.dk> wrote: > > > > gcc 9 provides a way to override the otherwise crude heuristic that > > gcc uses to estimate the size of the code represented by an asm() > > statement. From the gcc docs > > > > If you use 'asm inline' instead of just 'asm', then for inlining > > purposes the size of the asm is taken as the minimum size, ignoring > > how many instructions GCC thinks it is. > > Hi Rasmus, > Thanks for the RFC and including me in the discussion. Can you link > me to the release notes this came from, and the bug related to this > features development? Just in care you are interested, this started from this thread: https://lkml.org/lkml/2018/10/7/92 > I'm curious what "the size of the asm" means, and how it differs > precisely from "how many instructions GCC thinks it is." I would > think those are one and the same? Or maybe "the size of the asm" > means the size in bytes when assembled to machine code, as opposed to > the count of assembly instructions? > > It looks like LLVM estimates based on instruction count, not assembled > byte size: > https://github.com/llvm/llvm-project/blob/6289ee941d6f8fc222225fb6845efce477bf5094/llvm/lib/CodeGen/TargetInstrInfo.cpp#L75-L125 > (That's an arch independent version, that only has an override for hexagon) > I'd imagine it would be possible to implement a machine-code-size > based estimate. > > That one snippet alludes to a problem with the existing `asm` GNU C > extension. (I personally have fixed bugs in LLVM where forgetting to > measure the estimated size of inline assembly leads to instruction > selection that can't represent the appropriate jump ranges. Knowing > the size of inline assembly is important for the inliner's cost model, > and AIUI gets difficult for some of the assembler directives) If the > internal heuristic had an issue, I'm curious to know more about the > design decision that led to the introduction of a new GNU C extension > rather than adjustments to the existing heuristic or cost model, and I > assume the bug would have more info? (Maybe giving developers choice > between two different cost models? Did actual code break changing the > existing `asm` cost model? Feels like a choice between an imprecise > and a precise cost model, but at this point I'm speculating too far > ahead.) > > In particular the reuse of the keyword `inline` in the new GNU C > extension is problematic for our code, as your patchset clearly > illustrates. I understand that adding new keywords to a language is > impossibly difficult (how many different meanings does `static` have > now, in different contexts) and thus the reuse of them in differing > parse contexts is common (reuse of `auto` in C++11 comes to mind, > though it's not a differing parse context). I think if the GCC > developers were aware that we redefine the `inline` keyword via C > preprocessor, they may have chosen a different design. But as you > illustrate, the changes we'd have to make to the kernel are not > insurmountable. > > Tangent: > There are many GNU C extensions I love and I hope ISO will adopt. > I've been talking with Hans Boehm about joining up ISO WG14 > specifically to help standardize them. But then again, I don't like > standards that I can't download (the ratified version, not a draft > version). I also think it's better for implementers to have more say > over standards, and the W3C/WHATWG split is a very very interesting > case study in this regard. That said, I wish more LLVM folks were > included in the design discussion of GNU C extensions; as trying to > reimplement new language features can flush out edge cases that allow > us to nail down behavior in the spec (let alone have a spec) ASAP. > The only way I find out about new GNU C extensions is when someone in > the kernel goes to use them, and Clang doesn't support it, then the > build is broken until we support them. :( > > > > > For compatibility with older compilers, we obviously want a > > > > #if new enough > > #define asm_inline asm inline > > #else > > #define asm_inline asm > > #endif > > Requesting a feature test macro to the GCC developers would be great; > then we could use feature detection in one place rather than brittle > version checks in multiple places. Imagine the C preprocessor would > define something like HAS_GNU_ASM_INLINE, then writing a guard would > be simple, and other compilers could define the same preprocessor > token when they add support. GCC already does this for a recent > extension to inline asm for x86 (I forget the feature name, something > to do with hinting at the flags or output IIRC, Redhat had a blog post > and we recently implemented support). If interested, my prototype-patch is here: https://lkml.org/lkml/2018/12/13/212 I implemented the feature test in Kconfig. config CC_HAS_ASM_INLINE def_bool $(success,echo 'void foo(void) { asm inline (""); }' | $(CC) -x c - -c -o /dev/null) I am also fine with checking it by version since we know GCC 9 started supporting it. > > > > But since we #define the identifier inline to attach some attributes, > > we have to use the alternate spelling __inline__ of that > > keyword. Unfortunately, we also currently #define that one (to > > inline), so we first have to get rid of all (mis)uses of > > __inline__. Hence the huge diffstat. I think patch 1 should be > > regenerated and applied just before -rc1. > > > > There are a few remaining users of __inline__, in particular in uapi > > headers, which I'm not sure what to do about (kernel-side users of > > those will get slightly different semantics since we no longer > > automatically attach the __attribute__((__gnu_inline__)) etc.). So RFC. The exported headers must use '__inline__' instead of 'inline': This is now compile-tested. https://github.com/torvalds/linux/blob/v5.3-rc6/usr/include/Makefile#L5 At this moment, 'inline' is replaced with '__inline__' with sed: https://github.com/torvalds/linux/blob/v5.3-rc6/scripts/headers_install.sh#L37 But, I'd like to reduce the sed patterns in the future. I think using '__inline' for asm_inlie will be OK. > No thoughts on uapi, but I think we should break this work logically into two: > 1. remove our redefinition of inline > 2. implement asm_inline for GCC > > I think what you have for 2 so far is ok, but I need to spend more > time thinking about it. > > For 1: > Our redefinition of inline currently looks like: > > 146 #define inline inline __attribute__((__always_inline__)) > __gnu_inline \ > 147 __maybe_unused notrace > > So we have: > 1. always_inline attribute > 2. gnu_inline attribute > 3. maybe_unused > 4. notrace > > I'm not convinced that always_inline works as intended. An inliner > can still refuse to inline something if it doesn't have the machinery > to perform all of the transformations required for inlining or it's > not safe to do so. The C preprocessor is the one true always inline > (and type safety be damned). It would be interesting to study the > effects of removing that attribute. Android's Java runtime, ART uses > this everywhere for all functions, and it's not clear that adding > attribute always_inline everywhere is an "optimization." Research > folks at Google are playing with finding better inlining heuristics > via machine learning, which is quite exciting. I want to get rid of always_inline. My commit 9012d011660ea5cf2a623e1de207a2bc0ca6936d is the first step towards the goal. All architectures support CONFIG_OPTIMIZE_INLINING, and it is stable up to now, I think. Next, set CONFIG_OPTIMIZE_INLINING=y forcibly, and lastly, remove CONFIG_OPTIMIZE_INLINING and always_inline entirely. > I introduced gnu_inline; it's like the one semantically different > thing from C89 to C99 IIRC. I introduced it because a few places in > the kernel were redefining KBUILD_CFLAGS, dropping `-std=gnu89`. It > seems now that there's only a few places left that do that, and > they're all under arch/x86/ (see: > https://github.com/ClangBuiltLinux/linux/issues/618#issuecomment-525712390). > Note that it's a little tricky to undo this; someone just reported > yesterday that I broke kexec, and we're working on cleaning that up, > but I think doing that then adding a check to not redefine > KBUILD_CFLAGS (cc Joe) to scripts/checkpatch.pl would doable. If we > fixed that, than we could use `-fgnu_inline` (or w/e the spelling is) > command line flag instead of the compiler attribute. Probably we can get rid of this too. > Masahiro is playing around with the maybe_unused part. Seems to be a > difference in GCC and Clang warning on unused static inline functions. > I think this can be solved with correct usage of #ifdef guards for the > appropriate CONFIG_'s, rather than __maybe_unused. Yes. > notrace's definition is pretty complicated, I have no idea what any of > those attributes do... > > But maybe all of that is moot, if we just use __inline__. Looking > more at your patchset after typing this all out, seems like that will > work. > > > > > The two x86 changes cause smaller code gen differences than I'd > > expect, but I think we do want the asm_inline thing available sooner > > or later, so this is just to get the ball rolling. > > Is it a net win for all arch's? Or just x86? `differences` being an > improvement or a regression? > > > > > > Rasmus Villemoes (5): > > treewide: replace __inline__ by inline > > compiler_types.h: don't #define __inline__ > > compiler-gcc.h: add asm_inline definition > > x86: alternative.h: use asm_inline for all alternative variants > > x86: bug.h: use asm_inline in _BUG_FLAGS definitions > > > > arch/alpha/include/asm/atomic.h | 12 +++--- > > arch/alpha/include/asm/bitops.h | 6 +-- > > arch/alpha/include/asm/dma.h | 22 +++++----- > > arch/alpha/include/asm/floppy.h | 2 +- > > arch/alpha/include/asm/irq.h | 2 +- > > arch/alpha/include/asm/local.h | 4 +- > > arch/alpha/include/asm/smp.h | 2 +- > > .../arm/mach-iop32x/include/mach/uncompress.h | 2 +- > > .../arm/mach-iop33x/include/mach/uncompress.h | 2 +- > > .../arm/mach-ixp4xx/include/mach/uncompress.h | 2 +- > > arch/ia64/hp/common/sba_iommu.c | 2 +- > > arch/ia64/hp/sim/simeth.c | 2 +- > > arch/ia64/include/asm/atomic.h | 8 ++-- > > arch/ia64/include/asm/bitops.h | 34 ++++++++-------- > > arch/ia64/include/asm/delay.h | 14 +++---- > > arch/ia64/include/asm/irq.h | 2 +- > > arch/ia64/include/asm/page.h | 2 +- > > arch/ia64/include/asm/sn/leds.h | 2 +- > > arch/ia64/include/asm/uaccess.h | 4 +- > > arch/ia64/oprofile/backtrace.c | 4 +- > > arch/m68k/include/asm/blinken.h | 2 +- > > arch/m68k/include/asm/checksum.h | 2 +- > > arch/m68k/include/asm/dma.h | 32 +++++++-------- > > arch/m68k/include/asm/floppy.h | 8 ++-- > > arch/m68k/include/asm/nettel.h | 8 ++-- > > arch/m68k/mac/iop.c | 14 +++---- > > arch/mips/include/asm/atomic.h | 16 ++++---- > > arch/mips/include/asm/checksum.h | 2 +- > > arch/mips/include/asm/dma.h | 20 +++++----- > > arch/mips/include/asm/jazz.h | 2 +- > > arch/mips/include/asm/local.h | 4 +- > > arch/mips/include/asm/string.h | 8 ++-- > > arch/mips/kernel/binfmt_elfn32.c | 2 +- > > arch/nds32/include/asm/swab.h | 4 +- > > arch/parisc/include/asm/atomic.h | 20 +++++----- > > arch/parisc/include/asm/bitops.h | 18 ++++----- > > arch/parisc/include/asm/checksum.h | 4 +- > > arch/parisc/include/asm/compat.h | 2 +- > > arch/parisc/include/asm/delay.h | 2 +- > > arch/parisc/include/asm/dma.h | 20 +++++----- > > arch/parisc/include/asm/ide.h | 8 ++-- > > arch/parisc/include/asm/irq.h | 2 +- > > arch/parisc/include/asm/spinlock.h | 12 +++--- > > arch/powerpc/include/asm/atomic.h | 40 +++++++++---------- > > arch/powerpc/include/asm/bitops.h | 28 ++++++------- > > arch/powerpc/include/asm/dma.h | 20 +++++----- > > arch/powerpc/include/asm/edac.h | 2 +- > > arch/powerpc/include/asm/irq.h | 2 +- > > arch/powerpc/include/asm/local.h | 14 +++---- > > arch/sh/include/asm/pgtable_64.h | 2 +- > > arch/sh/include/asm/processor_32.h | 4 +- > > arch/sh/include/cpu-sh3/cpu/dac.h | 6 +-- > > arch/x86/include/asm/alternative.h | 14 +++---- > > arch/x86/include/asm/bug.h | 4 +- > > arch/x86/um/asm/checksum.h | 4 +- > > arch/x86/um/asm/checksum_32.h | 4 +- > > arch/xtensa/include/asm/checksum.h | 14 +++---- > > arch/xtensa/include/asm/cmpxchg.h | 4 +- > > arch/xtensa/include/asm/irq.h | 2 +- > > block/partitions/amiga.c | 2 +- > > drivers/atm/he.c | 6 +-- > > drivers/atm/idt77252.c | 6 +-- > > drivers/gpu/drm/mga/mga_drv.h | 2 +- > > drivers/gpu/drm/mga/mga_state.c | 14 +++---- > > drivers/gpu/drm/r128/r128_drv.h | 2 +- > > drivers/gpu/drm/r128/r128_state.c | 14 +++---- > > drivers/gpu/drm/via/via_irq.c | 2 +- > > drivers/gpu/drm/via/via_verifier.c | 30 +++++++------- > > drivers/media/pci/ivtv/ivtv-ioctl.c | 2 +- > > drivers/net/ethernet/sun/sungem.c | 8 ++-- > > drivers/net/ethernet/sun/sunhme.c | 6 +-- > > drivers/net/hamradio/baycom_ser_fdx.c | 2 +- > > drivers/net/wan/lapbether.c | 2 +- > > drivers/net/wan/n2.c | 4 +- > > drivers/parisc/led.c | 4 +- > > drivers/parisc/sba_iommu.c | 2 +- > > drivers/parport/parport_gsc.h | 4 +- > > drivers/scsi/lpfc/lpfc_scsi.c | 2 +- > > drivers/scsi/pcmcia/sym53c500_cs.c | 4 +- > > drivers/scsi/qla2xxx/qla_inline.h | 2 +- > > drivers/scsi/qla2xxx/qla_os.c | 2 +- > > drivers/tty/amiserial.c | 2 +- > > drivers/tty/serial/ip22zilog.c | 2 +- > > drivers/tty/serial/sunsab.c | 4 +- > > drivers/tty/serial/sunzilog.c | 2 +- > > drivers/video/fbdev/core/fbcon.c | 20 +++++----- > > drivers/video/fbdev/ffb.c | 2 +- > > drivers/video/fbdev/intelfb/intelfbdrv.c | 8 ++-- > > drivers/video/fbdev/intelfb/intelfbhw.c | 2 +- > > drivers/w1/masters/matrox_w1.c | 4 +- > > fs/coda/coda_linux.h | 6 +-- > > fs/freevxfs/vxfs_inode.c | 2 +- > > fs/nfsd/nfsfh.h | 4 +- > > include/acpi/platform/acgcc.h | 2 +- > > include/asm-generic/ide_iops.h | 8 ++-- > > include/linux/atalk.h | 4 +- > > include/linux/compiler-gcc.h | 4 ++ > > include/linux/compiler_types.h | 5 ++- > > include/linux/hdlc.h | 4 +- > > include/linux/inetdevice.h | 6 +-- > > include/linux/parport.h | 4 +- > > include/linux/parport_pc.h | 22 +++++----- > > include/net/ax25.h | 2 +- > > include/net/checksum.h | 2 +- > > include/net/dn_nsp.h | 16 ++++---- > > include/net/ip.h | 2 +- > > include/net/ip6_checksum.h | 2 +- > > include/net/ipx.h | 10 ++--- > > include/net/llc_c_ev.h | 4 +- > > include/net/llc_conn.h | 4 +- > > include/net/llc_s_ev.h | 2 +- > > include/net/netrom.h | 8 ++-- > > include/net/scm.h | 14 +++---- > > include/net/udplite.h | 2 +- > > include/net/x25.h | 8 ++-- > > include/net/xfrm.h | 18 ++++----- > > include/video/newport.h | 12 +++--- > > net/appletalk/atalk_proc.c | 4 +- > > net/appletalk/ddp.c | 2 +- > > net/core/neighbour.c | 2 +- > > net/core/scm.c | 2 +- > > net/decnet/dn_nsp_in.c | 2 +- > > net/decnet/dn_nsp_out.c | 2 +- > > net/decnet/dn_route.c | 2 +- > > net/decnet/dn_table.c | 4 +- > > net/ipv6/af_inet6.c | 2 +- > > net/ipv6/icmp.c | 4 +- > > net/ipv6/udp.c | 2 +- > > net/lapb/lapb_iface.c | 4 +- > > net/llc/llc_input.c | 2 +- > > sound/sparc/amd7930.c | 6 +-- > > 131 files changed, 449 insertions(+), 442 deletions(-) > > > > -- > > 2.20.1 > > > > > -- > Thanks, > ~Nick Desaulniers -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH v2 0/6] make use of gcc 9's "asm inline()" 2019-08-29 8:32 [RFC PATCH 0/5] make use of gcc 9's "asm inline()" Rasmus Villemoes ` (6 preceding siblings ...) 2019-08-29 17:36 ` Nick Desaulniers @ 2019-08-30 23:15 ` Rasmus Villemoes 2019-08-30 23:15 ` [PATCH v2 1/6] staging: rtl8723bs: replace __inline by inline Rasmus Villemoes ` (6 more replies) 7 siblings, 7 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-08-30 23:15 UTC (permalink / raw) To: x86, linux-kernel Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, ndesaulniers, Rasmus Villemoes, Greg Kroah-Hartman gcc 9 provides a way to override the otherwise crude heuristic that gcc uses to estimate the size of the code represented by an asm() statement. From the gcc docs If you use 'asm inline' instead of just 'asm', then for inlining purposes the size of the asm is taken as the minimum size, ignoring how many instructions GCC thinks it is. For compatibility with older compilers, we obviously want a #if new enough #define asm_inline asm inline #else #define asm_inline asm #endif But since we #define the identifier inline to attach some attributes, we have to use an alternate spelling of that keyword. gcc provides both __inline__ and __inline, and we currently #define both to inline, so they all have the same semantics. We have to free up one of __inline__ and __inline, and the latter is by far the easiest. The two x86 changes cause smaller code gen differences than I'd expect, but I think we do want the asm_inline thing available sooner or later, so this is just to get the ball rolling. Changes since v1: __inline instead of __inline__, making the diffstat 400 lines smaller. Probably no longer needs special handling (having Linus run a script to generate patch 1), so if the x86 folks want 5/6 and 6/6, perhaps the whole thing can be routed that way. Rasmus Villemoes (6): staging: rtl8723bs: replace __inline by inline lib/zstd/mem.h: replace __inline by inline compiler_types.h: don't #define __inline compiler-gcc.h: add asm_inline definition x86: alternative.h: use asm_inline for all alternative variants x86: bug.h: use asm_inline in _BUG_FLAGS definitions arch/x86/include/asm/alternative.h | 14 +++++++------- arch/x86/include/asm/bug.h | 4 ++-- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/include/drv_types.h | 6 +++--- .../staging/rtl8723bs/include/osdep_service.h | 10 +++++----- .../rtl8723bs/include/osdep_service_linux.h | 14 +++++++------- drivers/staging/rtl8723bs/include/rtw_mlme.h | 14 +++++++------- drivers/staging/rtl8723bs/include/rtw_recv.h | 16 ++++++++-------- drivers/staging/rtl8723bs/include/sta_info.h | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 14 +++++++------- drivers/staging/rtl8723bs/include/wlan_bssdef.h | 2 +- include/linux/compiler-gcc.h | 4 ++++ include/linux/compiler_types.h | 15 ++++++++++++++- lib/zstd/mem.h | 2 +- 15 files changed, 70 insertions(+), 53 deletions(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH v2 1/6] staging: rtl8723bs: replace __inline by inline 2019-08-30 23:15 ` [PATCH v2 0/6] " Rasmus Villemoes @ 2019-08-30 23:15 ` Rasmus Villemoes 2019-09-04 23:54 ` Nick Desaulniers 2019-08-30 23:15 ` [PATCH v2 2/6] lib/zstd/mem.h: " Rasmus Villemoes ` (5 subsequent siblings) 6 siblings, 1 reply; 66+ messages in thread From: Rasmus Villemoes @ 2019-08-30 23:15 UTC (permalink / raw) To: x86, linux-kernel Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, ndesaulniers, Rasmus Villemoes, Greg Kroah-Hartman Currently, __inline is #defined as inline in compiler_types.h, so this should not change functionality. It is preparation for removing said #define. While at it, change some "inline static" to the customary "static inline" order. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/include/drv_types.h | 6 +++--- .../staging/rtl8723bs/include/osdep_service.h | 10 +++++----- .../rtl8723bs/include/osdep_service_linux.h | 14 +++++++------- drivers/staging/rtl8723bs/include/rtw_mlme.h | 14 +++++++------- drivers/staging/rtl8723bs/include/rtw_recv.h | 16 ++++++++-------- drivers/staging/rtl8723bs/include/sta_info.h | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 14 +++++++------- drivers/staging/rtl8723bs/include/wlan_bssdef.h | 2 +- 10 files changed, 42 insertions(+), 42 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c index ae7fb7046c93..3750fbaeec4f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c @@ -830,12 +830,12 @@ static void pwr_rpwm_timeout_handler(struct timer_list *t) _set_workitem(&pwrpriv->rpwmtimeoutwi); } -static __inline void register_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag) +static inline void register_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag) { pwrctrl->alives |= tag; } -static __inline void unregister_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag) +static inline void unregister_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag) { pwrctrl->alives &= ~tag; } diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c index 76c50377f0fe..34e1ce1b0689 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -451,7 +451,7 @@ void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigne mutex_unlock(&(adapter_to_dvobj(padapter)->setch_mutex)); } -__inline u8 *get_my_bssid(struct wlan_bssid_ex *pnetwork) +inline u8 *get_my_bssid(struct wlan_bssid_ex *pnetwork) { return pnetwork->MacAddress; } diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h index 96346ce064aa..d3648f3b1de2 100644 --- a/drivers/staging/rtl8723bs/include/drv_types.h +++ b/drivers/staging/rtl8723bs/include/drv_types.h @@ -478,7 +478,7 @@ struct sdio_data intf_data; #define dvobj_to_pwrctl(dvobj) (&(dvobj->pwrctl_priv)) #define pwrctl_to_dvobj(pwrctl) container_of(pwrctl, struct dvobj_priv, pwrctl_priv) -__inline static struct device *dvobj_to_dev(struct dvobj_priv *dvobj) +static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj) { /* todo: get interface type from dvobj and the return the dev accordingly */ #ifdef RTW_DVOBJ_CHIP_HW_TYPE @@ -636,14 +636,14 @@ struct adapter { /* define RTW_DISABLE_FUNC(padapter, func) (atomic_add(&adapter_to_dvobj(padapter)->disable_func, (func))) */ /* define RTW_ENABLE_FUNC(padapter, func) (atomic_sub(&adapter_to_dvobj(padapter)->disable_func, (func))) */ -__inline static void RTW_DISABLE_FUNC(struct adapter *padapter, int func_bit) +static inline void RTW_DISABLE_FUNC(struct adapter *padapter, int func_bit) { int df = atomic_read(&adapter_to_dvobj(padapter)->disable_func); df |= func_bit; atomic_set(&adapter_to_dvobj(padapter)->disable_func, df); } -__inline static void RTW_ENABLE_FUNC(struct adapter *padapter, int func_bit) +static inline void RTW_ENABLE_FUNC(struct adapter *padapter, int func_bit) { int df = atomic_read(&adapter_to_dvobj(padapter)->disable_func); df &= ~(func_bit); diff --git a/drivers/staging/rtl8723bs/include/osdep_service.h b/drivers/staging/rtl8723bs/include/osdep_service.h index d2616af95ffa..81a9c19ecc6a 100644 --- a/drivers/staging/rtl8723bs/include/osdep_service.h +++ b/drivers/staging/rtl8723bs/include/osdep_service.h @@ -110,12 +110,12 @@ int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb); extern void _rtw_init_queue(struct __queue *pqueue); -static __inline void thread_enter(char *name) +static inline void thread_enter(char *name) { allow_signal(SIGTERM); } -__inline static void flush_signals_thread(void) +static inline void flush_signals_thread(void) { if (signal_pending (current)) { @@ -125,7 +125,7 @@ __inline static void flush_signals_thread(void) #define rtw_warn_on(condition) WARN_ON(condition) -__inline static int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *parg4) +static inline int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *parg4) { int ret = true; @@ -136,7 +136,7 @@ __inline static int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *p #define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r)) #define RND4(x) (((x >> 2) + (((x & 3) == 0) ? 0: 1)) << 2) -__inline static u32 _RND4(u32 sz) +static inline u32 _RND4(u32 sz) { u32 val; @@ -147,7 +147,7 @@ __inline static u32 _RND4(u32 sz) } -__inline static u32 _RND8(u32 sz) +static inline u32 _RND8(u32 sz) { u32 val; diff --git a/drivers/staging/rtl8723bs/include/osdep_service_linux.h b/drivers/staging/rtl8723bs/include/osdep_service_linux.h index 2f1b51e614fb..c582ede1ac12 100644 --- a/drivers/staging/rtl8723bs/include/osdep_service_linux.h +++ b/drivers/staging/rtl8723bs/include/osdep_service_linux.h @@ -64,12 +64,12 @@ typedef struct work_struct _workitem; -__inline static struct list_head *get_next(struct list_head *list) +static inline struct list_head *get_next(struct list_head *list) { return list->next; } -__inline static struct list_head *get_list_head(struct __queue *queue) +static inline struct list_head *get_list_head(struct __queue *queue) { return (&(queue->queue)); } @@ -78,28 +78,28 @@ __inline static struct list_head *get_list_head(struct __queue *queue) #define LIST_CONTAINOR(ptr, type, member) \ container_of(ptr, type, member) -__inline static void _set_timer(_timer *ptimer, u32 delay_time) +static inline void _set_timer(_timer *ptimer, u32 delay_time) { mod_timer(ptimer , (jiffies+(delay_time*HZ/1000))); } -__inline static void _cancel_timer(_timer *ptimer, u8 *bcancelled) +static inline void _cancel_timer(_timer *ptimer, u8 *bcancelled) { del_timer_sync(ptimer); *bcancelled = true;/* true == 1; false == 0 */ } -__inline static void _init_workitem(_workitem *pwork, void *pfunc, void *cntx) +static inline void _init_workitem(_workitem *pwork, void *pfunc, void *cntx) { INIT_WORK(pwork, pfunc); } -__inline static void _set_workitem(_workitem *pwork) +static inline void _set_workitem(_workitem *pwork) { schedule_work(pwork); } -__inline static void _cancel_workitem_sync(_workitem *pwork) +static inline void _cancel_workitem_sync(_workitem *pwork) { cancel_work_sync(pwork); } diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h index d3c07d1c36e9..4282dfa70b79 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -498,13 +498,13 @@ extern sint rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv); extern sint rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, sint keyid, u8 set_tx, bool enqueue); extern sint rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv); -__inline static u8 *get_bssid(struct mlme_priv *pmlmepriv) +static inline u8 *get_bssid(struct mlme_priv *pmlmepriv) { /* if sta_mode:pmlmepriv->cur_network.network.MacAddress => bssid */ /* if adhoc_mode:pmlmepriv->cur_network.network.MacAddress => ibss mac address */ return pmlmepriv->cur_network.network.MacAddress; } -__inline static sint check_fwstate(struct mlme_priv *pmlmepriv, sint state) +static inline sint check_fwstate(struct mlme_priv *pmlmepriv, sint state) { if (pmlmepriv->fw_state & state) return true; @@ -512,7 +512,7 @@ __inline static sint check_fwstate(struct mlme_priv *pmlmepriv, sint state) return false; } -__inline static sint get_fwstate(struct mlme_priv *pmlmepriv) +static inline sint get_fwstate(struct mlme_priv *pmlmepriv) { return pmlmepriv->fw_state; } @@ -524,7 +524,7 @@ __inline static sint get_fwstate(struct mlme_priv *pmlmepriv) * ### NOTE:#### (!!!!) * MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock */ -__inline static void set_fwstate(struct mlme_priv *pmlmepriv, sint state) +static inline void set_fwstate(struct mlme_priv *pmlmepriv, sint state) { pmlmepriv->fw_state |= state; /* FOR HW integration */ @@ -533,7 +533,7 @@ __inline static void set_fwstate(struct mlme_priv *pmlmepriv, sint state) } } -__inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state) +static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state) { pmlmepriv->fw_state &= ~state; /* FOR HW integration */ @@ -546,7 +546,7 @@ __inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state) * No Limit on the calling context, * therefore set it to be the critical section... */ -__inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state) +static inline void clr_fwstate(struct mlme_priv *pmlmepriv, sint state) { spin_lock_bh(&pmlmepriv->lock); if (check_fwstate(pmlmepriv, state) == true) @@ -554,7 +554,7 @@ __inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state) spin_unlock_bh(&pmlmepriv->lock); } -__inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint val) +static inline void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint val) { spin_lock_bh(&pmlmepriv->lock); pmlmepriv->num_of_scanned = val; diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h index 5de946e66302..012d8f54814f 100644 --- a/drivers/staging/rtl8723bs/include/rtw_recv.h +++ b/drivers/staging/rtl8723bs/include/rtw_recv.h @@ -405,7 +405,7 @@ struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue); void rtw_reordering_ctrl_timeout_handler(struct timer_list *t); -__inline static u8 *get_rxmem(union recv_frame *precvframe) +static inline u8 *get_rxmem(union recv_frame *precvframe) { /* always return rx_head... */ if (precvframe == NULL) @@ -414,7 +414,7 @@ __inline static u8 *get_rxmem(union recv_frame *precvframe) return precvframe->u.hdr.rx_head; } -__inline static u8 *get_recvframe_data(union recv_frame *precvframe) +static inline u8 *get_recvframe_data(union recv_frame *precvframe) { /* alwasy return rx_data */ @@ -425,7 +425,7 @@ __inline static u8 *get_recvframe_data(union recv_frame *precvframe) } -__inline static u8 *recvframe_pull(union recv_frame *precvframe, sint sz) +static inline u8 *recvframe_pull(union recv_frame *precvframe, sint sz) { /* rx_data += sz; move rx_data sz bytes hereafter */ @@ -450,7 +450,7 @@ __inline static u8 *recvframe_pull(union recv_frame *precvframe, sint sz) } -__inline static u8 *recvframe_put(union recv_frame *precvframe, sint sz) +static inline u8 *recvframe_put(union recv_frame *precvframe, sint sz) { /* rx_tai += sz; move rx_tail sz bytes hereafter */ @@ -479,7 +479,7 @@ __inline static u8 *recvframe_put(union recv_frame *precvframe, sint sz) -__inline static u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz) +static inline u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz) { /* rmv data from rx_tail (by yitsen) */ @@ -503,7 +503,7 @@ __inline static u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz) } -__inline static union recv_frame *rxmem_to_recvframe(u8 *rxmem) +static inline union recv_frame *rxmem_to_recvframe(u8 *rxmem) { /* due to the design of 2048 bytes alignment of recv_frame, we can reference the union recv_frame */ /* from any given member of recv_frame. */ @@ -513,13 +513,13 @@ __inline static union recv_frame *rxmem_to_recvframe(u8 *rxmem) } -__inline static sint get_recvframe_len(union recv_frame *precvframe) +static inline sint get_recvframe_len(union recv_frame *precvframe) { return precvframe->u.hdr.len; } -__inline static s32 translate_percentage_to_dbm(u32 SignalStrengthIndex) +static inline s32 translate_percentage_to_dbm(u32 SignalStrengthIndex) { s32 SignalPower; /* in dBm. */ diff --git a/drivers/staging/rtl8723bs/include/sta_info.h b/drivers/staging/rtl8723bs/include/sta_info.h index b9df42d0677e..3acce5630f8e 100644 --- a/drivers/staging/rtl8723bs/include/sta_info.h +++ b/drivers/staging/rtl8723bs/include/sta_info.h @@ -348,7 +348,7 @@ struct sta_priv { }; -__inline static u32 wifi_mac_hash(u8 *mac) +static inline u32 wifi_mac_hash(u8 *mac) { u32 x; diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h index 8c50bbb20f3b..2faf83704ff0 100644 --- a/drivers/staging/rtl8723bs/include/wifi.h +++ b/drivers/staging/rtl8723bs/include/wifi.h @@ -347,7 +347,7 @@ enum WIFI_REG_DOMAIN { (addr[4] == 0xff) && (addr[5] == 0xff)) ? true : false \ ) -__inline static int IS_MCAST(unsigned char *da) +static inline int IS_MCAST(unsigned char *da) { if ((*da) & 0x01) return true; @@ -355,20 +355,20 @@ __inline static int IS_MCAST(unsigned char *da) return false; } -__inline static unsigned char * get_ra(unsigned char *pframe) +static inline unsigned char * get_ra(unsigned char *pframe) { unsigned char *ra; ra = GetAddr1Ptr(pframe); return ra; } -__inline static unsigned char * get_ta(unsigned char *pframe) +static inline unsigned char * get_ta(unsigned char *pframe) { unsigned char *ta; ta = GetAddr2Ptr(pframe); return ta; } -__inline static unsigned char * get_da(unsigned char *pframe) +static inline unsigned char * get_da(unsigned char *pframe) { unsigned char *da; unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); @@ -392,7 +392,7 @@ __inline static unsigned char * get_da(unsigned char *pframe) } -__inline static unsigned char * get_sa(unsigned char *pframe) +static inline unsigned char * get_sa(unsigned char *pframe) { unsigned char *sa; unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); @@ -415,7 +415,7 @@ __inline static unsigned char * get_sa(unsigned char *pframe) return sa; } -__inline static unsigned char * get_hdr_bssid(unsigned char *pframe) +static inline unsigned char * get_hdr_bssid(unsigned char *pframe) { unsigned char *sa = NULL; unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); @@ -439,7 +439,7 @@ __inline static unsigned char * get_hdr_bssid(unsigned char *pframe) } -__inline static int IsFrameTypeCtrl(unsigned char *pframe) +static inline int IsFrameTypeCtrl(unsigned char *pframe) { if (WIFI_CTRL_TYPE == GetFrameType(pframe)) return true; diff --git a/drivers/staging/rtl8723bs/include/wlan_bssdef.h b/drivers/staging/rtl8723bs/include/wlan_bssdef.h index 88890b1c3c4c..723fc5b546ef 100644 --- a/drivers/staging/rtl8723bs/include/wlan_bssdef.h +++ b/drivers/staging/rtl8723bs/include/wlan_bssdef.h @@ -223,7 +223,7 @@ struct wlan_bssid_ex { u8 IEs[MAX_IE_SZ]; /* timestamp, beacon interval, and capability information) */ } __packed; -__inline static uint get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss) +static inline uint get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss) { return (sizeof(struct wlan_bssid_ex) - MAX_IE_SZ + bss->IELength); } -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* Re: [PATCH v2 1/6] staging: rtl8723bs: replace __inline by inline 2019-08-30 23:15 ` [PATCH v2 1/6] staging: rtl8723bs: replace __inline by inline Rasmus Villemoes @ 2019-09-04 23:54 ` Nick Desaulniers 0 siblings, 0 replies; 66+ messages in thread From: Nick Desaulniers @ 2019-09-04 23:54 UTC (permalink / raw) To: Rasmus Villemoes Cc: maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, Greg Kroah-Hartman On Fri, Aug 30, 2019 at 4:15 PM Rasmus Villemoes <linux@rasmusvillemoes.dk> wrote: > > Currently, __inline is #defined as inline in compiler_types.h, so this > should not change functionality. It is preparation for removing said > #define. > > While at it, change some "inline static" to the customary "static > inline" order. > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > --- > drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 ++-- > drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- > drivers/staging/rtl8723bs/include/drv_types.h | 6 +++--- > .../staging/rtl8723bs/include/osdep_service.h | 10 +++++----- > .../rtl8723bs/include/osdep_service_linux.h | 14 +++++++------- > drivers/staging/rtl8723bs/include/rtw_mlme.h | 14 +++++++------- > drivers/staging/rtl8723bs/include/rtw_recv.h | 16 ++++++++-------- > drivers/staging/rtl8723bs/include/sta_info.h | 2 +- > drivers/staging/rtl8723bs/include/wifi.h | 14 +++++++------- > drivers/staging/rtl8723bs/include/wlan_bssdef.h | 2 +- > 10 files changed, 42 insertions(+), 42 deletions(-) > > diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c > index ae7fb7046c93..3750fbaeec4f 100644 > --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c > +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c > @@ -830,12 +830,12 @@ static void pwr_rpwm_timeout_handler(struct timer_list *t) > _set_workitem(&pwrpriv->rpwmtimeoutwi); > } > > -static __inline void register_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag) > +static inline void register_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag) > { > pwrctrl->alives |= tag; > } > > -static __inline void unregister_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag) > +static inline void unregister_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag) > { > pwrctrl->alives &= ~tag; > } > diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c > index 76c50377f0fe..34e1ce1b0689 100644 > --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c > +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c > @@ -451,7 +451,7 @@ void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigne > mutex_unlock(&(adapter_to_dvobj(padapter)->setch_mutex)); > } > > -__inline u8 *get_my_bssid(struct wlan_bssid_ex *pnetwork) > +inline u8 *get_my_bssid(struct wlan_bssid_ex *pnetwork) > { > return pnetwork->MacAddress; > } > diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h > index 96346ce064aa..d3648f3b1de2 100644 > --- a/drivers/staging/rtl8723bs/include/drv_types.h > +++ b/drivers/staging/rtl8723bs/include/drv_types.h > @@ -478,7 +478,7 @@ struct sdio_data intf_data; > #define dvobj_to_pwrctl(dvobj) (&(dvobj->pwrctl_priv)) > #define pwrctl_to_dvobj(pwrctl) container_of(pwrctl, struct dvobj_priv, pwrctl_priv) > > -__inline static struct device *dvobj_to_dev(struct dvobj_priv *dvobj) > +static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj) > { > /* todo: get interface type from dvobj and the return the dev accordingly */ > #ifdef RTW_DVOBJ_CHIP_HW_TYPE > @@ -636,14 +636,14 @@ struct adapter { > > /* define RTW_DISABLE_FUNC(padapter, func) (atomic_add(&adapter_to_dvobj(padapter)->disable_func, (func))) */ > /* define RTW_ENABLE_FUNC(padapter, func) (atomic_sub(&adapter_to_dvobj(padapter)->disable_func, (func))) */ > -__inline static void RTW_DISABLE_FUNC(struct adapter *padapter, int func_bit) > +static inline void RTW_DISABLE_FUNC(struct adapter *padapter, int func_bit) > { > int df = atomic_read(&adapter_to_dvobj(padapter)->disable_func); > df |= func_bit; > atomic_set(&adapter_to_dvobj(padapter)->disable_func, df); > } > > -__inline static void RTW_ENABLE_FUNC(struct adapter *padapter, int func_bit) > +static inline void RTW_ENABLE_FUNC(struct adapter *padapter, int func_bit) > { > int df = atomic_read(&adapter_to_dvobj(padapter)->disable_func); > df &= ~(func_bit); > diff --git a/drivers/staging/rtl8723bs/include/osdep_service.h b/drivers/staging/rtl8723bs/include/osdep_service.h > index d2616af95ffa..81a9c19ecc6a 100644 > --- a/drivers/staging/rtl8723bs/include/osdep_service.h > +++ b/drivers/staging/rtl8723bs/include/osdep_service.h > @@ -110,12 +110,12 @@ int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb); > > extern void _rtw_init_queue(struct __queue *pqueue); > > -static __inline void thread_enter(char *name) > +static inline void thread_enter(char *name) > { > allow_signal(SIGTERM); > } > > -__inline static void flush_signals_thread(void) > +static inline void flush_signals_thread(void) > { > if (signal_pending (current)) > { > @@ -125,7 +125,7 @@ __inline static void flush_signals_thread(void) > > #define rtw_warn_on(condition) WARN_ON(condition) > > -__inline static int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *parg4) > +static inline int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *parg4) > { > int ret = true; > > @@ -136,7 +136,7 @@ __inline static int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *p > #define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r)) > #define RND4(x) (((x >> 2) + (((x & 3) == 0) ? 0: 1)) << 2) > > -__inline static u32 _RND4(u32 sz) > +static inline u32 _RND4(u32 sz) > { > > u32 val; > @@ -147,7 +147,7 @@ __inline static u32 _RND4(u32 sz) > > } > > -__inline static u32 _RND8(u32 sz) > +static inline u32 _RND8(u32 sz) > { > > u32 val; > diff --git a/drivers/staging/rtl8723bs/include/osdep_service_linux.h b/drivers/staging/rtl8723bs/include/osdep_service_linux.h > index 2f1b51e614fb..c582ede1ac12 100644 > --- a/drivers/staging/rtl8723bs/include/osdep_service_linux.h > +++ b/drivers/staging/rtl8723bs/include/osdep_service_linux.h > @@ -64,12 +64,12 @@ > > typedef struct work_struct _workitem; > > -__inline static struct list_head *get_next(struct list_head *list) > +static inline struct list_head *get_next(struct list_head *list) > { > return list->next; > } > > -__inline static struct list_head *get_list_head(struct __queue *queue) > +static inline struct list_head *get_list_head(struct __queue *queue) > { > return (&(queue->queue)); > } > @@ -78,28 +78,28 @@ __inline static struct list_head *get_list_head(struct __queue *queue) > #define LIST_CONTAINOR(ptr, type, member) \ > container_of(ptr, type, member) > > -__inline static void _set_timer(_timer *ptimer, u32 delay_time) > +static inline void _set_timer(_timer *ptimer, u32 delay_time) > { > mod_timer(ptimer , (jiffies+(delay_time*HZ/1000))); > } > > -__inline static void _cancel_timer(_timer *ptimer, u8 *bcancelled) > +static inline void _cancel_timer(_timer *ptimer, u8 *bcancelled) > { > del_timer_sync(ptimer); > *bcancelled = true;/* true == 1; false == 0 */ > } > > -__inline static void _init_workitem(_workitem *pwork, void *pfunc, void *cntx) > +static inline void _init_workitem(_workitem *pwork, void *pfunc, void *cntx) > { > INIT_WORK(pwork, pfunc); > } > > -__inline static void _set_workitem(_workitem *pwork) > +static inline void _set_workitem(_workitem *pwork) > { > schedule_work(pwork); > } > > -__inline static void _cancel_workitem_sync(_workitem *pwork) > +static inline void _cancel_workitem_sync(_workitem *pwork) > { > cancel_work_sync(pwork); > } > diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h > index d3c07d1c36e9..4282dfa70b79 100644 > --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h > +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h > @@ -498,13 +498,13 @@ extern sint rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv); > extern sint rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, sint keyid, u8 set_tx, bool enqueue); > extern sint rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv); > > -__inline static u8 *get_bssid(struct mlme_priv *pmlmepriv) > +static inline u8 *get_bssid(struct mlme_priv *pmlmepriv) > { /* if sta_mode:pmlmepriv->cur_network.network.MacAddress => bssid */ > /* if adhoc_mode:pmlmepriv->cur_network.network.MacAddress => ibss mac address */ > return pmlmepriv->cur_network.network.MacAddress; > } > > -__inline static sint check_fwstate(struct mlme_priv *pmlmepriv, sint state) > +static inline sint check_fwstate(struct mlme_priv *pmlmepriv, sint state) > { > if (pmlmepriv->fw_state & state) > return true; > @@ -512,7 +512,7 @@ __inline static sint check_fwstate(struct mlme_priv *pmlmepriv, sint state) > return false; > } > > -__inline static sint get_fwstate(struct mlme_priv *pmlmepriv) > +static inline sint get_fwstate(struct mlme_priv *pmlmepriv) > { > return pmlmepriv->fw_state; > } > @@ -524,7 +524,7 @@ __inline static sint get_fwstate(struct mlme_priv *pmlmepriv) > * ### NOTE:#### (!!!!) > * MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock > */ > -__inline static void set_fwstate(struct mlme_priv *pmlmepriv, sint state) > +static inline void set_fwstate(struct mlme_priv *pmlmepriv, sint state) > { > pmlmepriv->fw_state |= state; > /* FOR HW integration */ > @@ -533,7 +533,7 @@ __inline static void set_fwstate(struct mlme_priv *pmlmepriv, sint state) > } > } > > -__inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state) > +static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state) > { > pmlmepriv->fw_state &= ~state; > /* FOR HW integration */ > @@ -546,7 +546,7 @@ __inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state) > * No Limit on the calling context, > * therefore set it to be the critical section... > */ > -__inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state) > +static inline void clr_fwstate(struct mlme_priv *pmlmepriv, sint state) > { > spin_lock_bh(&pmlmepriv->lock); > if (check_fwstate(pmlmepriv, state) == true) > @@ -554,7 +554,7 @@ __inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state) > spin_unlock_bh(&pmlmepriv->lock); > } > > -__inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint val) > +static inline void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint val) > { > spin_lock_bh(&pmlmepriv->lock); > pmlmepriv->num_of_scanned = val; > diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h > index 5de946e66302..012d8f54814f 100644 > --- a/drivers/staging/rtl8723bs/include/rtw_recv.h > +++ b/drivers/staging/rtl8723bs/include/rtw_recv.h > @@ -405,7 +405,7 @@ struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue); > > void rtw_reordering_ctrl_timeout_handler(struct timer_list *t); > > -__inline static u8 *get_rxmem(union recv_frame *precvframe) > +static inline u8 *get_rxmem(union recv_frame *precvframe) > { > /* always return rx_head... */ > if (precvframe == NULL) > @@ -414,7 +414,7 @@ __inline static u8 *get_rxmem(union recv_frame *precvframe) > return precvframe->u.hdr.rx_head; > } > > -__inline static u8 *get_recvframe_data(union recv_frame *precvframe) > +static inline u8 *get_recvframe_data(union recv_frame *precvframe) > { > > /* alwasy return rx_data */ > @@ -425,7 +425,7 @@ __inline static u8 *get_recvframe_data(union recv_frame *precvframe) > > } > > -__inline static u8 *recvframe_pull(union recv_frame *precvframe, sint sz) > +static inline u8 *recvframe_pull(union recv_frame *precvframe, sint sz) > { > /* rx_data += sz; move rx_data sz bytes hereafter */ > > @@ -450,7 +450,7 @@ __inline static u8 *recvframe_pull(union recv_frame *precvframe, sint sz) > > } > > -__inline static u8 *recvframe_put(union recv_frame *precvframe, sint sz) > +static inline u8 *recvframe_put(union recv_frame *precvframe, sint sz) > { > /* rx_tai += sz; move rx_tail sz bytes hereafter */ > > @@ -479,7 +479,7 @@ __inline static u8 *recvframe_put(union recv_frame *precvframe, sint sz) > > > > -__inline static u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz) > +static inline u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz) > { > /* rmv data from rx_tail (by yitsen) */ > > @@ -503,7 +503,7 @@ __inline static u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz) > > } > > -__inline static union recv_frame *rxmem_to_recvframe(u8 *rxmem) > +static inline union recv_frame *rxmem_to_recvframe(u8 *rxmem) > { > /* due to the design of 2048 bytes alignment of recv_frame, we can reference the union recv_frame */ > /* from any given member of recv_frame. */ > @@ -513,13 +513,13 @@ __inline static union recv_frame *rxmem_to_recvframe(u8 *rxmem) > > } > > -__inline static sint get_recvframe_len(union recv_frame *precvframe) > +static inline sint get_recvframe_len(union recv_frame *precvframe) > { > return precvframe->u.hdr.len; > } > > > -__inline static s32 translate_percentage_to_dbm(u32 SignalStrengthIndex) > +static inline s32 translate_percentage_to_dbm(u32 SignalStrengthIndex) > { > s32 SignalPower; /* in dBm. */ > > diff --git a/drivers/staging/rtl8723bs/include/sta_info.h b/drivers/staging/rtl8723bs/include/sta_info.h > index b9df42d0677e..3acce5630f8e 100644 > --- a/drivers/staging/rtl8723bs/include/sta_info.h > +++ b/drivers/staging/rtl8723bs/include/sta_info.h > @@ -348,7 +348,7 @@ struct sta_priv { > }; > > > -__inline static u32 wifi_mac_hash(u8 *mac) > +static inline u32 wifi_mac_hash(u8 *mac) > { > u32 x; > > diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h > index 8c50bbb20f3b..2faf83704ff0 100644 > --- a/drivers/staging/rtl8723bs/include/wifi.h > +++ b/drivers/staging/rtl8723bs/include/wifi.h > @@ -347,7 +347,7 @@ enum WIFI_REG_DOMAIN { > (addr[4] == 0xff) && (addr[5] == 0xff)) ? true : false \ > ) > > -__inline static int IS_MCAST(unsigned char *da) > +static inline int IS_MCAST(unsigned char *da) > { > if ((*da) & 0x01) > return true; > @@ -355,20 +355,20 @@ __inline static int IS_MCAST(unsigned char *da) > return false; > } > > -__inline static unsigned char * get_ra(unsigned char *pframe) > +static inline unsigned char * get_ra(unsigned char *pframe) > { > unsigned char *ra; > ra = GetAddr1Ptr(pframe); > return ra; > } > -__inline static unsigned char * get_ta(unsigned char *pframe) > +static inline unsigned char * get_ta(unsigned char *pframe) > { > unsigned char *ta; > ta = GetAddr2Ptr(pframe); > return ta; > } > > -__inline static unsigned char * get_da(unsigned char *pframe) > +static inline unsigned char * get_da(unsigned char *pframe) > { > unsigned char *da; > unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); > @@ -392,7 +392,7 @@ __inline static unsigned char * get_da(unsigned char *pframe) > } > > > -__inline static unsigned char * get_sa(unsigned char *pframe) > +static inline unsigned char * get_sa(unsigned char *pframe) > { > unsigned char *sa; > unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); > @@ -415,7 +415,7 @@ __inline static unsigned char * get_sa(unsigned char *pframe) > return sa; > } > > -__inline static unsigned char * get_hdr_bssid(unsigned char *pframe) > +static inline unsigned char * get_hdr_bssid(unsigned char *pframe) > { > unsigned char *sa = NULL; > unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); > @@ -439,7 +439,7 @@ __inline static unsigned char * get_hdr_bssid(unsigned char *pframe) > } > > > -__inline static int IsFrameTypeCtrl(unsigned char *pframe) > +static inline int IsFrameTypeCtrl(unsigned char *pframe) > { > if (WIFI_CTRL_TYPE == GetFrameType(pframe)) > return true; > diff --git a/drivers/staging/rtl8723bs/include/wlan_bssdef.h b/drivers/staging/rtl8723bs/include/wlan_bssdef.h > index 88890b1c3c4c..723fc5b546ef 100644 > --- a/drivers/staging/rtl8723bs/include/wlan_bssdef.h > +++ b/drivers/staging/rtl8723bs/include/wlan_bssdef.h > @@ -223,7 +223,7 @@ struct wlan_bssid_ex { > u8 IEs[MAX_IE_SZ]; /* timestamp, beacon interval, and capability information) */ > } __packed; > > -__inline static uint get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss) > +static inline uint get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss) > { > return (sizeof(struct wlan_bssid_ex) - MAX_IE_SZ + bss->IELength); > } > -- > 2.20.1 > -- Thanks, ~Nick Desaulniers ^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH v2 2/6] lib/zstd/mem.h: replace __inline by inline 2019-08-30 23:15 ` [PATCH v2 0/6] " Rasmus Villemoes 2019-08-30 23:15 ` [PATCH v2 1/6] staging: rtl8723bs: replace __inline by inline Rasmus Villemoes @ 2019-08-30 23:15 ` Rasmus Villemoes 2019-09-04 23:59 ` Nick Desaulniers 2019-08-30 23:15 ` [PATCH v2 3/6] compiler_types.h: don't #define __inline Rasmus Villemoes ` (4 subsequent siblings) 6 siblings, 1 reply; 66+ messages in thread From: Rasmus Villemoes @ 2019-08-30 23:15 UTC (permalink / raw) To: x86, linux-kernel Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, ndesaulniers, Rasmus Villemoes Currently, compiler_types.h #defines __inline as inline (and further #defines inline to automatically attach some attributes), so this does not change functionality. It serves as preparation for removing the #define of __inline. (Note that if ZSTD_STATIC is expanded somewhere where compiler_types.h has not yet been processed, both __inline and inline both refer to the compiler keyword, so again this does not change anything.) Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- lib/zstd/mem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zstd/mem.h b/lib/zstd/mem.h index 3a0f34c8706c..739837a59ad6 100644 --- a/lib/zstd/mem.h +++ b/lib/zstd/mem.h @@ -27,7 +27,7 @@ /*-**************************************** * Compiler specifics ******************************************/ -#define ZSTD_STATIC static __inline __attribute__((unused)) +#define ZSTD_STATIC static inline __attribute__((unused)) /*-************************************************************** * Basic Types -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* Re: [PATCH v2 2/6] lib/zstd/mem.h: replace __inline by inline 2019-08-30 23:15 ` [PATCH v2 2/6] lib/zstd/mem.h: " Rasmus Villemoes @ 2019-09-04 23:59 ` Nick Desaulniers 2019-09-05 0:07 ` Miguel Ojeda 0 siblings, 1 reply; 66+ messages in thread From: Nick Desaulniers @ 2019-09-04 23:59 UTC (permalink / raw) To: Rasmus Villemoes Cc: maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, Joe Perches On Fri, Aug 30, 2019 at 4:15 PM Rasmus Villemoes <linux@rasmusvillemoes.dk> wrote: > > Currently, compiler_types.h #defines __inline as inline (and further > #defines inline to automatically attach some attributes), so this does > not change functionality. It serves as preparation for removing the > #define of __inline. > > (Note that if ZSTD_STATIC is expanded somewhere where compiler_types.h > has not yet been processed, both __inline and inline both refer to the > compiler keyword, so again this does not change anything.) > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > --- > lib/zstd/mem.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/zstd/mem.h b/lib/zstd/mem.h > index 3a0f34c8706c..739837a59ad6 100644 > --- a/lib/zstd/mem.h > +++ b/lib/zstd/mem.h > @@ -27,7 +27,7 @@ > /*-**************************************** > * Compiler specifics > ******************************************/ > -#define ZSTD_STATIC static __inline __attribute__((unused)) > +#define ZSTD_STATIC static inline __attribute__((unused)) While you're here, would you mind replacing `__attribute__((unused))` with `__unused`? I would consider "naked attributes" (haven't been feature tested in include/linux/compiler_attributes.h and are verbose) to be an antipattern. > > /*-************************************************************** > * Basic Types > -- > 2.20.1 > -- Thanks, ~Nick Desaulniers ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 2/6] lib/zstd/mem.h: replace __inline by inline 2019-09-04 23:59 ` Nick Desaulniers @ 2019-09-05 0:07 ` Miguel Ojeda 2019-09-05 9:28 ` Rasmus Villemoes 0 siblings, 1 reply; 66+ messages in thread From: Miguel Ojeda @ 2019-09-05 0:07 UTC (permalink / raw) To: Nick Desaulniers Cc: Rasmus Villemoes, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Joe Perches On Thu, Sep 5, 2019 at 2:00 AM Nick Desaulniers <ndesaulniers@google.com> wrote: > > While you're here, would you mind replacing `__attribute__((unused))` > with `__unused`? I would consider "naked attributes" (haven't been > feature tested in include/linux/compiler_attributes.h and are verbose) > to be an antipattern. +1 We should aim to avoid them entirely where possible. We have __always_unused and __maybe_unused, please choose whatever fits best (both map to "unused", we don't have __unused). Cheers, Miguel ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 2/6] lib/zstd/mem.h: replace __inline by inline 2019-09-05 0:07 ` Miguel Ojeda @ 2019-09-05 9:28 ` Rasmus Villemoes 0 siblings, 0 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-09-05 9:28 UTC (permalink / raw) To: Miguel Ojeda, Nick Desaulniers Cc: maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Joe Perches On 05/09/2019 02.07, Miguel Ojeda wrote: > On Thu, Sep 5, 2019 at 2:00 AM Nick Desaulniers <ndesaulniers@google.com> wrote: >> >> While you're here, would you mind replacing `__attribute__((unused))` >> with `__unused`? I would consider "naked attributes" (haven't been >> feature tested in include/linux/compiler_attributes.h and are verbose) >> to be an antipattern. > > +1 We should aim to avoid them entirely where possible. > > We have __always_unused and __maybe_unused, please choose whatever > fits best (both map to "unused", we don't have __unused). Well, I agree in principle, but was trying to keep this minimal. FTR, if anything, I think the __attribute__((unused)) should simply be removed since it's implied by our (re)definition of inline/__inline/__inline__. Rasmus ^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH v2 3/6] compiler_types.h: don't #define __inline 2019-08-30 23:15 ` [PATCH v2 0/6] " Rasmus Villemoes 2019-08-30 23:15 ` [PATCH v2 1/6] staging: rtl8723bs: replace __inline by inline Rasmus Villemoes 2019-08-30 23:15 ` [PATCH v2 2/6] lib/zstd/mem.h: " Rasmus Villemoes @ 2019-08-30 23:15 ` Rasmus Villemoes 2019-09-05 0:13 ` Nick Desaulniers 2019-08-30 23:15 ` [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition Rasmus Villemoes ` (3 subsequent siblings) 6 siblings, 1 reply; 66+ messages in thread From: Rasmus Villemoes @ 2019-08-30 23:15 UTC (permalink / raw) To: x86, linux-kernel Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, ndesaulniers, Rasmus Villemoes The spellings __inline and __inline__ should be reserved for uses where one really wants to refer to the inline keyword, regardless of whether or not the spelling "inline" has been #defined to something else. Due to use of __inline__ in uapi headers, we can't easily get rid of the definition of __inline__. However, almost all users of __inline has been converted to inline, so we can get rid of that #define. The exception is include/acpi/platform/acintel.h. However, that header is only included when using the intel compiler (does anybody actually build the kernel with that?), and the ACPI_INLINE macro is only used in the definition of utterly trivial stub functions, where I doubt a small change of semantics (lack of __gnu_inline) changes anything. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- include/linux/compiler_types.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index 599c27b56c29..ee49be6d6088 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -150,8 +150,17 @@ struct ftrace_likely_data { __maybe_unused notrace #endif +/* + * gcc provides both __inline__ and __inline as alternate spellings of + * the inline keyword, though the latter is undocumented. New kernel + * code should only use the inline spelling, but some existing code + * uses __inline__. Since we #define inline above, to ensure + * __inline__ has the same semantics, we need this #define. + * + * However, the spelling __inline is strictly reserved for referring + * to the bare keyword. + */ #define __inline__ inline -#define __inline inline /* * Rather then using noinline to prevent stack consumption, use -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* Re: [PATCH v2 3/6] compiler_types.h: don't #define __inline 2019-08-30 23:15 ` [PATCH v2 3/6] compiler_types.h: don't #define __inline Rasmus Villemoes @ 2019-09-05 0:13 ` Nick Desaulniers 2019-09-05 9:45 ` Rasmus Villemoes 0 siblings, 1 reply; 66+ messages in thread From: Nick Desaulniers @ 2019-09-05 0:13 UTC (permalink / raw) To: Rasmus Villemoes Cc: maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda On Fri, Aug 30, 2019 at 4:15 PM Rasmus Villemoes <linux@rasmusvillemoes.dk> wrote: > > The spellings __inline and __inline__ should be reserved for uses > where one really wants to refer to the inline keyword, regardless of > whether or not the spelling "inline" has been #defined to something > else. Due to use of __inline__ in uapi headers, we can't easily get > rid of the definition of __inline__. However, almost all users of > __inline has been converted to inline, so we can get rid of that > #define. Besides patch 1 and 2 of this series, I also see: Documentation/trace/tracepoint-analysis.rst 318: : extern __inline void __attribute__((__gnu_inline__, __always_inline__, _ scripts/kernel-doc 1574: $prototype =~ s/^__inline +//; > > The exception is include/acpi/platform/acintel.h. However, that header > is only included when using the intel compiler (does anybody actually > build the kernel with that?), and the ACPI_INLINE macro is only used In my effort to make the kernel slightly more compiler-portable, I have not yet found anyone building with ICC. I would love to be proven wrong. Let me go ask some of my Intel friends. > in the definition of utterly trivial stub functions, where I doubt a See: include/acpi/platform/acenv.h 146 #elif defined(__INTEL_COMPILER) 147 #include <acpi/platform/acintel.h> > small change of semantics (lack of __gnu_inline) changes anything. include/acpi/platform/acintel.h 25:#define ACPI_INLINE __inline include/acpi/platform/acgcc.h 29:#define ACPI_INLINE __inline__ lol wut I mean, you just would have to change that one line in include/acpi/platform/acintel.h, right? I'd sign off on this patch with such a patch added to the series. > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > --- > include/linux/compiler_types.h | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h > index 599c27b56c29..ee49be6d6088 100644 > --- a/include/linux/compiler_types.h > +++ b/include/linux/compiler_types.h > @@ -150,8 +150,17 @@ struct ftrace_likely_data { > __maybe_unused notrace > #endif > > +/* > + * gcc provides both __inline__ and __inline as alternate spellings of > + * the inline keyword, though the latter is undocumented. New kernel > + * code should only use the inline spelling, but some existing code > + * uses __inline__. Since we #define inline above, to ensure > + * __inline__ has the same semantics, we need this #define. > + * > + * However, the spelling __inline is strictly reserved for referring > + * to the bare keyword. > + */ > #define __inline__ inline > -#define __inline inline > > /* > * Rather then using noinline to prevent stack consumption, use > -- > 2.20.1 > -- Thanks, ~Nick Desaulniers ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 3/6] compiler_types.h: don't #define __inline 2019-09-05 0:13 ` Nick Desaulniers @ 2019-09-05 9:45 ` Rasmus Villemoes 0 siblings, 0 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-09-05 9:45 UTC (permalink / raw) To: Nick Desaulniers Cc: maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda On 05/09/2019 02.13, Nick Desaulniers wrote: > On Fri, Aug 30, 2019 at 4:15 PM Rasmus Villemoes > <linux@rasmusvillemoes.dk> wrote: >> > > Besides patch 1 and 2 of this series, I also see: > Documentation/trace/tracepoint-analysis.rst > 318: : extern __inline void > __attribute__((__gnu_inline__, __always_inline__, _ > That seems to be copy-pasted output from some command, so I won't edit that. > scripts/kernel-doc > 1574: $prototype =~ s/^__inline +//; That one can indeed go once all uses of __inline in the source code is gone. >> The exception is include/acpi/platform/acintel.h. However, that header >> is only included when using the intel compiler (does anybody actually >> build the kernel with that?), and the ACPI_INLINE macro is only used > > In my effort to make the kernel slightly more compiler-portable, I > have not yet found anyone building with ICC. I would love to be > proven wrong. Let me go ask some of my Intel friends. Yeah, the whole compiler-attributes.h only deal with gcc and clang, and a lot of the attributes are unconditionally defined, so I assume either ICC implements them all, or perhaps simply ignores (unknown) attributes? It would be lovely if we could just throw out all the icc stuff. >> in the definition of utterly trivial stub functions, where I doubt a > > See: > include/acpi/platform/acenv.h > 146 #elif defined(__INTEL_COMPILER) > 147 #include <acpi/platform/acintel.h> > >> small change of semantics (lack of __gnu_inline) changes anything. > > include/acpi/platform/acintel.h > 25:#define ACPI_INLINE __inline > include/acpi/platform/acgcc.h > 29:#define ACPI_INLINE __inline__ > > lol wut > > I mean, you just would have to change that one line in > include/acpi/platform/acintel.h, right? I'd sign off on this patch > with such a patch added to the series. I'm not sure what you mean. Just switch the above __inline to inline? It's annoying not being able to test it. Rasmus ^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-08-30 23:15 ` [PATCH v2 0/6] " Rasmus Villemoes ` (2 preceding siblings ...) 2019-08-30 23:15 ` [PATCH v2 3/6] compiler_types.h: don't #define __inline Rasmus Villemoes @ 2019-08-30 23:15 ` Rasmus Villemoes 2019-09-05 0:18 ` Nick Desaulniers 2019-08-30 23:15 ` [PATCH v2 5/6] x86: alternative.h: use asm_inline for all alternative variants Rasmus Villemoes ` (2 subsequent siblings) 6 siblings, 1 reply; 66+ messages in thread From: Rasmus Villemoes @ 2019-08-30 23:15 UTC (permalink / raw) To: x86, linux-kernel Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, ndesaulniers, Rasmus Villemoes This adds an asm_inline macro which expands to "asm inline" [1] when gcc is new enough (>= 9.1), and just asm for older gccs and other compilers. Using asm inline("foo") instead of asm("foo") overrules gcc's heuristic estimate of the size of the code represented by the asm() statement, and makes gcc use the minimum possible size instead. That can in turn affect gcc's inlining decisions. I wasn't sure whether to make this a function-like macro or not - this way, it can be combined with volatile as asm_inline volatile() but perhaps we'd prefer to spell that asm_inline_volatile() anyway. [1] Technically, asm __inline, since both inline and __inline__ are macros that attach various attributes, making gcc barf if one literally does "asm inline()". However, the third spelling __inline is available for referring to the bare keyword. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- include/linux/compiler-gcc.h | 4 ++++ include/linux/compiler_types.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index d7ee4c6bad48..544b87b41b58 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -172,3 +172,7 @@ #endif #define __no_fgcse __attribute__((optimize("-fno-gcse"))) + +#if GCC_VERSION >= 90100 +#define asm_inline asm __inline +#endif diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index ee49be6d6088..ba8d81b716c7 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -198,6 +198,10 @@ struct ftrace_likely_data { #define asm_volatile_goto(x...) asm goto(x) #endif +#ifndef asm_inline +#define asm_inline asm +#endif + #ifndef __no_fgcse # define __no_fgcse #endif -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-08-30 23:15 ` [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition Rasmus Villemoes @ 2019-09-05 0:18 ` Nick Desaulniers 2019-09-05 5:43 ` Nadav Amit 2019-09-05 11:07 ` Rasmus Villemoes 0 siblings, 2 replies; 66+ messages in thread From: Nick Desaulniers @ 2019-09-05 0:18 UTC (permalink / raw) To: Rasmus Villemoes Cc: maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda On Fri, Aug 30, 2019 at 4:15 PM Rasmus Villemoes <linux@rasmusvillemoes.dk> wrote: > > This adds an asm_inline macro which expands to "asm inline" [1] when gcc > is new enough (>= 9.1), and just asm for older gccs and other > compilers. > > Using asm inline("foo") instead of asm("foo") overrules gcc's > heuristic estimate of the size of the code represented by the asm() > statement, and makes gcc use the minimum possible size instead. That > can in turn affect gcc's inlining decisions. > > I wasn't sure whether to make this a function-like macro or not - this > way, it can be combined with volatile as > > asm_inline volatile() > > but perhaps we'd prefer to spell that > > asm_inline_volatile() > > anyway. > > [1] Technically, asm __inline, since both inline and __inline__ > are macros that attach various attributes, making gcc barf if one > literally does "asm inline()". However, the third spelling __inline is > available for referring to the bare keyword. > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > --- > include/linux/compiler-gcc.h | 4 ++++ > include/linux/compiler_types.h | 4 ++++ > 2 files changed, 8 insertions(+) > > diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h > index d7ee4c6bad48..544b87b41b58 100644 > --- a/include/linux/compiler-gcc.h > +++ b/include/linux/compiler-gcc.h > @@ -172,3 +172,7 @@ > #endif > > #define __no_fgcse __attribute__((optimize("-fno-gcse"))) > + > +#if GCC_VERSION >= 90100 Is it too late to ask for a feature test macro? Maybe one already exists? I was not able to find documentation or a bug on `asm inline`. I'm quite curious how you even found or heard of this feature. To the source we must go... > +#define asm_inline asm __inline > +#endif > diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h > index ee49be6d6088..ba8d81b716c7 100644 > --- a/include/linux/compiler_types.h > +++ b/include/linux/compiler_types.h > @@ -198,6 +198,10 @@ struct ftrace_likely_data { > #define asm_volatile_goto(x...) asm goto(x) > #endif > > +#ifndef asm_inline > +#define asm_inline asm > +#endif > + > #ifndef __no_fgcse > # define __no_fgcse > #endif > -- > 2.20.1 > -- Thanks, ~Nick Desaulniers ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-05 0:18 ` Nick Desaulniers @ 2019-09-05 5:43 ` Nadav Amit 2019-09-05 11:07 ` Rasmus Villemoes 1 sibling, 0 replies; 66+ messages in thread From: Nadav Amit @ 2019-09-05 5:43 UTC (permalink / raw) To: Nick Desaulniers Cc: Rasmus Villemoes, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Linus Torvalds, Miguel Ojeda > On Sep 4, 2019, at 5:18 PM, Nick Desaulniers <ndesaulniers@google.com> wrote: > > On Fri, Aug 30, 2019 at 4:15 PM Rasmus Villemoes > <linux@rasmusvillemoes.dk> wrote: >> This adds an asm_inline macro which expands to "asm inline" [1] when gcc >> is new enough (>= 9.1), and just asm for older gccs and other >> compilers. >> >> Using asm inline("foo") instead of asm("foo") overrules gcc's >> heuristic estimate of the size of the code represented by the asm() >> statement, and makes gcc use the minimum possible size instead. That >> can in turn affect gcc's inlining decisions. >> >> I wasn't sure whether to make this a function-like macro or not - this >> way, it can be combined with volatile as >> >> asm_inline volatile() >> >> but perhaps we'd prefer to spell that >> >> asm_inline_volatile() >> >> anyway. >> >> [1] Technically, asm __inline, since both inline and __inline__ >> are macros that attach various attributes, making gcc barf if one >> literally does "asm inline()". However, the third spelling __inline is >> available for referring to the bare keyword. >> >> Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> >> --- >> include/linux/compiler-gcc.h | 4 ++++ >> include/linux/compiler_types.h | 4 ++++ >> 2 files changed, 8 insertions(+) >> >> diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h >> index d7ee4c6bad48..544b87b41b58 100644 >> --- a/include/linux/compiler-gcc.h >> +++ b/include/linux/compiler-gcc.h >> @@ -172,3 +172,7 @@ >> #endif >> >> #define __no_fgcse __attribute__((optimize("-fno-gcse"))) >> + >> +#if GCC_VERSION >= 90100 > > Is it too late to ask for a feature test macro? Maybe one already > exists? I was not able to find documentation or a bug on `asm > inline`. I'm quite curious how you even found or heard of this > feature. To the source we must go... When I had some free time I wrote a detailed blog post about this issue: https://nadav.amit.zone/linux/2018/10/10/newline.html Which later Borislav took to gcc people: https://lore.kernel.org/lkml/20181007091805.GA30687@zn.tnic/ ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-05 0:18 ` Nick Desaulniers 2019-09-05 5:43 ` Nadav Amit @ 2019-09-05 11:07 ` Rasmus Villemoes 2019-09-05 13:45 ` Segher Boessenkool 1 sibling, 1 reply; 66+ messages in thread From: Rasmus Villemoes @ 2019-09-05 11:07 UTC (permalink / raw) To: Nick Desaulniers Cc: maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Miguel Ojeda, gcc-patches On 05/09/2019 02.18, Nick Desaulniers wrote: > On Fri, Aug 30, 2019 at 4:15 PM Rasmus Villemoes > <linux@rasmusvillemoes.dk> wrote: >> >> This adds an asm_inline macro which expands to "asm inline" [1] when gcc >> is new enough (>= 9.1), and just asm for older gccs and other >> compilers. >> >> Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> >> --- >> include/linux/compiler-gcc.h | 4 ++++ >> include/linux/compiler_types.h | 4 ++++ >> 2 files changed, 8 insertions(+) >> >> diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h >> index d7ee4c6bad48..544b87b41b58 100644 >> --- a/include/linux/compiler-gcc.h >> +++ b/include/linux/compiler-gcc.h >> @@ -172,3 +172,7 @@ >> #endif >> >> #define __no_fgcse __attribute__((optimize("-fno-gcse"))) >> + >> +#if GCC_VERSION >= 90100 > > Is it too late to ask for a feature test macro? Maybe one already > exists? No, not as far as I know. Perhaps something like below, though that won't affect the already released gcc 9.1 and 9.2, of course. gcc maintainers, WDYT? Can we add a feature test macro for asm inline()? For context, I'm trying to add an asm_inline macro to the kernel source that will fall back to asm when "asm inline" is not supported - see https://lore.kernel.org/lkml/20190830231527.22304-1-linux@rasmusvillemoes.dk/ for the whole thread. From: Rasmus Villemoes <rv@rasmusvillemoes.dk> Subject: [PATCH] add feature test macro for "asm inline" Allow users to check availability of "asm inline()" via a feature test macro. If and when clang implements support for "asm inline()", it's easier for users if they can just test __HAVE_ASM_INLINE rather than juggling different version checks for different compilers. Changelog: gcc/c-family/ * c-cppbuiltin.c (c_cpp_builtins): Add pre-define for __HAVE_ASM_INLINE. gcc/ * doc/cpp.texi: Document predefine __HAVE_ASM_INLINE. --- gcc/c-family/c-cppbuiltin.c | 3 +++ gcc/doc/cpp.texi | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index fc68bc4d0c4..163f3058741 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -1383,6 +1383,9 @@ c_cpp_builtins (cpp_reader *pfile) if (targetm.have_speculation_safe_value (false)) cpp_define (pfile, "__HAVE_SPECULATION_SAFE_VALUE"); + /* Show the availability of "asm inline()". */ + cpp_define (pfile, "__HAVE_ASM_INLINE"); + #ifdef DWARF2_UNWIND_INFO if (dwarf2out_do_cfi_asm ()) cpp_define (pfile, "__GCC_HAVE_DWARF2_CFI_ASM"); diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi index e271f5180d8..98f6d625857 100644 --- a/gcc/doc/cpp.texi +++ b/gcc/doc/cpp.texi @@ -2386,6 +2386,11 @@ and swap operations on operands 1, 2, 4, 8 or 16 bytes in length, respectively. This macro is defined with the value 1 to show that this version of GCC supports @code{__builtin_speculation_safe_value}. +@item __HAVE_ASM_INLINE +This macro is defined with the value 1 to show that this version of GCC +supports @code{asm inline()}. @xref{Size of an asm,,, gcc, Using +the GNU Compiler Collection (GCC)}. + @item __GCC_HAVE_DWARF2_CFI_ASM This macro is defined when the compiler is emitting DWARF CFI directives to the assembler. When this is defined, it is possible to emit those same ^ permalink raw reply related [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-05 11:07 ` Rasmus Villemoes @ 2019-09-05 13:45 ` Segher Boessenkool 2019-09-05 14:23 ` Rasmus Villemoes 2019-09-05 15:52 ` Miguel Ojeda 0 siblings, 2 replies; 66+ messages in thread From: Segher Boessenkool @ 2019-09-05 13:45 UTC (permalink / raw) To: Rasmus Villemoes Cc: Nick Desaulniers, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Miguel Ojeda, gcc-patches Hi Rasmus, On Thu, Sep 05, 2019 at 01:07:11PM +0200, Rasmus Villemoes wrote: > On 05/09/2019 02.18, Nick Desaulniers wrote: > > Is it too late to ask for a feature test macro? Maybe one already > > exists? > > No, not as far as I know. [ That's not what a feature test macro is; a feature test macro allows the user to select some optional behaviour. Things like _GNU_SOURCE. ] > Perhaps something like below, though that > won't affect the already released gcc 9.1 and 9.2, of course. That is one reason to not want such a predefined macro. Another reason is that you usually need to compile some test programs *anyway*, to see if some bug is present for example, or to see if the exact implementation of the feature is beneficial (or harmful) to your program in some way. > gcc maintainers, WDYT? Can we add a feature test macro for asm inline()? The only comparable existing predefined macro is __PRAGMA_REDEFINE_EXTNAME it seems (no, I have no idea either). Everything else is required by some standard (a "standard standard" or a "vendor standard", I'm lumping everything together here), or shows whether some target has some feature, or how many bits there are in certain types, that kind of thing. Why would GCC want to have macros for all features it has? That would be quite a few new ones every release. And what about bug fixes, are bug fixes features as well? I think you need to solve your configuration problems in your configuration system. Segher ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-05 13:45 ` Segher Boessenkool @ 2019-09-05 14:23 ` Rasmus Villemoes 2019-09-05 14:47 ` Segher Boessenkool 2019-09-05 15:52 ` Miguel Ojeda 1 sibling, 1 reply; 66+ messages in thread From: Rasmus Villemoes @ 2019-09-05 14:23 UTC (permalink / raw) To: Segher Boessenkool Cc: Nick Desaulniers, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Miguel Ojeda, gcc-patches On 05/09/2019 15.45, Segher Boessenkool wrote: > Hi Rasmus, > > On Thu, Sep 05, 2019 at 01:07:11PM +0200, Rasmus Villemoes wrote: >> On 05/09/2019 02.18, Nick Desaulniers wrote: >>> Is it too late to ask for a feature test macro? Maybe one already >>> exists? >> >> No, not as far as I know. > > [ That's not what a feature test macro is; a feature test macro allows the > user to select some optional behaviour. Things like _GNU_SOURCE. ] > >> Perhaps something like below, though that >> won't affect the already released gcc 9.1 and 9.2, of course. > > That is one reason to not want such a predefined macro. Another reason > is that you usually need to compile some test programs *anyway*, to see if > some bug is present for example, or to see if the exact implementation of > the feature is beneficial (or harmful) to your program in some way. OK, I think I'll just use a version check for now, and then switch to a Kconfig test if and when clang grows support. >> gcc maintainers, WDYT? Can we add a feature test macro for asm inline()? > > > Why would GCC want to have macros for all features it has? Well, gcc has implemented __has_attribute() which is similar - one could detect support by compiling a trivial test program. Or the same could be said for many of the predefined macros that are conditionally defined, e.g. __HAVE_SPECULATION_SAFE_VALUE. But I was just throwing the question into the air, I won't pursue this further. Thanks, Rasmus ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-05 14:23 ` Rasmus Villemoes @ 2019-09-05 14:47 ` Segher Boessenkool 0 siblings, 0 replies; 66+ messages in thread From: Segher Boessenkool @ 2019-09-05 14:47 UTC (permalink / raw) To: Rasmus Villemoes Cc: Nick Desaulniers, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, Miguel Ojeda, gcc-patches On Thu, Sep 05, 2019 at 04:23:11PM +0200, Rasmus Villemoes wrote: > On 05/09/2019 15.45, Segher Boessenkool wrote: > > On Thu, Sep 05, 2019 at 01:07:11PM +0200, Rasmus Villemoes wrote: > >> Perhaps something like below, though that > >> won't affect the already released gcc 9.1 and 9.2, of course. > > > > That is one reason to not want such a predefined macro. Another reason > > is that you usually need to compile some test programs *anyway*, to see if > > some bug is present for example, or to see if the exact implementation of > > the feature is beneficial (or harmful) to your program in some way. > > OK, I think I'll just use a version check for now, and then switch to a > Kconfig test if and when clang grows support. > > >> gcc maintainers, WDYT? Can we add a feature test macro for asm inline()? > > > > Why would GCC want to have macros for all features it has? > > Well, gcc has implemented __has_attribute() which is similar - one could > detect support by compiling a trivial test program. It is not a macro, it doesn't spill over the place, and it is for detecting things that are already fixed strings, much easier to do :-) > Or the same could be > said for many of the predefined macros that are conditionally defined, > e.g. __HAVE_SPECULATION_SAFE_VALUE. That one happened because of the Great Security Scare of 2017/2018, it's not a good precedent. And, how it is set is target-specific, it can depend on CPU model selected, target code generation options, or whatnot. > But I was just throwing the question into the air, I won't pursue this > further. Maybe GCC should have a has_feature thing, it might fit in well there. As preprocessor macros, not so much, IMO. Segher ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-05 13:45 ` Segher Boessenkool 2019-09-05 14:23 ` Rasmus Villemoes @ 2019-09-05 15:52 ` Miguel Ojeda 2019-09-05 16:13 ` Miguel Ojeda 2019-09-06 12:23 ` Segher Boessenkool 1 sibling, 2 replies; 66+ messages in thread From: Miguel Ojeda @ 2019-09-05 15:52 UTC (permalink / raw) To: Segher Boessenkool Cc: Rasmus Villemoes, Nick Desaulniers, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches On Thu, Sep 5, 2019 at 3:45 PM Segher Boessenkool <segher@kernel.crashing.org> wrote: > > [ That's not what a feature test macro is; a feature test macro allows the > user to select some optional behaviour. Things like _GNU_SOURCE. ] Yes and no. GNU libc defines feature test macros like you say, but C++'s feature macros are like Rasmus/Nick are saying. I think libc's definition is weird, I would call those "feature selection macros" instead, because the user is selecting between some features (whether to enable or not, for instance), rather than testing for the features. > Why would GCC want to have macros for all features it has? That would be > quite a few new ones every release. Maybe GCC wouldn't, but its users, they surely would. For anything that 1) is a new language feature, 2) breaks backwards-compatibility with previous (or other compilers) and 3) is expected to be used by end users, yes, it would be very useful to have. For the same reasons C++ is adding feature test macros all over the place nowadays and it is considered good practice (see SD-6: SG10 Feature Test Recommendations). Cheers, Miguel ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-05 15:52 ` Miguel Ojeda @ 2019-09-05 16:13 ` Miguel Ojeda 2019-09-06 12:23 ` Segher Boessenkool 1 sibling, 0 replies; 66+ messages in thread From: Miguel Ojeda @ 2019-09-05 16:13 UTC (permalink / raw) To: Segher Boessenkool Cc: Rasmus Villemoes, Nick Desaulniers, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches On Thu, Sep 5, 2019 at 5:52 PM Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> wrote: > > Yes and no. GNU libc defines feature test macros like you say, but > C++'s feature macros are like Rasmus/Nick are saying. I think libc's > definition is weird, I would call those "feature selection macros" > instead, because the user is selecting between some features (whether > to enable or not, for instance), rather than testing for the features. By the way, this is not to criticize libc, I imagine they employed that nomenclature since that is what some standards used, but still, the naming is not great from the users' perspective vs. the header writer's perspective, IMO. Cheers, Miguel ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-05 15:52 ` Miguel Ojeda 2019-09-05 16:13 ` Miguel Ojeda @ 2019-09-06 12:23 ` Segher Boessenkool 2019-09-06 15:13 ` Miguel Ojeda 1 sibling, 1 reply; 66+ messages in thread From: Segher Boessenkool @ 2019-09-06 12:23 UTC (permalink / raw) To: Miguel Ojeda Cc: Rasmus Villemoes, Nick Desaulniers, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches On Thu, Sep 05, 2019 at 05:52:44PM +0200, Miguel Ojeda wrote: > On Thu, Sep 5, 2019 at 3:45 PM Segher Boessenkool > <segher@kernel.crashing.org> wrote: > > > > [ That's not what a feature test macro is; a feature test macro allows the > > user to select some optional behaviour. Things like _GNU_SOURCE. ] > > Yes and no. GNU libc defines feature test macros like you say, but > C++'s feature macros are like Rasmus/Nick are saying. I think libc's I can't find anything with "feature" and "macros" in the C++ standard, it's "predefined macros" there I guess? In C, it is also "predefined macros" in general, and there is "conditional feature macros". > definition is weird, I would call those "feature selection macros" > instead, because the user is selecting between some features (whether > to enable or not, for instance), rather than testing for the features. Sure. But the name is traditional, many decades old, it predates glibc. Using an established name to mean pretty much the opposite of what it normally does is a bit confusing, never mind if that usage makes much sense ;-) Segher ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-06 12:23 ` Segher Boessenkool @ 2019-09-06 15:13 ` Miguel Ojeda 2019-09-06 16:30 ` Segher Boessenkool 0 siblings, 1 reply; 66+ messages in thread From: Miguel Ojeda @ 2019-09-06 15:13 UTC (permalink / raw) To: Segher Boessenkool Cc: Rasmus Villemoes, Nick Desaulniers, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches On Fri, Sep 6, 2019 at 2:23 PM Segher Boessenkool <segher@kernel.crashing.org> wrote: > > I can't find anything with "feature" and "macros" in the C++ standard, > it's "predefined macros" there I guess? In C, it is also "predefined > macros" in general, and there is "conditional feature macros". They are introduced in C++20, but they have been added for a lot of older features in both the language (see [cpp.predefined]p1, around 50 of them) and the library (see [support.limits.general]p3, ~100): http://eel.is/c++draft/cpp.predefined#tab:cpp.predefined.ft http://eel.is/c++draft/support.limits#tab:support.ft > Sure. But the name is traditional, many decades old, it predates glibc. > Using an established name to mean pretty much the opposite of what it > normally does is a bit confusing, never mind if that usage makes much > sense ;-) Agreed on principle :-) However, I wouldn't say it is the opposite. I would say they are the same, but from different perspectives: one says "I want to test if the user enabled the feature", the other says "I want to test if the vendor implemented the feature". Which is fine, but for users the meaning is inverted as you say: in the first case they want to say "I want to enable this feature in this library" -- they don't want to "test" anything. And since most people will be users, not vendors writing standard libraries, I think the user perspective would have been better. Cheers, Miguel ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-06 15:13 ` Miguel Ojeda @ 2019-09-06 16:30 ` Segher Boessenkool 2019-09-06 16:39 ` Jakub Jelinek 2019-09-06 16:47 ` Miguel Ojeda 0 siblings, 2 replies; 66+ messages in thread From: Segher Boessenkool @ 2019-09-06 16:30 UTC (permalink / raw) To: Miguel Ojeda Cc: Rasmus Villemoes, Nick Desaulniers, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches On Fri, Sep 06, 2019 at 05:13:54PM +0200, Miguel Ojeda wrote: > On Fri, Sep 6, 2019 at 2:23 PM Segher Boessenkool > <segher@kernel.crashing.org> wrote: > > I can't find anything with "feature" and "macros" in the C++ standard, > > it's "predefined macros" there I guess? In C, it is also "predefined > > macros" in general, and there is "conditional feature macros". > > They are introduced in C++20, (Which isn't the C++ standard yet, okay). > but they have been added for a lot of > older features in both the language (see [cpp.predefined]p1, around 50 > of them) and the library (see [support.limits.general]p3, ~100): > > http://eel.is/c++draft/cpp.predefined#tab:cpp.predefined.ft > http://eel.is/c++draft/support.limits#tab:support.ft And they spell it "feature-test" there. Lovely :-/ > > Sure. But the name is traditional, many decades old, it predates glibc. > > Using an established name to mean pretty much the opposite of what it > > normally does is a bit confusing, never mind if that usage makes much > > sense ;-) > > Agreed on principle :-) However, I wouldn't say it is the opposite. I > would say they are the same, but from different perspectives: one says > "I want to test if the user enabled the feature", the other says "I > want to test if the vendor implemented the feature". No, that is not what it does. A user defines such a macro, and that makes the library change behaviour. As the GNU C Library manual explains: This system exists to allow the library to conform to multiple standards. Although the different standards are often described as supersets of each other, they are usually incompatible because larger standards require functions with names that smaller ones reserve to the user program. This is not mere pedantry -- it has been a problem in practice. For instance, some non-GNU programs define functions named 'getline' that have nothing to do with this library's 'getline'. They would not be compilable if all features were enabled indiscriminately. https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html Segher ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-06 16:30 ` Segher Boessenkool @ 2019-09-06 16:39 ` Jakub Jelinek 2019-09-06 18:14 ` Nick Desaulniers 2019-09-06 16:47 ` Miguel Ojeda 1 sibling, 1 reply; 66+ messages in thread From: Jakub Jelinek @ 2019-09-06 16:39 UTC (permalink / raw) To: Segher Boessenkool Cc: Miguel Ojeda, Rasmus Villemoes, Nick Desaulniers, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches On Fri, Sep 06, 2019 at 11:30:28AM -0500, Segher Boessenkool wrote: > On Fri, Sep 06, 2019 at 05:13:54PM +0200, Miguel Ojeda wrote: > > On Fri, Sep 6, 2019 at 2:23 PM Segher Boessenkool > > <segher@kernel.crashing.org> wrote: > > > I can't find anything with "feature" and "macros" in the C++ standard, > > > it's "predefined macros" there I guess? In C, it is also "predefined > > > macros" in general, and there is "conditional feature macros". > > > > They are introduced in C++20, > > (Which isn't the C++ standard yet, okay). Well, they have been required by SD-6 before being added to C++20, so we have tons of the predefined macros for C++ already starting with gcc 4.9 or so, but it is something required by the standard so we have to do that. Most of them depend also on compiler options, so can't be easily replaced with a simple __GNUC__ version check. What I'd like to add is that each predefined macro isn't without cost, while adding one predefined macro might not be measurable (though, for some predefined macros (the floating point values) it was very measurable and we had to resort to lazy evaluation of the macros), adding hundreds of predefined macros is measurable, affects the speed of empty compiler run, adds size of -g3 produced debug info, increases size of -E -dD output etc. Jakub ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-06 16:39 ` Jakub Jelinek @ 2019-09-06 18:14 ` Nick Desaulniers 2019-09-06 22:03 ` Segher Boessenkool 0 siblings, 1 reply; 66+ messages in thread From: Nick Desaulniers @ 2019-09-06 18:14 UTC (permalink / raw) To: Jakub Jelinek Cc: Segher Boessenkool, Miguel Ojeda, Rasmus Villemoes, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches, clang-built-linux On Fri, Sep 6, 2019 at 9:39 AM Jakub Jelinek <jakub@redhat.com> wrote: > > On Fri, Sep 06, 2019 at 11:30:28AM -0500, Segher Boessenkool wrote: > > On Fri, Sep 06, 2019 at 05:13:54PM +0200, Miguel Ojeda wrote: > > > On Fri, Sep 6, 2019 at 2:23 PM Segher Boessenkool > > > <segher@kernel.crashing.org> wrote: > > > > I can't find anything with "feature" and "macros" in the C++ standard, > > > > it's "predefined macros" there I guess? In C, it is also "predefined > > > > macros" in general, and there is "conditional feature macros". > > > > > > They are introduced in C++20, > > > > (Which isn't the C++ standard yet, okay). > > Well, they have been required by SD-6 before being added to C++20, so we > have tons of the predefined macros for C++ already starting with gcc 4.9 or > so, but it is something required by the standard so we have to do that. > Most of them depend also on compiler options, so can't be easily replaced > with a simple __GNUC__ version check. > > What I'd like to add is that each predefined macro isn't without cost, > while adding one predefined macro might not be measurable (though, for > some predefined macros (the floating point values) it was very measurable > and we had to resort to lazy evaluation of the macros), adding hundreds of > predefined macros is measurable, affects the speed of empty compiler run, > adds size of -g3 produced debug info, increases size of -E -dD output etc. > > Jakub Here's the case that I think is perfect: https://developers.redhat.com/blog/2016/02/25/new-asm-flags-feature-for-x86-in-gcc-6/ Specifically the feature test preprocessor define __GCC_ASM_FLAG_OUTPUTS__. See exactly how we handle it in the kernel: - https://github.com/ClangBuiltLinux/linux/blob/0445971000375859008414f87e7c72fa0d809cf8/arch/x86/include/asm/asm.h#L112-L118 - https://github.com/ClangBuiltLinux/linux/blob/0445971000375859008414f87e7c72fa0d809cf8/arch/x86/include/asm/rmwcc.h#L14-L30 Feature detection of the feature makes it trivial to detect when the feature is supported, rather than brittle compiler version checks. Had it been a GCC version check, it wouldn't work for clang out of the box when clang added support for __GCC_ASM_FLAG_OUTPUTS__. But since we had the helpful __GCC_ASM_FLAG_OUTPUTS__, and wisely based our use of the feature on that preprocessor define, the code ***just worked*** for compilers that didn't support the feature ***and*** compilers when they did support the feature ***without changing any of the source code*** being compiled. All I'm asking for is that when GCC adds a new GNU C extension (such as `asm inline`), define a new preprocessor symbol (like has already been done w/ __GCC_ASM_FLAG_OUTPUTS__), so that we don't have to use version checking (or reimplementing autoconf) and use feature detection instead. This simplifies use of this feature even between codebases supporting multiple versions of GCC. (Also, I'm guessing the cost of another preprocessor define is near zero compared to parsing comments for -Wimplicit-fallthrough) -- Thanks, ~Nick Desaulniers ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-06 18:14 ` Nick Desaulniers @ 2019-09-06 22:03 ` Segher Boessenkool 2019-09-06 22:35 ` Nick Desaulniers 0 siblings, 1 reply; 66+ messages in thread From: Segher Boessenkool @ 2019-09-06 22:03 UTC (permalink / raw) To: Nick Desaulniers Cc: Jakub Jelinek, Miguel Ojeda, Rasmus Villemoes, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches, clang-built-linux On Fri, Sep 06, 2019 at 11:14:08AM -0700, Nick Desaulniers wrote: > Here's the case that I think is perfect: > https://developers.redhat.com/blog/2016/02/25/new-asm-flags-feature-for-x86-in-gcc-6/ > > Specifically the feature test preprocessor define __GCC_ASM_FLAG_OUTPUTS__. > > See exactly how we handle it in the kernel: > - https://github.com/ClangBuiltLinux/linux/blob/0445971000375859008414f87e7c72fa0d809cf8/arch/x86/include/asm/asm.h#L112-L118 > - https://github.com/ClangBuiltLinux/linux/blob/0445971000375859008414f87e7c72fa0d809cf8/arch/x86/include/asm/rmwcc.h#L14-L30 > > Feature detection of the feature makes it trivial to detect when the > feature is supported, rather than brittle compiler version checks. > Had it been a GCC version check, it wouldn't work for clang out of the > box when clang added support for __GCC_ASM_FLAG_OUTPUTS__. But since > we had the helpful __GCC_ASM_FLAG_OUTPUTS__, and wisely based our use > of the feature on that preprocessor define, the code ***just worked*** > for compilers that didn't support the feature ***and*** compilers when > they did support the feature ***without changing any of the source > code*** being compiled. And if instead you tested whether the actual feature you need works as you need it to, it would even work fine if there was a bug we fixed that breaks things for the kernel. Without needing a new compiler. Or as another example, if we added support for some other flags. (x86 has only a few flags; many other archs have many more, and in some cases newer hardware actually has more flags than older). With the "macro" scheme we would need to add new macros in all these cases. And since those are target-specific macros, that quickly expands beyond reasonable bounds. If you want to know if you can do X in some environment, just try to do X. Segher ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-06 22:03 ` Segher Boessenkool @ 2019-09-06 22:35 ` Nick Desaulniers 2019-09-06 22:56 ` Segher Boessenkool 0 siblings, 1 reply; 66+ messages in thread From: Nick Desaulniers @ 2019-09-06 22:35 UTC (permalink / raw) To: Segher Boessenkool, Jakub Jelinek, Rasmus Villemoes Cc: Miguel Ojeda, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches, clang-built-linux On Fri, Sep 6, 2019 at 3:03 PM Segher Boessenkool <segher@kernel.crashing.org> wrote: > > On Fri, Sep 06, 2019 at 11:14:08AM -0700, Nick Desaulniers wrote: > > Here's the case that I think is perfect: > > https://developers.redhat.com/blog/2016/02/25/new-asm-flags-feature-for-x86-in-gcc-6/ > > > > Specifically the feature test preprocessor define __GCC_ASM_FLAG_OUTPUTS__. > > > > See exactly how we handle it in the kernel: > > - https://github.com/ClangBuiltLinux/linux/blob/0445971000375859008414f87e7c72fa0d809cf8/arch/x86/include/asm/asm.h#L112-L118 > > - https://github.com/ClangBuiltLinux/linux/blob/0445971000375859008414f87e7c72fa0d809cf8/arch/x86/include/asm/rmwcc.h#L14-L30 > > > > Feature detection of the feature makes it trivial to detect when the > > feature is supported, rather than brittle compiler version checks. > > Had it been a GCC version check, it wouldn't work for clang out of the > > box when clang added support for __GCC_ASM_FLAG_OUTPUTS__. But since > > we had the helpful __GCC_ASM_FLAG_OUTPUTS__, and wisely based our use > > of the feature on that preprocessor define, the code ***just worked*** > > for compilers that didn't support the feature ***and*** compilers when > > they did support the feature ***without changing any of the source > > code*** being compiled. > > And if instead you tested whether the actual feature you need works as > you need it to, it would even work fine if there was a bug we fixed that > breaks things for the kernel. Without needing a new compiler. That assumes a feature is broken out of the gate and is putting the cart before the horse. If a feature is available, it should work. If you later find it to be unsatisfactory, sure go out of your way to add ugly compiler-specific version checks or upgrade your minimally supported toolchain; until then feature detection is much cleaner (see again __GCC_ASM_FLAG_OUTPUTS__). > > Or as another example, if we added support for some other flags. (x86 > has only a few flags; many other archs have many more, and in some cases > newer hardware actually has more flags than older). I think compiler flags are orthogonal to GNU C extensions we're discussing here. > > With the "macro" scheme we would need to add new macros in all these > cases. And since those are target-specific macros, that quickly expands > beyond reasonable bounds. I don't think so. Can you show me an example codebase that proves me wrong? > > If you want to know if you can do X in some environment, just try to do X. That's a very autoconf centric viewpoint. Why doesn't the kernel take that approach for __GCC_ASM_FLAG_OUTPUTS__? Why not repeatedly invoke $CC to find if every compiler __attribute__ is supported? Do you think it's faster for the C preprocessor to check for a few #ifdefs, or to repeatedly invoke $CC at build or compile time to detect new features? -- Thanks, ~Nick Desaulniers ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-06 22:35 ` Nick Desaulniers @ 2019-09-06 22:56 ` Segher Boessenkool 2019-09-06 23:42 ` Nick Desaulniers 0 siblings, 1 reply; 66+ messages in thread From: Segher Boessenkool @ 2019-09-06 22:56 UTC (permalink / raw) To: Nick Desaulniers Cc: Jakub Jelinek, Rasmus Villemoes, Miguel Ojeda, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches, clang-built-linux On Fri, Sep 06, 2019 at 03:35:02PM -0700, Nick Desaulniers wrote: > On Fri, Sep 6, 2019 at 3:03 PM Segher Boessenkool > <segher@kernel.crashing.org> wrote: > > And if instead you tested whether the actual feature you need works as > > you need it to, it would even work fine if there was a bug we fixed that > > breaks things for the kernel. Without needing a new compiler. > > That assumes a feature is broken out of the gate and is putting the > cart before the horse. If a feature is available, it should work. GCC currently has 91696 bug reports. > > Or as another example, if we added support for some other flags. (x86 > > has only a few flags; many other archs have many more, and in some cases > > newer hardware actually has more flags than older). > > I think compiler flags are orthogonal to GNU C extensions we're discussing here. No, I am talking exactly about what you brought up. The flags output for inline assembler, using the =@ syntax. If I had implemented that for Power when it first came up, I would by now have had to add support for another flag (the CA32 flag). Oh, and I would not have implemented support for OV or SO at all originally, but perhaps they are useful, so let's add that as well. And there is OV32 now as well. > > With the "macro" scheme we would need to add new macros in all these > > cases. And since those are target-specific macros, that quickly expands > > beyond reasonable bounds. > > I don't think so. Can you show me an example codebase that proves me wrong? No, of course not, because we aren't silly enough to implement something like that. > > If you want to know if you can do X in some environment, just try to do X. > > That's a very autoconf centric viewpoint. Why doesn't the kernel take > that approach for __GCC_ASM_FLAG_OUTPUTS__? Ask them, not me. Segher ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-06 22:56 ` Segher Boessenkool @ 2019-09-06 23:42 ` Nick Desaulniers 2019-09-07 0:14 ` Segher Boessenkool 0 siblings, 1 reply; 66+ messages in thread From: Nick Desaulniers @ 2019-09-06 23:42 UTC (permalink / raw) To: Segher Boessenkool Cc: Jakub Jelinek, Rasmus Villemoes, Miguel Ojeda, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches, clang-built-linux On Fri, Sep 6, 2019 at 3:56 PM Segher Boessenkool <segher@kernel.crashing.org> wrote: > > On Fri, Sep 06, 2019 at 03:35:02PM -0700, Nick Desaulniers wrote: > > On Fri, Sep 6, 2019 at 3:03 PM Segher Boessenkool > > <segher@kernel.crashing.org> wrote: > > > And if instead you tested whether the actual feature you need works as > > > you need it to, it would even work fine if there was a bug we fixed that > > > breaks things for the kernel. Without needing a new compiler. > > > > That assumes a feature is broken out of the gate and is putting the > > cart before the horse. If a feature is available, it should work. > > GCC currently has 91696 bug reports. Fair. > > > > Or as another example, if we added support for some other flags. (x86 > > > has only a few flags; many other archs have many more, and in some cases > > > newer hardware actually has more flags than older). > > > > I think compiler flags are orthogonal to GNU C extensions we're discussing here. > > No, I am talking exactly about what you brought up. The flags output > for inline assembler, using the =@ syntax. If I had implemented that > for Power when it first came up, I would by now have had to add support > for another flag (the CA32 flag). Oh, and I would not have implemented > support for OV or SO at all originally, but perhaps they are useful, so > let's add that as well. And there is OV32 now as well. Oh, I misunderstood. I see your point. Define the symbol as a number for what level of output flags you support (ie. the __cplusplus macro). > > > > With the "macro" scheme we would need to add new macros in all these > > > cases. And since those are target-specific macros, that quickly expands > > > beyond reasonable bounds. > > > > I don't think so. Can you show me an example codebase that proves me wrong? > > No, of course not, because we aren't silly enough to implement something > like that. I still don't think feature detection is worse than version detection (until you find your feature broken in a way that forces the use of version detection). Just to prove my point about version checks being brittle, it looks like Rasmus' version check isn't even right. GCC supported `asm inline` back in the 8.3 release, not 9.1 as in this patch: https://godbolt.org/z/1woitS . So users of gcc-8.2 and gcc-8.3 wouldn't be able to take advantage of `asm inline` even though their compiler supported it. Or was it "broken" until 9.1? Lord knows, as `asm inline` wasn't in any release notes or bug reports I can find: 8: https://gcc.gnu.org/gcc-8/changes.html 9: https://gcc.gnu.org/gcc-9/changes.html Bug tracker query: https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=SUSPENDED&bug_status=WAITING&bug_status=REOPENED&cf_known_to_fail_type=allwords&cf_known_to_work_type=allwords&query_format=advanced&short_desc=asm%20inline&short_desc_type=anywordssubstr Ah, here it is: https://github.com/gcc-mirror/gcc/commit/6de46ad5326fc5e6b730a2feb8c62d09c1561f92 Which looks like the qualifier was added to this page: https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html I like many of the GNU C extensions, and I want to help support them in Clang so that they can be used in more places, but the current process (and questions I have when I implement some of them) leaves me with the sense that there's probably room for improvement on some of these things before they go out the door. Segher, next time there's discussion about new C extensions for the kernel, can you please include me in the discussions? -- Thanks, ~Nick Desaulniers ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-06 23:42 ` Nick Desaulniers @ 2019-09-07 0:14 ` Segher Boessenkool 2019-09-07 1:04 ` Nick Desaulniers 0 siblings, 1 reply; 66+ messages in thread From: Segher Boessenkool @ 2019-09-07 0:14 UTC (permalink / raw) To: Nick Desaulniers Cc: Jakub Jelinek, Rasmus Villemoes, Miguel Ojeda, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches, clang-built-linux On Fri, Sep 06, 2019 at 04:42:58PM -0700, Nick Desaulniers via gcc-patches wrote: > On Fri, Sep 6, 2019 at 3:56 PM Segher Boessenkool > <segher@kernel.crashing.org> wrote: > Oh, I misunderstood. I see your point. Define the symbol as a number > for what level of output flags you support (ie. the __cplusplus > macro). That works if history is linear. I guess with enough effort we can make that work in most cases (for backports it is a problem, if you want to support a new feature -- or bugfix! -- you need to support all previous ones as well... Distros are going to hate us, too ;-) ) > > > I don't think so. Can you show me an example codebase that proves me wrong? > > > > No, of course not, because we aren't silly enough to implement something > > like that. > > I still don't think feature detection is worse than version detection > (until you find your feature broken in a way that forces the use of > version detection). *You* bring up version detection. I don't. You want some halfway thing, with some macros that say what version some part of your compiler is. I say to just detect the feature you want, and if it actually works the way you want it, etc. > Just to prove my point about version checks being brittle, it looks > like Rasmus' version check isn't even right. GCC supported `asm > inline` back in the 8.3 release, not 9.1 as in this patch: Yes, I backported it so that it is available in 7.5, 8.3, and 9.1, so that more users will have this available sooner. (7.5 has not been released yet, but asm inline has been supported in GCC 7 since Jan 2 this year). > Or was it "broken" until 9.1? Lord knows, as `asm inline` wasn't in > any release notes or bug reports I can find: https://gcc.gnu.org/ml/gcc-patches/2019-02/msg01143.html It never was accepted, and I dropped the ball. > Ah, here it is: > https://github.com/gcc-mirror/gcc/commit/6de46ad5326fc5e6b730a2feb8c62d09c1561f92 > Which looks like the qualifier was added to this page: > https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html Sure, it is part of the documentation just fine. And it works just fine too, it is a *very* simple feature. By design. > I like many of the GNU C extensions, and I want to help support them > in Clang so that they can be used in more places, but the current > process (and questions I have when I implement some of them) leaves me > with the sense that there's probably room for improvement on some of > these things before they go out the door. > > Segher, next time there's discussion about new C extensions for the > kernel, can you please include me in the discussions? You can lurk on gcc-patches@ and/or gcc@? But I'll try to remember, sure. Not that I am involved in all such discussions myself, mind. Segher ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-07 0:14 ` Segher Boessenkool @ 2019-09-07 1:04 ` Nick Desaulniers 2019-09-07 13:11 ` Segher Boessenkool 0 siblings, 1 reply; 66+ messages in thread From: Nick Desaulniers @ 2019-09-07 1:04 UTC (permalink / raw) To: Segher Boessenkool Cc: Jakub Jelinek, Rasmus Villemoes, Miguel Ojeda, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches, clang-built-linux On Fri, Sep 6, 2019 at 5:14 PM Segher Boessenkool <segher@kernel.crashing.org> wrote: > > On Fri, Sep 06, 2019 at 04:42:58PM -0700, Nick Desaulniers via gcc-patches wrote: > > Just to prove my point about version checks being brittle, it looks > > like Rasmus' version check isn't even right. GCC supported `asm > > inline` back in the 8.3 release, not 9.1 as in this patch: > > Yes, I backported it so that it is available in 7.5, 8.3, and 9.1, so > that more users will have this available sooner. (7.5 has not been > released yet, but asm inline has been supported in GCC 7 since Jan 2 > this year). Ah, ok that makes sense. How would you even write a version check for that? Which looks better? #if __GNU_MAJOR__ > 9 || __GNU_MAJOR__ == 8 && __GNU_MINOR__ >= 3 || __GNU_MAJOR__ == 7 && __GNU_MINOR__ >= 5 || __CLANG_MAJOR__ == 42 // make use of `asm inline` #endif or #ifdef __CC_HAS_ASM_INLINE__ // make use of `asm inline` #endif > > > Or was it "broken" until 9.1? Lord knows, as `asm inline` wasn't in > > any release notes or bug reports I can find: > > https://gcc.gnu.org/ml/gcc-patches/2019-02/msg01143.html > > It never was accepted, and I dropped the ball. Ah, ok, that's fine, so documentation was at least written. Tracking when and where patches land (or don't) is difficult when patch files are emailed around. I try to keep track of when and where our kernel patches land, but I frequently drop the ball there. > > Segher, next time there's discussion about new C extensions for the > > kernel, can you please include me in the discussions? > > You can lurk on gcc-patches@ and/or gcc@? Please "interrupt" me when you're aware of such discussions, rather than me "polling" a mailing list. (I will buy you a tasty beverage of your preference). I'm already subscribed to more mailing lists than I have time to read. > But I'll try to remember, sure. > Not that I am involved in all such discussions myself, mind. But you _did_ implement `asm inline`. ;) -- Thanks, ~Nick Desaulniers ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-07 1:04 ` Nick Desaulniers @ 2019-09-07 13:11 ` Segher Boessenkool 2019-09-08 13:55 ` Miguel Ojeda 2019-09-12 21:54 ` Nick Desaulniers 0 siblings, 2 replies; 66+ messages in thread From: Segher Boessenkool @ 2019-09-07 13:11 UTC (permalink / raw) To: Nick Desaulniers Cc: Jakub Jelinek, Rasmus Villemoes, Miguel Ojeda, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches, clang-built-linux On Fri, Sep 06, 2019 at 06:04:54PM -0700, Nick Desaulniers wrote: > On Fri, Sep 6, 2019 at 5:14 PM Segher Boessenkool > <segher@kernel.crashing.org> wrote: > > On Fri, Sep 06, 2019 at 04:42:58PM -0700, Nick Desaulniers via gcc-patches wrote: > > > Just to prove my point about version checks being brittle, it looks > > > like Rasmus' version check isn't even right. GCC supported `asm > > > inline` back in the 8.3 release, not 9.1 as in this patch: > > > > Yes, I backported it so that it is available in 7.5, 8.3, and 9.1, so > > that more users will have this available sooner. (7.5 has not been > > released yet, but asm inline has been supported in GCC 7 since Jan 2 > > this year). > > Ah, ok that makes sense. > > How would you even write a version check for that? I wouldn't. Please stop using that straw man. I'm not saying version checks are good, or useful for most things. I am saying they are not. Predefined compiler symbols to do version checking (of a feature) is just a lesser instance of the same problem though. (And it causes its own more or less obvious problems as well). > > > Or was it "broken" until 9.1? Lord knows, as `asm inline` wasn't in > > > any release notes or bug reports I can find: > > > > https://gcc.gnu.org/ml/gcc-patches/2019-02/msg01143.html > > > > It never was accepted, and I dropped the ball. > > Ah, ok, that's fine, so documentation was at least written. Tracking > when and where patches land (or don't) is difficult when patch files > are emailed around. I try to keep track of when and where our kernel > patches land, but I frequently drop the ball there. I keep track of most things just fine... But the release notes are part of our web content, which is in a separate CVS repository (still nicer than SVN :-) ), and since I don't use it very often it falls outside of all my normal procedures. > your preference). I'm already subscribed to more mailing lists than I > have time to read. > > > But I'll try to remember, sure. > > Not that I am involved in all such discussions myself, mind. > > But you _did_ implement `asm inline`. ;) That started as just + /* If this asm is asm inline, count anything as minimum size. */ + if (gimple_asm_inline_p (as_a <gasm *> (stmt))) + count = MIN (1, count); (in estimate_num_insns) but then things ballooned. Like such things do. Segher ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-07 13:11 ` Segher Boessenkool @ 2019-09-08 13:55 ` Miguel Ojeda 2019-09-12 21:54 ` Nick Desaulniers 1 sibling, 0 replies; 66+ messages in thread From: Miguel Ojeda @ 2019-09-08 13:55 UTC (permalink / raw) To: Segher Boessenkool Cc: Nick Desaulniers, Jakub Jelinek, Rasmus Villemoes, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches, clang-built-linux On Sat, Sep 7, 2019 at 3:11 PM Segher Boessenkool <segher@kernel.crashing.org> wrote: > > I wouldn't. Please stop using that straw man. I'm not saying version > checks are good, or useful for most things. I am saying they are not. > > Predefined compiler symbols to do version checking (of a feature) is > just a lesser instance of the same problem though. (And it causes its > own more or less obvious problems as well). That is fair enough, but what are you suggesting we use, then? Because "testing to do X to know if you can do X" cannot work with source code alone and implies each project has to redo this work in its build system for each compiler, plus each project ends up with different names for these macros. The C++20 approach of having standardized macros for major features is way better (whether we have one macro per feature or a __has_feature(X) macro). Note this does not mean we need to take this to the extreme and have a feature-test macro for *every* feature, bugfix or behavior change as a macro. Cheers, Miguel ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-07 13:11 ` Segher Boessenkool 2019-09-08 13:55 ` Miguel Ojeda @ 2019-09-12 21:54 ` Nick Desaulniers 2019-09-12 22:12 ` Rasmus Villemoes 2019-09-20 0:50 ` Segher Boessenkool 1 sibling, 2 replies; 66+ messages in thread From: Nick Desaulniers @ 2019-09-12 21:54 UTC (permalink / raw) To: Segher Boessenkool Cc: Jakub Jelinek, Rasmus Villemoes, Miguel Ojeda, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches, clang-built-linux On Sat, Sep 7, 2019 at 6:11 AM Segher Boessenkool <segher@kernel.crashing.org> wrote: > > On Fri, Sep 06, 2019 at 06:04:54PM -0700, Nick Desaulniers wrote: > > On Fri, Sep 6, 2019 at 5:14 PM Segher Boessenkool > > <segher@kernel.crashing.org> wrote: > > > On Fri, Sep 06, 2019 at 04:42:58PM -0700, Nick Desaulniers via gcc-patches wrote: > > > > Just to prove my point about version checks being brittle, it looks > > > > like Rasmus' version check isn't even right. GCC supported `asm > > > > inline` back in the 8.3 release, not 9.1 as in this patch: > > > > > > Yes, I backported it so that it is available in 7.5, 8.3, and 9.1, so > > > that more users will have this available sooner. (7.5 has not been > > > released yet, but asm inline has been supported in GCC 7 since Jan 2 > > > this year). > > > > Ah, ok that makes sense. > > > > How would you even write a version check for that? > > I wouldn't. Please stop using that straw man. I'm not saying version > checks are good, or useful for most things. I am saying they are not. Then please help Rasmus with a suggestion on how best to detect and safely make use of the feature you implemented. As is, the patch in question is using version checks. > > Predefined compiler symbols to do version checking (of a feature) is > just a lesser instance of the same problem though. (And it causes its > own more or less obvious problems as well). > > > > > Or was it "broken" until 9.1? Lord knows, as `asm inline` wasn't in > > > > any release notes or bug reports I can find: > > > > > > https://gcc.gnu.org/ml/gcc-patches/2019-02/msg01143.html > > > > > > It never was accepted, and I dropped the ball. > > > > Ah, ok, that's fine, so documentation was at least written. Tracking > > when and where patches land (or don't) is difficult when patch files > > are emailed around. I try to keep track of when and where our kernel > > patches land, but I frequently drop the ball there. > > I keep track of most things just fine... But the release notes are part > of our web content, which is in a separate CVS repository (still nicer > than SVN :-) ), and since I don't use it very often it falls outside of > all my normal procedures. > > > your preference). I'm already subscribed to more mailing lists than I > > have time to read. > > > > > But I'll try to remember, sure. > > > Not that I am involved in all such discussions myself, mind. > > > > But you _did_ implement `asm inline`. ;) > > That started as just > > + /* If this asm is asm inline, count anything as minimum size. */ > + if (gimple_asm_inline_p (as_a <gasm *> (stmt))) > + count = MIN (1, count); > > (in estimate_num_insns) but then things ballooned. Like such things do. So I'm not convinced this GNU C extension solves the problem it's described to be used for. I agree that current implementations in multiple compilers is imprecise, and leads to developer headaches. I think `asm inline` will help in cases where vanilla `asm` overestimates the size of inline assembly, but I also think it will be just as bad as vanilla `asm` in cases where the size is underestimated. I have seen instances where instruction selection fails to select the appropriate way to branch when inline asm size is misjudged, resulting in un-encodeable jumps (as in the branch target is too far to be encoded in the number of bits of a single jump/branch instruction). And the use of .pushsection/.popsection assembler directives and __attribute__((section())) attributes complicates the accounting further, as you can then place code from the inline assembly in a different section than the function itself (so that inline assembly doesn't affect the function's size, and the implications on inlining the function). That would cause vanilla `asm` to overestimate size. (I suspect variable length encoded instruction sets also suffer from misaccounting). Short of invoking the assembler itself, and then matching the byte size of generated code section that matches the function's section, can you accurately describe the size of inline assembly. .macro and .rept assembler directives really complicate estimates and can cause vanilla `asm` to underestimate size. I agree that current implementations in multiple compilers is imprecise, and leads to developer headaches. Rather than give developers the ability to choose between 2 different heuristics that are both imprecise, why not make the existing heuristic (ie. vanilla `asm`) more precise in its measure? -- Thanks, ~Nick Desaulniers ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-12 21:54 ` Nick Desaulniers @ 2019-09-12 22:12 ` Rasmus Villemoes 2019-09-20 0:50 ` Segher Boessenkool 1 sibling, 0 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-09-12 22:12 UTC (permalink / raw) To: Nick Desaulniers, Segher Boessenkool Cc: Jakub Jelinek, Miguel Ojeda, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches, clang-built-linux, Masahiro Yamada On 12/09/2019 23.54, Nick Desaulniers wrote: > On Sat, Sep 7, 2019 at 6:11 AM Segher Boessenkool > <segher@kernel.crashing.org> wrote: >> >> On Fri, Sep 06, 2019 at 06:04:54PM -0700, Nick Desaulniers wrote: >> >>> How would you even write a version check for that? >> >> I wouldn't. Please stop using that straw man. I'm not saying version >> checks are good, or useful for most things. I am saying they are not. > > Then please help Rasmus with a suggestion on how best to detect and > safely make use of the feature you implemented. As is, the patch in > question is using version checks. I was just about to send out an updated version. I'm just going to do the check in Kconfig - I didn't realize how easy it had become to do that kind of thing until Masahiro pointed me at his RFC patch from December. Rasmus ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-12 21:54 ` Nick Desaulniers 2019-09-12 22:12 ` Rasmus Villemoes @ 2019-09-20 0:50 ` Segher Boessenkool 1 sibling, 0 replies; 66+ messages in thread From: Segher Boessenkool @ 2019-09-20 0:50 UTC (permalink / raw) To: Nick Desaulniers Cc: Jakub Jelinek, Rasmus Villemoes, Miguel Ojeda, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches, clang-built-linux On Thu, Sep 12, 2019 at 02:54:50PM -0700, Nick Desaulniers wrote: > I have seen instances where instruction selection fails to select the > appropriate way to branch when inline asm size is misjudged, resulting > in un-encodeable jumps (as in the branch target is too far to be > encoded in the number of bits of a single jump/branch instruction). "asm inline" *only* influences the estimated size *for inlining purposes*. Not for anything else. Everything else still uses conservative estimates. Segher ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition 2019-09-06 16:30 ` Segher Boessenkool 2019-09-06 16:39 ` Jakub Jelinek @ 2019-09-06 16:47 ` Miguel Ojeda 1 sibling, 0 replies; 66+ messages in thread From: Miguel Ojeda @ 2019-09-06 16:47 UTC (permalink / raw) To: Segher Boessenkool Cc: Rasmus Villemoes, Nick Desaulniers, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), LKML, gcc-patches On Fri, Sep 6, 2019 at 6:30 PM Segher Boessenkool <segher@kernel.crashing.org> wrote: > > (Which isn't the C++ standard yet, okay). At this stage, it pretty much is. It is basically bug fixing at this point. > No, that is not what it does. A user defines such a macro, and that > makes the library change behaviour. That is what I have said: "I want to test if the user enabled the feature" means the *library* tests if the user enabled the feature before including the library. But the user does not want to test anything. Cheers, Miguel ^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH v2 5/6] x86: alternative.h: use asm_inline for all alternative variants 2019-08-30 23:15 ` [PATCH v2 0/6] " Rasmus Villemoes ` (3 preceding siblings ...) 2019-08-30 23:15 ` [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition Rasmus Villemoes @ 2019-08-30 23:15 ` Rasmus Villemoes 2019-08-30 23:15 ` [PATCH v2 6/6] x86: bug.h: use asm_inline in _BUG_FLAGS definitions Rasmus Villemoes 2019-09-12 22:19 ` [PATCH v3 0/6] make use of gcc 9's "asm inline()" Rasmus Villemoes 6 siblings, 0 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-08-30 23:15 UTC (permalink / raw) To: x86, linux-kernel Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, ndesaulniers, Rasmus Villemoes Most, if not all, uses of the alternative* family just provide one or two instructions in .text, but the string literal can be quite large, causing gcc to overestimate the size of the generated code. That in turn affects its decisions about inlining of the function containing the alternative() asm statement. gcc >= 9.1 allows one to overrule the estimated size by using "asm inline" instead of just "asm". So replace asm by the helper asm_inline, which for older gccs just expands to asm. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- arch/x86/include/asm/alternative.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index 094fbc9c0b1c..13adca37c99a 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -201,10 +201,10 @@ static inline int alternatives_text_reserved(void *start, void *end) * without volatile and memory clobber. */ #define alternative(oldinstr, newinstr, feature) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) : : : "memory") + asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, feature) : : : "memory") #define alternative_2(oldinstr, newinstr1, feature1, newinstr2, feature2) \ - asm volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2) ::: "memory") + asm_inline volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2) ::: "memory") /* * Alternative inline assembly with input. @@ -218,7 +218,7 @@ static inline int alternatives_text_reserved(void *start, void *end) * Leaving an unused argument 0 to keep API compatibility. */ #define alternative_input(oldinstr, newinstr, feature, input...) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ + asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ : : "i" (0), ## input) /* @@ -231,18 +231,18 @@ static inline int alternatives_text_reserved(void *start, void *end) */ #define alternative_input_2(oldinstr, newinstr1, feature1, newinstr2, \ feature2, input...) \ - asm volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ + asm_inline volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ newinstr2, feature2) \ : : "i" (0), ## input) /* Like alternative_input, but with a single output argument */ #define alternative_io(oldinstr, newinstr, feature, output, input...) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ + asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ : output : "i" (0), ## input) /* Like alternative_io, but for replacing a direct call with another one. */ #define alternative_call(oldfunc, newfunc, feature, output, input...) \ - asm volatile (ALTERNATIVE("call %P[old]", "call %P[new]", feature) \ + asm_inline volatile (ALTERNATIVE("call %P[old]", "call %P[new]", feature) \ : output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input) /* @@ -253,7 +253,7 @@ static inline int alternatives_text_reserved(void *start, void *end) */ #define alternative_call_2(oldfunc, newfunc1, feature1, newfunc2, feature2, \ output, input...) \ - asm volatile (ALTERNATIVE_2("call %P[old]", "call %P[new1]", feature1,\ + asm_inline volatile (ALTERNATIVE_2("call %P[old]", "call %P[new1]", feature1,\ "call %P[new2]", feature2) \ : output, ASM_CALL_CONSTRAINT \ : [old] "i" (oldfunc), [new1] "i" (newfunc1), \ -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* [PATCH v2 6/6] x86: bug.h: use asm_inline in _BUG_FLAGS definitions 2019-08-30 23:15 ` [PATCH v2 0/6] " Rasmus Villemoes ` (4 preceding siblings ...) 2019-08-30 23:15 ` [PATCH v2 5/6] x86: alternative.h: use asm_inline for all alternative variants Rasmus Villemoes @ 2019-08-30 23:15 ` Rasmus Villemoes 2019-09-12 22:19 ` [PATCH v3 0/6] make use of gcc 9's "asm inline()" Rasmus Villemoes 6 siblings, 0 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-08-30 23:15 UTC (permalink / raw) To: x86, linux-kernel Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Nadav Amit, Linus Torvalds, Miguel Ojeda, ndesaulniers, Rasmus Villemoes This helps preventing a BUG* or WARN* in some static inline from preventing that (or one of its callers) being inlined, so should allow gcc to make better informed inlining decisions. For example, with gcc 9.2, tcp_fastopen_no_cookie() vanishes from net/ipv4/tcp_fastopen.o. It does not itself have any BUG or WARN, but it calls dst_metric() which has a WARN_ON_ONCE - and despite that WARN_ON_ONCE vanishing since the condition is compile-time false, dst_metric() is apparently sufficiently "large" that when it gets inlined into tcp_fastopen_no_cookie(), the latter becomes too large for inlining. Overall, if one asks size(1), .text decreases a little and .data increases by about the same amount (x86-64 defconfig) $ size vmlinux.{before,after} text data bss dec hex filename 19709726 5202600 1630280 26542606 195020e vmlinux.before 19709330 5203068 1630280 26542678 1950256 vmlinux.after while bloat-o-meter says add/remove: 10/28 grow/shrink: 103/51 up/down: 3669/-2854 (815) ... Total: Before=14783683, After=14784498, chg +0.01% Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- arch/x86/include/asm/bug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index 6804d6642767..facba9bc30ca 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -32,7 +32,7 @@ #define _BUG_FLAGS(ins, flags) \ do { \ - asm volatile("1:\t" ins "\n" \ + asm_inline volatile("1:\t" ins "\n" \ ".pushsection __bug_table,\"aw\"\n" \ "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ "\t" __BUG_REL(%c0) "\t# bug_entry::file\n" \ @@ -49,7 +49,7 @@ do { \ #define _BUG_FLAGS(ins, flags) \ do { \ - asm volatile("1:\t" ins "\n" \ + asm_inline volatile("1:\t" ins "\n" \ ".pushsection __bug_table,\"aw\"\n" \ "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ "\t.word %c0" "\t# bug_entry::flags\n" \ -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* [PATCH v3 0/6] make use of gcc 9's "asm inline()" 2019-08-30 23:15 ` [PATCH v2 0/6] " Rasmus Villemoes ` (5 preceding siblings ...) 2019-08-30 23:15 ` [PATCH v2 6/6] x86: bug.h: use asm_inline in _BUG_FLAGS definitions Rasmus Villemoes @ 2019-09-12 22:19 ` Rasmus Villemoes 2019-09-12 22:19 ` [PATCH v3 1/6] staging: rtl8723bs: replace __inline by inline Rasmus Villemoes ` (6 more replies) 6 siblings, 7 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-09-12 22:19 UTC (permalink / raw) To: Miguel Ojeda, ndesaulniers, Masahiro Yamada Cc: Greg Kroah-Hartman, Ingo Molnar, Linus Torvalds, Nadav Amit, x86, linux-kernel, Borislav Petkov, Rasmus Villemoes gcc 9+ (and gcc 8.3, 7.5) provides a way to override the otherwise crude heuristic that gcc uses to estimate the size of the code represented by an asm() statement. From the gcc docs If you use 'asm inline' instead of just 'asm', then for inlining purposes the size of the asm is taken as the minimum size, ignoring how many instructions GCC thinks it is. For compatibility with older compilers, we obviously want a #if [understands asm inline] #define asm_inline asm inline #else #define asm_inline asm #endif But since we #define the identifier inline to attach some attributes, we have to use an alternate spelling of that keyword. gcc provides both __inline__ and __inline, and we currently #define both to inline, so they all have the same semantics. We have to free up one of __inline__ and __inline, and the latter is by far the easiest. The two x86 changes cause smaller code gen differences than I'd expect, but I think we do want the asm_inline thing available sooner or later, so this is just to get the ball rolling. Changes since v1: __inline instead of __inline__, making the diffstat 400 lines smaller. Changes since v2: Check support of "asm inline" in Kconfig rather than based on gcc version, since the feature was backported to gcc 7.x and gcc 8.x. That also automatically enables it if and when Clang grows support, though that compiler apparently does not have the same problems with overestimating sizes of asm()s that gcc has. Patch 1 has already been picked up by Greg in staging-next, it's included here for completeness. I don't know how to route the rest, or if they should simply wait for 5.5 given how close we are to the merge window for 5.4. Rasmus Villemoes (6): staging: rtl8723bs: replace __inline by inline lib/zstd/mem.h: replace __inline by inline compiler_types.h: don't #define __inline compiler-types.h: add asm_inline definition x86: alternative.h: use asm_inline for all alternative variants x86: bug.h: use asm_inline in _BUG_FLAGS definitions arch/x86/include/asm/alternative.h | 14 +++++++------- arch/x86/include/asm/bug.h | 4 ++-- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/include/drv_types.h | 6 +++--- .../staging/rtl8723bs/include/osdep_service.h | 10 +++++----- .../rtl8723bs/include/osdep_service_linux.h | 14 +++++++------- drivers/staging/rtl8723bs/include/rtw_mlme.h | 14 +++++++------- drivers/staging/rtl8723bs/include/rtw_recv.h | 16 ++++++++-------- drivers/staging/rtl8723bs/include/sta_info.h | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 14 +++++++------- drivers/staging/rtl8723bs/include/wlan_bssdef.h | 2 +- include/linux/compiler_types.h | 17 ++++++++++++++++- init/Kconfig | 3 +++ lib/zstd/mem.h | 2 +- 15 files changed, 71 insertions(+), 53 deletions(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH v3 1/6] staging: rtl8723bs: replace __inline by inline 2019-09-12 22:19 ` [PATCH v3 0/6] make use of gcc 9's "asm inline()" Rasmus Villemoes @ 2019-09-12 22:19 ` Rasmus Villemoes 2019-09-29 10:40 ` Greg Kroah-Hartman 2019-09-12 22:19 ` [PATCH v3 2/6] lib/zstd/mem.h: " Rasmus Villemoes ` (5 subsequent siblings) 6 siblings, 1 reply; 66+ messages in thread From: Rasmus Villemoes @ 2019-09-12 22:19 UTC (permalink / raw) To: Miguel Ojeda, ndesaulniers, Masahiro Yamada Cc: Greg Kroah-Hartman, Ingo Molnar, Linus Torvalds, Nadav Amit, x86, linux-kernel, Borislav Petkov, Rasmus Villemoes Currently, __inline is #defined as inline in compiler_types.h, so this should not change functionality. It is preparation for removing said #define. While at it, change some "inline static" to the customary "static inline" order. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/include/drv_types.h | 6 +++--- .../staging/rtl8723bs/include/osdep_service.h | 10 +++++----- .../rtl8723bs/include/osdep_service_linux.h | 14 +++++++------- drivers/staging/rtl8723bs/include/rtw_mlme.h | 14 +++++++------- drivers/staging/rtl8723bs/include/rtw_recv.h | 16 ++++++++-------- drivers/staging/rtl8723bs/include/sta_info.h | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 14 +++++++------- drivers/staging/rtl8723bs/include/wlan_bssdef.h | 2 +- 10 files changed, 42 insertions(+), 42 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c index ae7fb7046c93..3750fbaeec4f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c @@ -830,12 +830,12 @@ static void pwr_rpwm_timeout_handler(struct timer_list *t) _set_workitem(&pwrpriv->rpwmtimeoutwi); } -static __inline void register_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag) +static inline void register_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag) { pwrctrl->alives |= tag; } -static __inline void unregister_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag) +static inline void unregister_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag) { pwrctrl->alives &= ~tag; } diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c index 76c50377f0fe..34e1ce1b0689 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -451,7 +451,7 @@ void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigne mutex_unlock(&(adapter_to_dvobj(padapter)->setch_mutex)); } -__inline u8 *get_my_bssid(struct wlan_bssid_ex *pnetwork) +inline u8 *get_my_bssid(struct wlan_bssid_ex *pnetwork) { return pnetwork->MacAddress; } diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h index 96346ce064aa..d3648f3b1de2 100644 --- a/drivers/staging/rtl8723bs/include/drv_types.h +++ b/drivers/staging/rtl8723bs/include/drv_types.h @@ -478,7 +478,7 @@ struct sdio_data intf_data; #define dvobj_to_pwrctl(dvobj) (&(dvobj->pwrctl_priv)) #define pwrctl_to_dvobj(pwrctl) container_of(pwrctl, struct dvobj_priv, pwrctl_priv) -__inline static struct device *dvobj_to_dev(struct dvobj_priv *dvobj) +static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj) { /* todo: get interface type from dvobj and the return the dev accordingly */ #ifdef RTW_DVOBJ_CHIP_HW_TYPE @@ -636,14 +636,14 @@ struct adapter { /* define RTW_DISABLE_FUNC(padapter, func) (atomic_add(&adapter_to_dvobj(padapter)->disable_func, (func))) */ /* define RTW_ENABLE_FUNC(padapter, func) (atomic_sub(&adapter_to_dvobj(padapter)->disable_func, (func))) */ -__inline static void RTW_DISABLE_FUNC(struct adapter *padapter, int func_bit) +static inline void RTW_DISABLE_FUNC(struct adapter *padapter, int func_bit) { int df = atomic_read(&adapter_to_dvobj(padapter)->disable_func); df |= func_bit; atomic_set(&adapter_to_dvobj(padapter)->disable_func, df); } -__inline static void RTW_ENABLE_FUNC(struct adapter *padapter, int func_bit) +static inline void RTW_ENABLE_FUNC(struct adapter *padapter, int func_bit) { int df = atomic_read(&adapter_to_dvobj(padapter)->disable_func); df &= ~(func_bit); diff --git a/drivers/staging/rtl8723bs/include/osdep_service.h b/drivers/staging/rtl8723bs/include/osdep_service.h index d2616af95ffa..81a9c19ecc6a 100644 --- a/drivers/staging/rtl8723bs/include/osdep_service.h +++ b/drivers/staging/rtl8723bs/include/osdep_service.h @@ -110,12 +110,12 @@ int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb); extern void _rtw_init_queue(struct __queue *pqueue); -static __inline void thread_enter(char *name) +static inline void thread_enter(char *name) { allow_signal(SIGTERM); } -__inline static void flush_signals_thread(void) +static inline void flush_signals_thread(void) { if (signal_pending (current)) { @@ -125,7 +125,7 @@ __inline static void flush_signals_thread(void) #define rtw_warn_on(condition) WARN_ON(condition) -__inline static int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *parg4) +static inline int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *parg4) { int ret = true; @@ -136,7 +136,7 @@ __inline static int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *p #define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r)) #define RND4(x) (((x >> 2) + (((x & 3) == 0) ? 0: 1)) << 2) -__inline static u32 _RND4(u32 sz) +static inline u32 _RND4(u32 sz) { u32 val; @@ -147,7 +147,7 @@ __inline static u32 _RND4(u32 sz) } -__inline static u32 _RND8(u32 sz) +static inline u32 _RND8(u32 sz) { u32 val; diff --git a/drivers/staging/rtl8723bs/include/osdep_service_linux.h b/drivers/staging/rtl8723bs/include/osdep_service_linux.h index 2f1b51e614fb..c582ede1ac12 100644 --- a/drivers/staging/rtl8723bs/include/osdep_service_linux.h +++ b/drivers/staging/rtl8723bs/include/osdep_service_linux.h @@ -64,12 +64,12 @@ typedef struct work_struct _workitem; -__inline static struct list_head *get_next(struct list_head *list) +static inline struct list_head *get_next(struct list_head *list) { return list->next; } -__inline static struct list_head *get_list_head(struct __queue *queue) +static inline struct list_head *get_list_head(struct __queue *queue) { return (&(queue->queue)); } @@ -78,28 +78,28 @@ __inline static struct list_head *get_list_head(struct __queue *queue) #define LIST_CONTAINOR(ptr, type, member) \ container_of(ptr, type, member) -__inline static void _set_timer(_timer *ptimer, u32 delay_time) +static inline void _set_timer(_timer *ptimer, u32 delay_time) { mod_timer(ptimer , (jiffies+(delay_time*HZ/1000))); } -__inline static void _cancel_timer(_timer *ptimer, u8 *bcancelled) +static inline void _cancel_timer(_timer *ptimer, u8 *bcancelled) { del_timer_sync(ptimer); *bcancelled = true;/* true == 1; false == 0 */ } -__inline static void _init_workitem(_workitem *pwork, void *pfunc, void *cntx) +static inline void _init_workitem(_workitem *pwork, void *pfunc, void *cntx) { INIT_WORK(pwork, pfunc); } -__inline static void _set_workitem(_workitem *pwork) +static inline void _set_workitem(_workitem *pwork) { schedule_work(pwork); } -__inline static void _cancel_workitem_sync(_workitem *pwork) +static inline void _cancel_workitem_sync(_workitem *pwork) { cancel_work_sync(pwork); } diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h index d3c07d1c36e9..4282dfa70b79 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -498,13 +498,13 @@ extern sint rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv); extern sint rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, sint keyid, u8 set_tx, bool enqueue); extern sint rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv); -__inline static u8 *get_bssid(struct mlme_priv *pmlmepriv) +static inline u8 *get_bssid(struct mlme_priv *pmlmepriv) { /* if sta_mode:pmlmepriv->cur_network.network.MacAddress => bssid */ /* if adhoc_mode:pmlmepriv->cur_network.network.MacAddress => ibss mac address */ return pmlmepriv->cur_network.network.MacAddress; } -__inline static sint check_fwstate(struct mlme_priv *pmlmepriv, sint state) +static inline sint check_fwstate(struct mlme_priv *pmlmepriv, sint state) { if (pmlmepriv->fw_state & state) return true; @@ -512,7 +512,7 @@ __inline static sint check_fwstate(struct mlme_priv *pmlmepriv, sint state) return false; } -__inline static sint get_fwstate(struct mlme_priv *pmlmepriv) +static inline sint get_fwstate(struct mlme_priv *pmlmepriv) { return pmlmepriv->fw_state; } @@ -524,7 +524,7 @@ __inline static sint get_fwstate(struct mlme_priv *pmlmepriv) * ### NOTE:#### (!!!!) * MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock */ -__inline static void set_fwstate(struct mlme_priv *pmlmepriv, sint state) +static inline void set_fwstate(struct mlme_priv *pmlmepriv, sint state) { pmlmepriv->fw_state |= state; /* FOR HW integration */ @@ -533,7 +533,7 @@ __inline static void set_fwstate(struct mlme_priv *pmlmepriv, sint state) } } -__inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state) +static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state) { pmlmepriv->fw_state &= ~state; /* FOR HW integration */ @@ -546,7 +546,7 @@ __inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state) * No Limit on the calling context, * therefore set it to be the critical section... */ -__inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state) +static inline void clr_fwstate(struct mlme_priv *pmlmepriv, sint state) { spin_lock_bh(&pmlmepriv->lock); if (check_fwstate(pmlmepriv, state) == true) @@ -554,7 +554,7 @@ __inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state) spin_unlock_bh(&pmlmepriv->lock); } -__inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint val) +static inline void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint val) { spin_lock_bh(&pmlmepriv->lock); pmlmepriv->num_of_scanned = val; diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h index 5de946e66302..012d8f54814f 100644 --- a/drivers/staging/rtl8723bs/include/rtw_recv.h +++ b/drivers/staging/rtl8723bs/include/rtw_recv.h @@ -405,7 +405,7 @@ struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue); void rtw_reordering_ctrl_timeout_handler(struct timer_list *t); -__inline static u8 *get_rxmem(union recv_frame *precvframe) +static inline u8 *get_rxmem(union recv_frame *precvframe) { /* always return rx_head... */ if (precvframe == NULL) @@ -414,7 +414,7 @@ __inline static u8 *get_rxmem(union recv_frame *precvframe) return precvframe->u.hdr.rx_head; } -__inline static u8 *get_recvframe_data(union recv_frame *precvframe) +static inline u8 *get_recvframe_data(union recv_frame *precvframe) { /* alwasy return rx_data */ @@ -425,7 +425,7 @@ __inline static u8 *get_recvframe_data(union recv_frame *precvframe) } -__inline static u8 *recvframe_pull(union recv_frame *precvframe, sint sz) +static inline u8 *recvframe_pull(union recv_frame *precvframe, sint sz) { /* rx_data += sz; move rx_data sz bytes hereafter */ @@ -450,7 +450,7 @@ __inline static u8 *recvframe_pull(union recv_frame *precvframe, sint sz) } -__inline static u8 *recvframe_put(union recv_frame *precvframe, sint sz) +static inline u8 *recvframe_put(union recv_frame *precvframe, sint sz) { /* rx_tai += sz; move rx_tail sz bytes hereafter */ @@ -479,7 +479,7 @@ __inline static u8 *recvframe_put(union recv_frame *precvframe, sint sz) -__inline static u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz) +static inline u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz) { /* rmv data from rx_tail (by yitsen) */ @@ -503,7 +503,7 @@ __inline static u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz) } -__inline static union recv_frame *rxmem_to_recvframe(u8 *rxmem) +static inline union recv_frame *rxmem_to_recvframe(u8 *rxmem) { /* due to the design of 2048 bytes alignment of recv_frame, we can reference the union recv_frame */ /* from any given member of recv_frame. */ @@ -513,13 +513,13 @@ __inline static union recv_frame *rxmem_to_recvframe(u8 *rxmem) } -__inline static sint get_recvframe_len(union recv_frame *precvframe) +static inline sint get_recvframe_len(union recv_frame *precvframe) { return precvframe->u.hdr.len; } -__inline static s32 translate_percentage_to_dbm(u32 SignalStrengthIndex) +static inline s32 translate_percentage_to_dbm(u32 SignalStrengthIndex) { s32 SignalPower; /* in dBm. */ diff --git a/drivers/staging/rtl8723bs/include/sta_info.h b/drivers/staging/rtl8723bs/include/sta_info.h index b9df42d0677e..3acce5630f8e 100644 --- a/drivers/staging/rtl8723bs/include/sta_info.h +++ b/drivers/staging/rtl8723bs/include/sta_info.h @@ -348,7 +348,7 @@ struct sta_priv { }; -__inline static u32 wifi_mac_hash(u8 *mac) +static inline u32 wifi_mac_hash(u8 *mac) { u32 x; diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h index 8c50bbb20f3b..2faf83704ff0 100644 --- a/drivers/staging/rtl8723bs/include/wifi.h +++ b/drivers/staging/rtl8723bs/include/wifi.h @@ -347,7 +347,7 @@ enum WIFI_REG_DOMAIN { (addr[4] == 0xff) && (addr[5] == 0xff)) ? true : false \ ) -__inline static int IS_MCAST(unsigned char *da) +static inline int IS_MCAST(unsigned char *da) { if ((*da) & 0x01) return true; @@ -355,20 +355,20 @@ __inline static int IS_MCAST(unsigned char *da) return false; } -__inline static unsigned char * get_ra(unsigned char *pframe) +static inline unsigned char * get_ra(unsigned char *pframe) { unsigned char *ra; ra = GetAddr1Ptr(pframe); return ra; } -__inline static unsigned char * get_ta(unsigned char *pframe) +static inline unsigned char * get_ta(unsigned char *pframe) { unsigned char *ta; ta = GetAddr2Ptr(pframe); return ta; } -__inline static unsigned char * get_da(unsigned char *pframe) +static inline unsigned char * get_da(unsigned char *pframe) { unsigned char *da; unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); @@ -392,7 +392,7 @@ __inline static unsigned char * get_da(unsigned char *pframe) } -__inline static unsigned char * get_sa(unsigned char *pframe) +static inline unsigned char * get_sa(unsigned char *pframe) { unsigned char *sa; unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); @@ -415,7 +415,7 @@ __inline static unsigned char * get_sa(unsigned char *pframe) return sa; } -__inline static unsigned char * get_hdr_bssid(unsigned char *pframe) +static inline unsigned char * get_hdr_bssid(unsigned char *pframe) { unsigned char *sa = NULL; unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); @@ -439,7 +439,7 @@ __inline static unsigned char * get_hdr_bssid(unsigned char *pframe) } -__inline static int IsFrameTypeCtrl(unsigned char *pframe) +static inline int IsFrameTypeCtrl(unsigned char *pframe) { if (WIFI_CTRL_TYPE == GetFrameType(pframe)) return true; diff --git a/drivers/staging/rtl8723bs/include/wlan_bssdef.h b/drivers/staging/rtl8723bs/include/wlan_bssdef.h index 88890b1c3c4c..723fc5b546ef 100644 --- a/drivers/staging/rtl8723bs/include/wlan_bssdef.h +++ b/drivers/staging/rtl8723bs/include/wlan_bssdef.h @@ -223,7 +223,7 @@ struct wlan_bssid_ex { u8 IEs[MAX_IE_SZ]; /* timestamp, beacon interval, and capability information) */ } __packed; -__inline static uint get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss) +static inline uint get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss) { return (sizeof(struct wlan_bssid_ex) - MAX_IE_SZ + bss->IELength); } -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* Re: [PATCH v3 1/6] staging: rtl8723bs: replace __inline by inline 2019-09-12 22:19 ` [PATCH v3 1/6] staging: rtl8723bs: replace __inline by inline Rasmus Villemoes @ 2019-09-29 10:40 ` Greg Kroah-Hartman 0 siblings, 0 replies; 66+ messages in thread From: Greg Kroah-Hartman @ 2019-09-29 10:40 UTC (permalink / raw) To: Rasmus Villemoes Cc: Miguel Ojeda, ndesaulniers, Masahiro Yamada, Ingo Molnar, Linus Torvalds, Nadav Amit, x86, linux-kernel, Borislav Petkov On Fri, Sep 13, 2019 at 12:19:22AM +0200, Rasmus Villemoes wrote: > Currently, __inline is #defined as inline in compiler_types.h, so this > should not change functionality. It is preparation for removing said > #define. > > While at it, change some "inline static" to the customary "static > inline" order. > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > --- Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH v3 2/6] lib/zstd/mem.h: replace __inline by inline 2019-09-12 22:19 ` [PATCH v3 0/6] make use of gcc 9's "asm inline()" Rasmus Villemoes 2019-09-12 22:19 ` [PATCH v3 1/6] staging: rtl8723bs: replace __inline by inline Rasmus Villemoes @ 2019-09-12 22:19 ` Rasmus Villemoes 2019-09-12 22:19 ` [PATCH v3 3/6] compiler_types.h: don't #define __inline Rasmus Villemoes ` (4 subsequent siblings) 6 siblings, 0 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-09-12 22:19 UTC (permalink / raw) To: Miguel Ojeda, ndesaulniers, Masahiro Yamada Cc: Greg Kroah-Hartman, Ingo Molnar, Linus Torvalds, Nadav Amit, x86, linux-kernel, Borislav Petkov, Rasmus Villemoes Currently, compiler_types.h #defines __inline as inline (and further #defines inline to automatically attach some attributes), so this does not change functionality. It serves as preparation for removing the #define of __inline. While at it, also remove the __attribute__((unused)) - it's already included in the definition of the inline macro, and "open-coded" __attribute__(()) should be avoided. Since commit a95b37e20db9 (kbuild: get <linux/compiler_types.h> out of <linux/kconfig.h>), compiler_types.h is automatically included by all kernel C code - i.e., the definition of inline including the unused attribute is guaranteed to be in effect whenever ZSTD_STATIC is expanded. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- lib/zstd/mem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zstd/mem.h b/lib/zstd/mem.h index 3a0f34c8706c..93d7a2c377fe 100644 --- a/lib/zstd/mem.h +++ b/lib/zstd/mem.h @@ -27,7 +27,7 @@ /*-**************************************** * Compiler specifics ******************************************/ -#define ZSTD_STATIC static __inline __attribute__((unused)) +#define ZSTD_STATIC static inline /*-************************************************************** * Basic Types -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* [PATCH v3 3/6] compiler_types.h: don't #define __inline 2019-09-12 22:19 ` [PATCH v3 0/6] make use of gcc 9's "asm inline()" Rasmus Villemoes 2019-09-12 22:19 ` [PATCH v3 1/6] staging: rtl8723bs: replace __inline by inline Rasmus Villemoes 2019-09-12 22:19 ` [PATCH v3 2/6] lib/zstd/mem.h: " Rasmus Villemoes @ 2019-09-12 22:19 ` Rasmus Villemoes 2019-09-12 22:19 ` [PATCH v3 4/6] compiler-types.h: add asm_inline definition Rasmus Villemoes ` (3 subsequent siblings) 6 siblings, 0 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-09-12 22:19 UTC (permalink / raw) To: Miguel Ojeda, ndesaulniers, Masahiro Yamada Cc: Greg Kroah-Hartman, Ingo Molnar, Linus Torvalds, Nadav Amit, x86, linux-kernel, Borislav Petkov, Rasmus Villemoes The spellings __inline and __inline__ should be reserved for uses where one really wants to refer to the inline keyword, regardless of whether or not the spelling "inline" has been #defined to something else. Due to use of __inline__ in uapi headers, we can't easily get rid of the definition of __inline__. However, almost all users of __inline has been converted to inline, so we can get rid of that #define. The exception is include/acpi/platform/acintel.h. However, that header is only included when using the intel compiler (does anybody actually build the kernel with that?), and the ACPI_INLINE macro is only used in the definition of utterly trivial stub functions, where I doubt a small change of semantics (lack of __gnu_inline) changes anything. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- include/linux/compiler_types.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index 599c27b56c29..ee49be6d6088 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -150,8 +150,17 @@ struct ftrace_likely_data { __maybe_unused notrace #endif +/* + * gcc provides both __inline__ and __inline as alternate spellings of + * the inline keyword, though the latter is undocumented. New kernel + * code should only use the inline spelling, but some existing code + * uses __inline__. Since we #define inline above, to ensure + * __inline__ has the same semantics, we need this #define. + * + * However, the spelling __inline is strictly reserved for referring + * to the bare keyword. + */ #define __inline__ inline -#define __inline inline /* * Rather then using noinline to prevent stack consumption, use -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* [PATCH v3 4/6] compiler-types.h: add asm_inline definition 2019-09-12 22:19 ` [PATCH v3 0/6] make use of gcc 9's "asm inline()" Rasmus Villemoes ` (2 preceding siblings ...) 2019-09-12 22:19 ` [PATCH v3 3/6] compiler_types.h: don't #define __inline Rasmus Villemoes @ 2019-09-12 22:19 ` Rasmus Villemoes 2019-09-12 22:19 ` [PATCH v3 5/6] x86: alternative.h: use asm_inline for all alternative variants Rasmus Villemoes ` (2 subsequent siblings) 6 siblings, 0 replies; 66+ messages in thread From: Rasmus Villemoes @ 2019-09-12 22:19 UTC (permalink / raw) To: Miguel Ojeda, ndesaulniers, Masahiro Yamada Cc: Greg Kroah-Hartman, Ingo Molnar, Linus Torvalds, Nadav Amit, x86, linux-kernel, Borislav Petkov, Rasmus Villemoes This adds an asm_inline macro which expands to "asm inline" [1] when the compiler supports it. This is currently gcc 9.1+, gcc 8.3 and (once released) gcc 7.5 [2]. It expands to just "asm" for other compilers. Using asm inline("foo") instead of asm("foo") overrules gcc's heuristic estimate of the size of the code represented by the asm() statement, and makes gcc use the minimum possible size instead. That can in turn affect gcc's inlining decisions. I wasn't sure whether to make this a function-like macro or not - this way, it can be combined with volatile as asm_inline volatile() but perhaps we'd prefer to spell that asm_inline_volatile() anyway. The Kconfig logic is taken from an RFC patch by Masahiro Yamada [3]. [1] Technically, asm __inline, since both inline and __inline__ are macros that attach various attributes, making gcc barf if one literally does "asm inline()". However, the third spelling __inline is available for referring to the bare keyword. [2] https://lore.kernel.org/lkml/20190907001411.GG9749@gate.crashing.org/ [3] https://lore.kernel.org/lkml/1544695154-15250-1-git-send-email-yamada.masahiro@socionext.com/ Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- include/linux/compiler_types.h | 6 ++++++ init/Kconfig | 3 +++ 2 files changed, 9 insertions(+) diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index ee49be6d6088..2bf316fe0a20 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -198,6 +198,12 @@ struct ftrace_likely_data { #define asm_volatile_goto(x...) asm goto(x) #endif +#ifdef CONFIG_CC_HAS_ASM_INLINE +#define asm_inline asm __inline +#else +#define asm_inline asm +#endif + #ifndef __no_fgcse # define __no_fgcse #endif diff --git a/init/Kconfig b/init/Kconfig index bd7d650d4a99..7fee5978dd73 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -30,6 +30,9 @@ config CC_CAN_LINK config CC_HAS_ASM_GOTO def_bool $(success,$(srctree)/scripts/gcc-goto.sh $(CC)) +config CC_HAS_ASM_INLINE + def_bool $(success,echo 'void foo(void) { asm inline (""); }' | $(CC) -x c - -c -o /dev/null) + config CC_HAS_WARN_MAYBE_UNINITIALIZED def_bool $(cc-option,-Wmaybe-uninitialized) help -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* [PATCH v3 5/6] x86: alternative.h: use asm_inline for all alternative variants 2019-09-12 22:19 ` [PATCH v3 0/6] make use of gcc 9's "asm inline()" Rasmus Villemoes ` (3 preceding siblings ...) 2019-09-12 22:19 ` [PATCH v3 4/6] compiler-types.h: add asm_inline definition Rasmus Villemoes @ 2019-09-12 22:19 ` Rasmus Villemoes 2019-09-13 5:41 ` Ingo Molnar 2019-09-12 22:19 ` [PATCH v3 6/6] x86: bug.h: use asm_inline in _BUG_FLAGS definitions Rasmus Villemoes 2019-09-12 22:30 ` [PATCH v3 0/6] make use of gcc 9's "asm inline()" Miguel Ojeda 6 siblings, 1 reply; 66+ messages in thread From: Rasmus Villemoes @ 2019-09-12 22:19 UTC (permalink / raw) To: Miguel Ojeda, ndesaulniers, Masahiro Yamada Cc: Greg Kroah-Hartman, Ingo Molnar, Linus Torvalds, Nadav Amit, x86, linux-kernel, Borislav Petkov, Rasmus Villemoes Most, if not all, uses of the alternative* family just provide one or two instructions in .text, but the string literal can be quite large, causing gcc to overestimate the size of the generated code. That in turn affects its decisions about inlining of the function containing the alternative() asm statement. New enough versions of gcc allow one to overrule the estimated size by using "asm inline" instead of just "asm". So replace asm by the helper asm_inline, which for older gccs just expands to asm. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- arch/x86/include/asm/alternative.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index 094fbc9c0b1c..13adca37c99a 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -201,10 +201,10 @@ static inline int alternatives_text_reserved(void *start, void *end) * without volatile and memory clobber. */ #define alternative(oldinstr, newinstr, feature) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) : : : "memory") + asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, feature) : : : "memory") #define alternative_2(oldinstr, newinstr1, feature1, newinstr2, feature2) \ - asm volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2) ::: "memory") + asm_inline volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2) ::: "memory") /* * Alternative inline assembly with input. @@ -218,7 +218,7 @@ static inline int alternatives_text_reserved(void *start, void *end) * Leaving an unused argument 0 to keep API compatibility. */ #define alternative_input(oldinstr, newinstr, feature, input...) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ + asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ : : "i" (0), ## input) /* @@ -231,18 +231,18 @@ static inline int alternatives_text_reserved(void *start, void *end) */ #define alternative_input_2(oldinstr, newinstr1, feature1, newinstr2, \ feature2, input...) \ - asm volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ + asm_inline volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ newinstr2, feature2) \ : : "i" (0), ## input) /* Like alternative_input, but with a single output argument */ #define alternative_io(oldinstr, newinstr, feature, output, input...) \ - asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ + asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ : output : "i" (0), ## input) /* Like alternative_io, but for replacing a direct call with another one. */ #define alternative_call(oldfunc, newfunc, feature, output, input...) \ - asm volatile (ALTERNATIVE("call %P[old]", "call %P[new]", feature) \ + asm_inline volatile (ALTERNATIVE("call %P[old]", "call %P[new]", feature) \ : output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input) /* @@ -253,7 +253,7 @@ static inline int alternatives_text_reserved(void *start, void *end) */ #define alternative_call_2(oldfunc, newfunc1, feature1, newfunc2, feature2, \ output, input...) \ - asm volatile (ALTERNATIVE_2("call %P[old]", "call %P[new1]", feature1,\ + asm_inline volatile (ALTERNATIVE_2("call %P[old]", "call %P[new1]", feature1,\ "call %P[new2]", feature2) \ : output, ASM_CALL_CONSTRAINT \ : [old] "i" (oldfunc), [new1] "i" (newfunc1), \ -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* Re: [PATCH v3 5/6] x86: alternative.h: use asm_inline for all alternative variants 2019-09-12 22:19 ` [PATCH v3 5/6] x86: alternative.h: use asm_inline for all alternative variants Rasmus Villemoes @ 2019-09-13 5:41 ` Ingo Molnar 0 siblings, 0 replies; 66+ messages in thread From: Ingo Molnar @ 2019-09-13 5:41 UTC (permalink / raw) To: Rasmus Villemoes Cc: Miguel Ojeda, ndesaulniers, Masahiro Yamada, Greg Kroah-Hartman, Ingo Molnar, Linus Torvalds, Nadav Amit, x86, linux-kernel, Borislav Petkov * Rasmus Villemoes <linux@rasmusvillemoes.dk> wrote: > Most, if not all, uses of the alternative* family just provide one or > two instructions in .text, but the string literal can be quite large, > causing gcc to overestimate the size of the generated code. That in > turn affects its decisions about inlining of the function containing > the alternative() asm statement. > > New enough versions of gcc allow one to overrule the estimated size by > using "asm inline" instead of just "asm". So replace asm by the helper > asm_inline, which for older gccs just expands to asm. > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Acked-by: Ingo Molnar <mingo@kernel.org> Thanks, Ingo ^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH v3 6/6] x86: bug.h: use asm_inline in _BUG_FLAGS definitions 2019-09-12 22:19 ` [PATCH v3 0/6] make use of gcc 9's "asm inline()" Rasmus Villemoes ` (4 preceding siblings ...) 2019-09-12 22:19 ` [PATCH v3 5/6] x86: alternative.h: use asm_inline for all alternative variants Rasmus Villemoes @ 2019-09-12 22:19 ` Rasmus Villemoes 2019-09-13 5:42 ` Ingo Molnar 2019-09-12 22:30 ` [PATCH v3 0/6] make use of gcc 9's "asm inline()" Miguel Ojeda 6 siblings, 1 reply; 66+ messages in thread From: Rasmus Villemoes @ 2019-09-12 22:19 UTC (permalink / raw) To: Miguel Ojeda, ndesaulniers, Masahiro Yamada Cc: Greg Kroah-Hartman, Ingo Molnar, Linus Torvalds, Nadav Amit, x86, linux-kernel, Borislav Petkov, Rasmus Villemoes This helps preventing a BUG* or WARN* in some static inline from preventing that (or one of its callers) being inlined, so should allow gcc to make better informed inlining decisions. For example, with gcc 9.2, tcp_fastopen_no_cookie() vanishes from net/ipv4/tcp_fastopen.o. It does not itself have any BUG or WARN, but it calls dst_metric() which has a WARN_ON_ONCE - and despite that WARN_ON_ONCE vanishing since the condition is compile-time false, dst_metric() is apparently sufficiently "large" that when it gets inlined into tcp_fastopen_no_cookie(), the latter becomes too large for inlining. Overall, if one asks size(1), .text decreases a little and .data increases by about the same amount (x86-64 defconfig) $ size vmlinux.{before,after} text data bss dec hex filename 19709726 5202600 1630280 26542606 195020e vmlinux.before 19709330 5203068 1630280 26542678 1950256 vmlinux.after while bloat-o-meter says add/remove: 10/28 grow/shrink: 103/51 up/down: 3669/-2854 (815) ... Total: Before=14783683, After=14784498, chg +0.01% Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- arch/x86/include/asm/bug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index 6804d6642767..facba9bc30ca 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -32,7 +32,7 @@ #define _BUG_FLAGS(ins, flags) \ do { \ - asm volatile("1:\t" ins "\n" \ + asm_inline volatile("1:\t" ins "\n" \ ".pushsection __bug_table,\"aw\"\n" \ "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ "\t" __BUG_REL(%c0) "\t# bug_entry::file\n" \ @@ -49,7 +49,7 @@ do { \ #define _BUG_FLAGS(ins, flags) \ do { \ - asm volatile("1:\t" ins "\n" \ + asm_inline volatile("1:\t" ins "\n" \ ".pushsection __bug_table,\"aw\"\n" \ "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ "\t.word %c0" "\t# bug_entry::flags\n" \ -- 2.20.1 ^ permalink raw reply related [flat|nested] 66+ messages in thread
* Re: [PATCH v3 6/6] x86: bug.h: use asm_inline in _BUG_FLAGS definitions 2019-09-12 22:19 ` [PATCH v3 6/6] x86: bug.h: use asm_inline in _BUG_FLAGS definitions Rasmus Villemoes @ 2019-09-13 5:42 ` Ingo Molnar 0 siblings, 0 replies; 66+ messages in thread From: Ingo Molnar @ 2019-09-13 5:42 UTC (permalink / raw) To: Rasmus Villemoes Cc: Miguel Ojeda, ndesaulniers, Masahiro Yamada, Greg Kroah-Hartman, Ingo Molnar, Linus Torvalds, Nadav Amit, x86, linux-kernel, Borislav Petkov * Rasmus Villemoes <linux@rasmusvillemoes.dk> wrote: > This helps preventing a BUG* or WARN* in some static inline from > preventing that (or one of its callers) being inlined, so should allow > gcc to make better informed inlining decisions. > > For example, with gcc 9.2, tcp_fastopen_no_cookie() vanishes from > net/ipv4/tcp_fastopen.o. It does not itself have any BUG or WARN, but > it calls dst_metric() which has a WARN_ON_ONCE - and despite that > WARN_ON_ONCE vanishing since the condition is compile-time false, > dst_metric() is apparently sufficiently "large" that when it gets > inlined into tcp_fastopen_no_cookie(), the latter becomes too large > for inlining. > > Overall, if one asks size(1), .text decreases a little and .data > increases by about the same amount (x86-64 defconfig) > > $ size vmlinux.{before,after} > text data bss dec hex filename > 19709726 5202600 1630280 26542606 195020e vmlinux.before > 19709330 5203068 1630280 26542678 1950256 vmlinux.after > > while bloat-o-meter says > > add/remove: 10/28 grow/shrink: 103/51 up/down: 3669/-2854 (815) > ... > Total: Before=14783683, After=14784498, chg +0.01% > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Acked-by: Ingo Molnar <mingo@kernel.org> Thanks, Ingo ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v3 0/6] make use of gcc 9's "asm inline()" 2019-09-12 22:19 ` [PATCH v3 0/6] make use of gcc 9's "asm inline()" Rasmus Villemoes ` (5 preceding siblings ...) 2019-09-12 22:19 ` [PATCH v3 6/6] x86: bug.h: use asm_inline in _BUG_FLAGS definitions Rasmus Villemoes @ 2019-09-12 22:30 ` Miguel Ojeda 2019-09-13 6:11 ` Rasmus Villemoes 6 siblings, 1 reply; 66+ messages in thread From: Miguel Ojeda @ 2019-09-12 22:30 UTC (permalink / raw) To: Rasmus Villemoes Cc: Nick Desaulniers, Masahiro Yamada, Greg Kroah-Hartman, Ingo Molnar, Linus Torvalds, Nadav Amit, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), linux-kernel, Borislav Petkov On Fri, Sep 13, 2019 at 12:19 AM Rasmus Villemoes <linux@rasmusvillemoes.dk> wrote: > > Patch 1 has already been picked up by Greg in staging-next, it's > included here for completeness. I don't know how to route the rest, or > if they should simply wait for 5.5 given how close we are to the merge > window for 5.4. If you want I can pick this up in compiler-attributes and submit it as a whole if we get Acks from rtl8723bs/x86/...maintainers. Cheers, Miguel ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v3 0/6] make use of gcc 9's "asm inline()" 2019-09-12 22:30 ` [PATCH v3 0/6] make use of gcc 9's "asm inline()" Miguel Ojeda @ 2019-09-13 6:11 ` Rasmus Villemoes 2019-09-13 15:21 ` Greg Kroah-Hartman 0 siblings, 1 reply; 66+ messages in thread From: Rasmus Villemoes @ 2019-09-13 6:11 UTC (permalink / raw) To: Miguel Ojeda Cc: Nick Desaulniers, Masahiro Yamada, Greg Kroah-Hartman, Ingo Molnar, Linus Torvalds, Nadav Amit, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), linux-kernel, Borislav Petkov On 13/09/2019 00.30, Miguel Ojeda wrote: > On Fri, Sep 13, 2019 at 12:19 AM Rasmus Villemoes > <linux@rasmusvillemoes.dk> wrote: >> >> Patch 1 has already been picked up by Greg in staging-next, it's >> included here for completeness. I don't know how to route the rest, or >> if they should simply wait for 5.5 given how close we are to the merge >> window for 5.4. > > If you want I can pick this up in compiler-attributes and submit it as > a whole if we get Acks from rtl8723bs/x86/...maintainers. Ingo has now acked the x86 parts, and Greg has already picked up the rtl8723bs patch, which is at least an implicit ack. I'm just unsure of how and if it will work if you also pick up that one - but, if you don't, your tree would be (somewhat) dependent on Greg's staging-next :( Rasmus ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v3 0/6] make use of gcc 9's "asm inline()" 2019-09-13 6:11 ` Rasmus Villemoes @ 2019-09-13 15:21 ` Greg Kroah-Hartman 2019-09-15 18:20 ` Miguel Ojeda 0 siblings, 1 reply; 66+ messages in thread From: Greg Kroah-Hartman @ 2019-09-13 15:21 UTC (permalink / raw) To: Rasmus Villemoes Cc: Miguel Ojeda, Nick Desaulniers, Masahiro Yamada, Ingo Molnar, Linus Torvalds, Nadav Amit, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), linux-kernel, Borislav Petkov On Fri, Sep 13, 2019 at 08:11:24AM +0200, Rasmus Villemoes wrote: > On 13/09/2019 00.30, Miguel Ojeda wrote: > > On Fri, Sep 13, 2019 at 12:19 AM Rasmus Villemoes > > <linux@rasmusvillemoes.dk> wrote: > >> > >> Patch 1 has already been picked up by Greg in staging-next, it's > >> included here for completeness. I don't know how to route the rest, or > >> if they should simply wait for 5.5 given how close we are to the merge > >> window for 5.4. > > > > If you want I can pick this up in compiler-attributes and submit it as > > a whole if we get Acks from rtl8723bs/x86/...maintainers. > > Ingo has now acked the x86 parts, and Greg has already picked up the > rtl8723bs patch, which is at least an implicit ack. I'm just unsure of > how and if it will work if you also pick up that one - but, if you > don't, your tree would be (somewhat) dependent on Greg's staging-next :( Feel free to also take that patch through any tree, it's "obviously correct" :) greg k-h ^ permalink raw reply [flat|nested] 66+ messages in thread
* Re: [PATCH v3 0/6] make use of gcc 9's "asm inline()" 2019-09-13 15:21 ` Greg Kroah-Hartman @ 2019-09-15 18:20 ` Miguel Ojeda 0 siblings, 0 replies; 66+ messages in thread From: Miguel Ojeda @ 2019-09-15 18:20 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Rasmus Villemoes, Nick Desaulniers, Masahiro Yamada, Ingo Molnar, Linus Torvalds, Nadav Amit, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), linux-kernel, Borislav Petkov On Fri, Sep 13, 2019 at 5:21 PM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > > Feel free to also take that patch through any tree, it's "obviously > correct" :) OK :) Picked all 6 in compiler-attributes: https://github.com/ojeda/linux/commits/compiler-attributes I added Ingo's Acks and fixed a minor typo (has -> have) in the 3rd patch commit message. It will be in tomorrow's -next. Cheers, Miguel ^ permalink raw reply [flat|nested] 66+ messages in thread
end of thread, other threads:[~2019-09-29 10:41 UTC | newest] Thread overview: 66+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-08-29 8:32 [RFC PATCH 0/5] make use of gcc 9's "asm inline()" Rasmus Villemoes 2019-08-29 8:32 ` [RFC PATCH 1/5] treewide: replace __inline__ by inline Rasmus Villemoes 2019-08-29 16:29 ` Joe Perches 2019-08-29 8:32 ` [RFC PATCH 2/5] compiler_types.h: don't #define __inline__ Rasmus Villemoes 2019-08-29 8:32 ` [RFC PATCH 3/5] compiler-gcc.h: add asm_inline definition Rasmus Villemoes 2019-08-29 8:32 ` [RFC PATCH 4/5] x86: alternative.h: use asm_inline for all alternative variants Rasmus Villemoes 2019-08-29 8:32 ` [RFC PATCH 5/5] x86: bug.h: use asm_inline in _BUG_FLAGS definitions Rasmus Villemoes 2019-08-29 16:05 ` [RFC PATCH 0/5] make use of gcc 9's "asm inline()" Linus Torvalds 2019-08-30 7:45 ` Rasmus Villemoes 2019-08-29 17:36 ` Nick Desaulniers 2019-08-29 18:15 ` Linus Torvalds 2019-08-29 18:26 ` Nadav Amit 2019-08-29 18:42 ` Borislav Petkov 2019-08-29 19:41 ` Masahiro Yamada 2019-08-30 23:15 ` [PATCH v2 0/6] " Rasmus Villemoes 2019-08-30 23:15 ` [PATCH v2 1/6] staging: rtl8723bs: replace __inline by inline Rasmus Villemoes 2019-09-04 23:54 ` Nick Desaulniers 2019-08-30 23:15 ` [PATCH v2 2/6] lib/zstd/mem.h: " Rasmus Villemoes 2019-09-04 23:59 ` Nick Desaulniers 2019-09-05 0:07 ` Miguel Ojeda 2019-09-05 9:28 ` Rasmus Villemoes 2019-08-30 23:15 ` [PATCH v2 3/6] compiler_types.h: don't #define __inline Rasmus Villemoes 2019-09-05 0:13 ` Nick Desaulniers 2019-09-05 9:45 ` Rasmus Villemoes 2019-08-30 23:15 ` [PATCH v2 4/6] compiler-gcc.h: add asm_inline definition Rasmus Villemoes 2019-09-05 0:18 ` Nick Desaulniers 2019-09-05 5:43 ` Nadav Amit 2019-09-05 11:07 ` Rasmus Villemoes 2019-09-05 13:45 ` Segher Boessenkool 2019-09-05 14:23 ` Rasmus Villemoes 2019-09-05 14:47 ` Segher Boessenkool 2019-09-05 15:52 ` Miguel Ojeda 2019-09-05 16:13 ` Miguel Ojeda 2019-09-06 12:23 ` Segher Boessenkool 2019-09-06 15:13 ` Miguel Ojeda 2019-09-06 16:30 ` Segher Boessenkool 2019-09-06 16:39 ` Jakub Jelinek 2019-09-06 18:14 ` Nick Desaulniers 2019-09-06 22:03 ` Segher Boessenkool 2019-09-06 22:35 ` Nick Desaulniers 2019-09-06 22:56 ` Segher Boessenkool 2019-09-06 23:42 ` Nick Desaulniers 2019-09-07 0:14 ` Segher Boessenkool 2019-09-07 1:04 ` Nick Desaulniers 2019-09-07 13:11 ` Segher Boessenkool 2019-09-08 13:55 ` Miguel Ojeda 2019-09-12 21:54 ` Nick Desaulniers 2019-09-12 22:12 ` Rasmus Villemoes 2019-09-20 0:50 ` Segher Boessenkool 2019-09-06 16:47 ` Miguel Ojeda 2019-08-30 23:15 ` [PATCH v2 5/6] x86: alternative.h: use asm_inline for all alternative variants Rasmus Villemoes 2019-08-30 23:15 ` [PATCH v2 6/6] x86: bug.h: use asm_inline in _BUG_FLAGS definitions Rasmus Villemoes 2019-09-12 22:19 ` [PATCH v3 0/6] make use of gcc 9's "asm inline()" Rasmus Villemoes 2019-09-12 22:19 ` [PATCH v3 1/6] staging: rtl8723bs: replace __inline by inline Rasmus Villemoes 2019-09-29 10:40 ` Greg Kroah-Hartman 2019-09-12 22:19 ` [PATCH v3 2/6] lib/zstd/mem.h: " Rasmus Villemoes 2019-09-12 22:19 ` [PATCH v3 3/6] compiler_types.h: don't #define __inline Rasmus Villemoes 2019-09-12 22:19 ` [PATCH v3 4/6] compiler-types.h: add asm_inline definition Rasmus Villemoes 2019-09-12 22:19 ` [PATCH v3 5/6] x86: alternative.h: use asm_inline for all alternative variants Rasmus Villemoes 2019-09-13 5:41 ` Ingo Molnar 2019-09-12 22:19 ` [PATCH v3 6/6] x86: bug.h: use asm_inline in _BUG_FLAGS definitions Rasmus Villemoes 2019-09-13 5:42 ` Ingo Molnar 2019-09-12 22:30 ` [PATCH v3 0/6] make use of gcc 9's "asm inline()" Miguel Ojeda 2019-09-13 6:11 ` Rasmus Villemoes 2019-09-13 15:21 ` Greg Kroah-Hartman 2019-09-15 18:20 ` Miguel Ojeda
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).