| Message ID | 20220606114908.962562-6-alexandr.lobakin@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | bitops: let optimize out non-atomic bitops on compile-time constants | expand |
On Mon, Jun 06, 2022 at 01:49:06PM +0200, Alexander Lobakin wrote: > In preparation for altering the non-atomic bitops with a macro, wrap > them in a transparent definition. This requires prepending one more > '_' to their names in order to be able to do that seamlessly. > sparc32 already has the triple-underscored functions, so I had to > rename them ('___' -> 'sp32_'). Could we use an 'arch_' prefix here, like we do for the atomics, or is that already overloaded? Thanks, Mark. > > Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com> > --- > arch/alpha/include/asm/bitops.h | 14 ++++---- > arch/hexagon/include/asm/bitops.h | 16 +++++----- > arch/ia64/include/asm/bitops.h | 26 +++++++-------- > arch/m68k/include/asm/bitops.h | 14 ++++---- > arch/sh/include/asm/bitops-op32.h | 22 ++++++------- > arch/sparc/include/asm/bitops_32.h | 18 +++++------ > arch/sparc/lib/atomic32.c | 12 +++---- > .../bitops/instrumented-non-atomic.h | 28 ++++++++-------- > include/asm-generic/bitops/non-atomic.h | 14 ++++---- > include/linux/bitops.h | 32 ++++++++++++++----- > tools/include/asm-generic/bitops/non-atomic.h | 24 +++++++------- > tools/include/linux/bitops.h | 16 ++++++++++ > 12 files changed, 134 insertions(+), 102 deletions(-) > > diff --git a/arch/alpha/include/asm/bitops.h b/arch/alpha/include/asm/bitops.h > index 381ad2eae4b4..e7d119826062 100644 > --- a/arch/alpha/include/asm/bitops.h > +++ b/arch/alpha/include/asm/bitops.h > @@ -47,7 +47,7 @@ set_bit(unsigned long nr, volatile void * addr) > * WARNING: non atomic version. > */ > static __always_inline void > -__set_bit(unsigned long nr, volatile unsigned long *addr) > +___set_bit(unsigned long nr, volatile unsigned long *addr) > { > int *m = ((int *) addr) + (nr >> 5); > > @@ -83,7 +83,7 @@ clear_bit_unlock(unsigned long nr, volatile void * addr) > * WARNING: non atomic version. > */ > static __always_inline void > -__clear_bit(unsigned long nr, volatile unsigned long *addr) > +___clear_bit(unsigned long nr, volatile unsigned long *addr) > { > int *m = ((int *) addr) + (nr >> 5); > > @@ -119,7 +119,7 @@ change_bit(unsigned long nr, volatile void * addr) > * WARNING: non atomic version. > */ > static __always_inline void > -__change_bit(unsigned long nr, volatile unsigned long *addr) > +___change_bit(unsigned long nr, volatile unsigned long *addr) > { > int *m = ((int *) addr) + (nr >> 5); > > @@ -187,7 +187,7 @@ test_and_set_bit_lock(unsigned long nr, volatile void *addr) > * WARNING: non atomic version. > */ > static __always_inline bool > -__test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > { > unsigned long mask = 1 << (nr & 0x1f); > int *m = ((int *) addr) + (nr >> 5); > @@ -231,7 +231,7 @@ test_and_clear_bit(unsigned long nr, volatile void * addr) > * WARNING: non atomic version. > */ > static __always_inline bool > -__test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > { > unsigned long mask = 1 << (nr & 0x1f); > int *m = ((int *) addr) + (nr >> 5); > @@ -273,7 +273,7 @@ test_and_change_bit(unsigned long nr, volatile void * addr) > * WARNING: non atomic version. > */ > static __always_inline bool > -__test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > { > unsigned long mask = 1 << (nr & 0x1f); > int *m = ((int *) addr) + (nr >> 5); > @@ -284,7 +284,7 @@ __test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > } > > static __always_inline bool > -test_bit(unsigned long nr, const volatile unsigned long *addr) > +_test_bit(unsigned long nr, const volatile unsigned long *addr) > { > return (1UL & (((const int *) addr)[nr >> 5] >> (nr & 31))) != 0UL; > } > diff --git a/arch/hexagon/include/asm/bitops.h b/arch/hexagon/include/asm/bitops.h > index a3bfe3a8d4b7..37144f8e0b0c 100644 > --- a/arch/hexagon/include/asm/bitops.h > +++ b/arch/hexagon/include/asm/bitops.h > @@ -128,44 +128,44 @@ static inline void change_bit(int nr, volatile void *addr) > * > */ > static __always_inline void > -__clear_bit(unsigned long nr, volatile unsigned long *addr) > +___clear_bit(unsigned long nr, volatile unsigned long *addr) > { > test_and_clear_bit(nr, addr); > } > > static __always_inline void > -__set_bit(unsigned long nr, volatile unsigned long *addr) > +___set_bit(unsigned long nr, volatile unsigned long *addr) > { > test_and_set_bit(nr, addr); > } > > static __always_inline void > -__change_bit(unsigned long nr, volatile unsigned long *addr) > +___change_bit(unsigned long nr, volatile unsigned long *addr) > { > test_and_change_bit(nr, addr); > } > > /* Apparently, at least some of these are allowed to be non-atomic */ > static __always_inline bool > -__test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > { > return test_and_clear_bit(nr, addr); > } > > static __always_inline bool > -__test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > { > return test_and_set_bit(nr, addr); > } > > static __always_inline bool > -__test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > { > return test_and_change_bit(nr, addr); > } > > static __always_inline bool > -test_bit(unsigned long nr, const volatile unsigned long *addr) > +_test_bit(unsigned long nr, const volatile unsigned long *addr) > { > int retval; > > @@ -179,7 +179,7 @@ test_bit(unsigned long nr, const volatile unsigned long *addr) > return retval; > } > > -#define __test_bit(nr, addr) test_bit(nr, addr) > +#define __test_bit(nr, addr) _test_bit(nr, addr) > > /* > * ffz - find first zero in word. > diff --git a/arch/ia64/include/asm/bitops.h b/arch/ia64/include/asm/bitops.h > index 4267a217a503..3cb231fb0283 100644 > --- a/arch/ia64/include/asm/bitops.h > +++ b/arch/ia64/include/asm/bitops.h > @@ -53,7 +53,7 @@ set_bit (int nr, volatile void *addr) > } > > /** > - * __set_bit - Set a bit in memory > + * ___set_bit - Set a bit in memory > * @nr: the bit to set > * @addr: the address to start counting from > * > @@ -62,7 +62,7 @@ set_bit (int nr, volatile void *addr) > * may be that only one operation succeeds. > */ > static __always_inline void > -__set_bit(unsigned long nr, volatile unsigned long *addr) > +___set_bit(unsigned long nr, volatile unsigned long *addr) > { > *((__u32 *) addr + (nr >> 5)) |= (1 << (nr & 31)); > } > @@ -135,7 +135,7 @@ __clear_bit_unlock(int nr, void *addr) > } > > /** > - * __clear_bit - Clears a bit in memory (non-atomic version) > + * ___clear_bit - Clears a bit in memory (non-atomic version) > * @nr: the bit to clear > * @addr: the address to start counting from > * > @@ -144,7 +144,7 @@ __clear_bit_unlock(int nr, void *addr) > * may be that only one operation succeeds. > */ > static __always_inline void > -__clear_bit(unsigned long nr, volatile unsigned long *addr) > +___clear_bit(unsigned long nr, volatile unsigned long *addr) > { > *((__u32 *) addr + (nr >> 5)) &= ~(1 << (nr & 31)); > } > @@ -175,7 +175,7 @@ change_bit (int nr, volatile void *addr) > } > > /** > - * __change_bit - Toggle a bit in memory > + * ___change_bit - Toggle a bit in memory > * @nr: the bit to toggle > * @addr: the address to start counting from > * > @@ -184,7 +184,7 @@ change_bit (int nr, volatile void *addr) > * may be that only one operation succeeds. > */ > static __always_inline void > -__change_bit(unsigned long nr, volatile unsigned long *addr) > +___change_bit(unsigned long nr, volatile unsigned long *addr) > { > *((__u32 *) addr + (nr >> 5)) ^= (1 << (nr & 31)); > } > @@ -224,7 +224,7 @@ test_and_set_bit (int nr, volatile void *addr) > #define test_and_set_bit_lock test_and_set_bit > > /** > - * __test_and_set_bit - Set a bit and return its old value > + * ___test_and_set_bit - Set a bit and return its old value > * @nr: Bit to set > * @addr: Address to count from > * > @@ -233,7 +233,7 @@ test_and_set_bit (int nr, volatile void *addr) > * but actually fail. You must protect multiple accesses with a lock. > */ > static __always_inline bool > -__test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > { > __u32 *p = (__u32 *) addr + (nr >> 5); > __u32 m = 1 << (nr & 31); > @@ -269,7 +269,7 @@ test_and_clear_bit (int nr, volatile void *addr) > } > > /** > - * __test_and_clear_bit - Clear a bit and return its old value > + * ___test_and_clear_bit - Clear a bit and return its old value > * @nr: Bit to clear > * @addr: Address to count from > * > @@ -278,7 +278,7 @@ test_and_clear_bit (int nr, volatile void *addr) > * but actually fail. You must protect multiple accesses with a lock. > */ > static __always_inline bool > -__test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > { > __u32 *p = (__u32 *) addr + (nr >> 5); > __u32 m = 1 << (nr & 31); > @@ -314,14 +314,14 @@ test_and_change_bit (int nr, volatile void *addr) > } > > /** > - * __test_and_change_bit - Change a bit and return its old value > + * ___test_and_change_bit - Change a bit and return its old value > * @nr: Bit to change > * @addr: Address to count from > * > * This operation is non-atomic and can be reordered. > */ > static __always_inline bool > -__test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > { > __u32 old, bit = (1 << (nr & 31)); > __u32 *m = (__u32 *) addr + (nr >> 5); > @@ -332,7 +332,7 @@ __test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > } > > static __always_inline bool > -test_bit(unsigned long nr, const volatile unsigned long *addr) > +_test_bit(unsigned long nr, const volatile unsigned long *addr) > { > return 1 & (((const volatile __u32 *) addr)[nr >> 5] >> (nr & 31)); > } > diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h > index 9d44bd4713cb..ed08c9d9c547 100644 > --- a/arch/m68k/include/asm/bitops.h > +++ b/arch/m68k/include/asm/bitops.h > @@ -66,7 +66,7 @@ static inline void bfset_mem_set_bit(int nr, volatile unsigned long *vaddr) > #endif > > static __always_inline void > -__set_bit(unsigned long nr, volatile unsigned long *addr) > +___set_bit(unsigned long nr, volatile unsigned long *addr) > { > set_bit(nr, addr); > } > @@ -109,7 +109,7 @@ static inline void bfclr_mem_clear_bit(int nr, volatile unsigned long *vaddr) > #endif > > static __always_inline void > -__clear_bit(unsigned long nr, volatile unsigned long *addr) > +___clear_bit(unsigned long nr, volatile unsigned long *addr) > { > clear_bit(nr, addr); > } > @@ -152,13 +152,13 @@ static inline void bfchg_mem_change_bit(int nr, volatile unsigned long *vaddr) > #endif > > static __always_inline void > -__change_bit(unsigned long nr, volatile unsigned long *addr) > +___change_bit(unsigned long nr, volatile unsigned long *addr) > { > change_bit(nr, addr); > } > > static __always_inline bool > -test_bit(unsigned long nr, const volatile unsigned long *addr) > +_test_bit(unsigned long nr, const volatile unsigned long *addr) > { > return (addr[nr >> 5] & (1UL << (nr & 31))) != 0; > } > @@ -212,7 +212,7 @@ static inline int bfset_mem_test_and_set_bit(int nr, > #endif > > static __always_inline bool > -__test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > { > return test_and_set_bit(nr, addr); > } > @@ -265,7 +265,7 @@ static inline int bfclr_mem_test_and_clear_bit(int nr, > #endif > > static __always_inline bool > -__test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > { > return test_and_clear_bit(nr, addr); > } > @@ -318,7 +318,7 @@ static inline int bfchg_mem_test_and_change_bit(int nr, > #endif > > static __always_inline bool > -__test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > { > return test_and_change_bit(nr, addr); > } > diff --git a/arch/sh/include/asm/bitops-op32.h b/arch/sh/include/asm/bitops-op32.h > index dcd85866a394..24b8a809c1b9 100644 > --- a/arch/sh/include/asm/bitops-op32.h > +++ b/arch/sh/include/asm/bitops-op32.h > @@ -19,7 +19,7 @@ > #endif > > static __always_inline void > -__set_bit(unsigned long nr, volatile unsigned long *addr) > +___set_bit(unsigned long nr, volatile unsigned long *addr) > { > if (__builtin_constant_p(nr)) { > __asm__ __volatile__ ( > @@ -37,7 +37,7 @@ __set_bit(unsigned long nr, volatile unsigned long *addr) > } > > static __always_inline void > -__clear_bit(unsigned long nr, volatile unsigned long *addr) > +___clear_bit(unsigned long nr, volatile unsigned long *addr) > { > if (__builtin_constant_p(nr)) { > __asm__ __volatile__ ( > @@ -56,7 +56,7 @@ __clear_bit(unsigned long nr, volatile unsigned long *addr) > } > > /** > - * __change_bit - Toggle a bit in memory > + * ___change_bit - Toggle a bit in memory > * @nr: the bit to change > * @addr: the address to start counting from > * > @@ -65,7 +65,7 @@ __clear_bit(unsigned long nr, volatile unsigned long *addr) > * may be that only one operation succeeds. > */ > static __always_inline void > -__change_bit(unsigned long nr, volatile unsigned long *addr) > +___change_bit(unsigned long nr, volatile unsigned long *addr) > { > if (__builtin_constant_p(nr)) { > __asm__ __volatile__ ( > @@ -84,7 +84,7 @@ __change_bit(unsigned long nr, volatile unsigned long *addr) > } > > /** > - * __test_and_set_bit - Set a bit and return its old value > + * ___test_and_set_bit - Set a bit and return its old value > * @nr: Bit to set > * @addr: Address to count from > * > @@ -93,7 +93,7 @@ __change_bit(unsigned long nr, volatile unsigned long *addr) > * but actually fail. You must protect multiple accesses with a lock. > */ > static __always_inline bool > -__test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > { > unsigned long mask = BIT_MASK(nr); > unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); > @@ -104,7 +104,7 @@ __test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > } > > /** > - * __test_and_clear_bit - Clear a bit and return its old value > + * ___test_and_clear_bit - Clear a bit and return its old value > * @nr: Bit to clear > * @addr: Address to count from > * > @@ -113,7 +113,7 @@ __test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > * but actually fail. You must protect multiple accesses with a lock. > */ > static __always_inline bool > -__test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > { > unsigned long mask = BIT_MASK(nr); > unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); > @@ -125,7 +125,7 @@ __test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > > /* WARNING: non atomic and it can be reordered! */ > static __always_inline bool > -__test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > { > unsigned long mask = BIT_MASK(nr); > unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); > @@ -136,12 +136,12 @@ __test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > } > > /** > - * test_bit - Determine whether a bit is set > + * _test_bit - Determine whether a bit is set > * @nr: bit number to test > * @addr: Address to start counting from > */ > static __always_inline bool > -test_bit(unsigned long nr, const volatile unsigned long *addr) > +_test_bit(unsigned long nr, const volatile unsigned long *addr) > { > return 1UL & (addr[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG-1))); > } > diff --git a/arch/sparc/include/asm/bitops_32.h b/arch/sparc/include/asm/bitops_32.h > index 889afa9f990f..3448c191b484 100644 > --- a/arch/sparc/include/asm/bitops_32.h > +++ b/arch/sparc/include/asm/bitops_32.h > @@ -19,9 +19,9 @@ > #error only <linux/bitops.h> can be included directly > #endif > > -unsigned long ___set_bit(unsigned long *addr, unsigned long mask); > -unsigned long ___clear_bit(unsigned long *addr, unsigned long mask); > -unsigned long ___change_bit(unsigned long *addr, unsigned long mask); > +unsigned long sp32___set_bit(unsigned long *addr, unsigned long mask); > +unsigned long sp32___clear_bit(unsigned long *addr, unsigned long mask); > +unsigned long sp32___change_bit(unsigned long *addr, unsigned long mask); > > /* > * Set bit 'nr' in 32-bit quantity at address 'addr' where bit '0' > @@ -36,7 +36,7 @@ static inline int test_and_set_bit(unsigned long nr, volatile unsigned long *add > ADDR = ((unsigned long *) addr) + (nr >> 5); > mask = 1 << (nr & 31); > > - return ___set_bit(ADDR, mask) != 0; > + return sp32___set_bit(ADDR, mask) != 0; > } > > static inline void set_bit(unsigned long nr, volatile unsigned long *addr) > @@ -46,7 +46,7 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *addr) > ADDR = ((unsigned long *) addr) + (nr >> 5); > mask = 1 << (nr & 31); > > - (void) ___set_bit(ADDR, mask); > + (void) sp32___set_bit(ADDR, mask); > } > > static inline int test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > @@ -56,7 +56,7 @@ static inline int test_and_clear_bit(unsigned long nr, volatile unsigned long *a > ADDR = ((unsigned long *) addr) + (nr >> 5); > mask = 1 << (nr & 31); > > - return ___clear_bit(ADDR, mask) != 0; > + return sp32___clear_bit(ADDR, mask) != 0; > } > > static inline void clear_bit(unsigned long nr, volatile unsigned long *addr) > @@ -66,7 +66,7 @@ static inline void clear_bit(unsigned long nr, volatile unsigned long *addr) > ADDR = ((unsigned long *) addr) + (nr >> 5); > mask = 1 << (nr & 31); > > - (void) ___clear_bit(ADDR, mask); > + (void) sp32___clear_bit(ADDR, mask); > } > > static inline int test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > @@ -76,7 +76,7 @@ static inline int test_and_change_bit(unsigned long nr, volatile unsigned long * > ADDR = ((unsigned long *) addr) + (nr >> 5); > mask = 1 << (nr & 31); > > - return ___change_bit(ADDR, mask) != 0; > + return sp32___change_bit(ADDR, mask) != 0; > } > > static inline void change_bit(unsigned long nr, volatile unsigned long *addr) > @@ -86,7 +86,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr) > ADDR = ((unsigned long *) addr) + (nr >> 5); > mask = 1 << (nr & 31); > > - (void) ___change_bit(ADDR, mask); > + (void) sp32___change_bit(ADDR, mask); > } > > #include <asm-generic/bitops/non-atomic.h> > diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c > index 8b81d0f00c97..cf80d1ae352b 100644 > --- a/arch/sparc/lib/atomic32.c > +++ b/arch/sparc/lib/atomic32.c > @@ -120,7 +120,7 @@ void arch_atomic_set(atomic_t *v, int i) > } > EXPORT_SYMBOL(arch_atomic_set); > > -unsigned long ___set_bit(unsigned long *addr, unsigned long mask) > +unsigned long sp32___set_bit(unsigned long *addr, unsigned long mask) > { > unsigned long old, flags; > > @@ -131,9 +131,9 @@ unsigned long ___set_bit(unsigned long *addr, unsigned long mask) > > return old & mask; > } > -EXPORT_SYMBOL(___set_bit); > +EXPORT_SYMBOL(sp32___set_bit); > > -unsigned long ___clear_bit(unsigned long *addr, unsigned long mask) > +unsigned long sp32___clear_bit(unsigned long *addr, unsigned long mask) > { > unsigned long old, flags; > > @@ -144,9 +144,9 @@ unsigned long ___clear_bit(unsigned long *addr, unsigned long mask) > > return old & mask; > } > -EXPORT_SYMBOL(___clear_bit); > +EXPORT_SYMBOL(sp32___clear_bit); > > -unsigned long ___change_bit(unsigned long *addr, unsigned long mask) > +unsigned long sp32___change_bit(unsigned long *addr, unsigned long mask) > { > unsigned long old, flags; > > @@ -157,7 +157,7 @@ unsigned long ___change_bit(unsigned long *addr, unsigned long mask) > > return old & mask; > } > -EXPORT_SYMBOL(___change_bit); > +EXPORT_SYMBOL(sp32___change_bit); > > unsigned long __cmpxchg_u32(volatile u32 *ptr, u32 old, u32 new) > { > diff --git a/include/asm-generic/bitops/instrumented-non-atomic.h b/include/asm-generic/bitops/instrumented-non-atomic.h > index b019f77ef21c..988a3bbfba34 100644 > --- a/include/asm-generic/bitops/instrumented-non-atomic.h > +++ b/include/asm-generic/bitops/instrumented-non-atomic.h > @@ -14,7 +14,7 @@ > #include <linux/instrumented.h> > > /** > - * __set_bit - Set a bit in memory > + * ___set_bit - Set a bit in memory > * @nr: the bit to set > * @addr: the address to start counting from > * > @@ -23,14 +23,14 @@ > * succeeds. > */ > static __always_inline void > -__set_bit(unsigned long nr, volatile unsigned long *addr) > +___set_bit(unsigned long nr, volatile unsigned long *addr) > { > instrument_write(addr + BIT_WORD(nr), sizeof(long)); > arch___set_bit(nr, addr); > } > > /** > - * __clear_bit - Clears a bit in memory > + * ___clear_bit - Clears a bit in memory > * @nr: the bit to clear > * @addr: the address to start counting from > * > @@ -39,14 +39,14 @@ __set_bit(unsigned long nr, volatile unsigned long *addr) > * succeeds. > */ > static __always_inline void > -__clear_bit(unsigned long nr, volatile unsigned long *addr) > +___clear_bit(unsigned long nr, volatile unsigned long *addr) > { > instrument_write(addr + BIT_WORD(nr), sizeof(long)); > arch___clear_bit(nr, addr); > } > > /** > - * __change_bit - Toggle a bit in memory > + * ___change_bit - Toggle a bit in memory > * @nr: the bit to change > * @addr: the address to start counting from > * > @@ -55,7 +55,7 @@ __clear_bit(unsigned long nr, volatile unsigned long *addr) > * succeeds. > */ > static __always_inline void > -__change_bit(unsigned long nr, volatile unsigned long *addr) > +___change_bit(unsigned long nr, volatile unsigned long *addr) > { > instrument_write(addr + BIT_WORD(nr), sizeof(long)); > arch___change_bit(nr, addr); > @@ -86,7 +86,7 @@ static __always_inline void __instrument_read_write_bitop(long nr, volatile unsi > } > > /** > - * __test_and_set_bit - Set a bit and return its old value > + * ___test_and_set_bit - Set a bit and return its old value > * @nr: Bit to set > * @addr: Address to count from > * > @@ -94,14 +94,14 @@ static __always_inline void __instrument_read_write_bitop(long nr, volatile unsi > * can appear to succeed but actually fail. > */ > static __always_inline bool > -__test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > { > __instrument_read_write_bitop(nr, addr); > return arch___test_and_set_bit(nr, addr); > } > > /** > - * __test_and_clear_bit - Clear a bit and return its old value > + * ___test_and_clear_bit - Clear a bit and return its old value > * @nr: Bit to clear > * @addr: Address to count from > * > @@ -109,14 +109,14 @@ __test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > * can appear to succeed but actually fail. > */ > static __always_inline bool > -__test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > { > __instrument_read_write_bitop(nr, addr); > return arch___test_and_clear_bit(nr, addr); > } > > /** > - * __test_and_change_bit - Change a bit and return its old value > + * ___test_and_change_bit - Change a bit and return its old value > * @nr: Bit to change > * @addr: Address to count from > * > @@ -124,19 +124,19 @@ __test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > * can appear to succeed but actually fail. > */ > static __always_inline bool > -__test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > { > __instrument_read_write_bitop(nr, addr); > return arch___test_and_change_bit(nr, addr); > } > > /** > - * test_bit - Determine whether a bit is set > + * _test_bit - Determine whether a bit is set > * @nr: bit number to test > * @addr: Address to start counting from > */ > static __always_inline bool > -test_bit(unsigned long nr, const volatile unsigned long *addr) > +_test_bit(unsigned long nr, const volatile unsigned long *addr) > { > instrument_atomic_read(addr + BIT_WORD(nr), sizeof(long)); > return arch_test_bit(nr, addr); > diff --git a/include/asm-generic/bitops/non-atomic.h b/include/asm-generic/bitops/non-atomic.h > index 7ce0ed22fb5f..0c488331c9e7 100644 > --- a/include/asm-generic/bitops/non-atomic.h > +++ b/include/asm-generic/bitops/non-atomic.h > @@ -6,24 +6,24 @@ > #include <asm/types.h> > > #define arch___set_bit gen___set_bit > -#define __set_bit arch___set_bit > +#define ___set_bit arch___set_bit > > #define arch___clear_bit gen___clear_bit > -#define __clear_bit arch___clear_bit > +#define ___clear_bit arch___clear_bit > > #define arch___change_bit gen___change_bit > -#define __change_bit arch___change_bit > +#define ___change_bit arch___change_bit > > #define arch___test_and_set_bit gen___test_and_set_bit > -#define __test_and_set_bit arch___test_and_set_bit > +#define ___test_and_set_bit arch___test_and_set_bit > > #define arch___test_and_clear_bit gen___test_and_clear_bit > -#define __test_and_clear_bit arch___test_and_clear_bit > +#define ___test_and_clear_bit arch___test_and_clear_bit > > #define arch___test_and_change_bit gen___test_and_change_bit > -#define __test_and_change_bit arch___test_and_change_bit > +#define ___test_and_change_bit arch___test_and_change_bit > > #define arch_test_bit gen_test_bit > -#define test_bit arch_test_bit > +#define _test_bit arch_test_bit > > #endif /* _ASM_GENERIC_BITOPS_NON_ATOMIC_H_ */ > diff --git a/include/linux/bitops.h b/include/linux/bitops.h > index 5520ac9b1c24..33cfc836a115 100644 > --- a/include/linux/bitops.h > +++ b/include/linux/bitops.h > @@ -26,8 +26,24 @@ extern unsigned int __sw_hweight16(unsigned int w); > extern unsigned int __sw_hweight32(unsigned int w); > extern unsigned long __sw_hweight64(__u64 w); > > +/* > + * Defined here because those may be needed by architecture-specific static > + * inlines. > + */ > + > #include <asm-generic/bitops/generic-non-atomic.h> > > +#define bitop(op, nr, addr) \ > + op(nr, addr) > + > +#define __set_bit(nr, addr) bitop(___set_bit, nr, addr) > +#define __clear_bit(nr, addr) bitop(___clear_bit, nr, addr) > +#define __change_bit(nr, addr) bitop(___change_bit, nr, addr) > +#define __test_and_set_bit(nr, addr) bitop(___test_and_set_bit, nr, addr) > +#define __test_and_clear_bit(nr, addr) bitop(___test_and_clear_bit, nr, addr) > +#define __test_and_change_bit(nr, addr) bitop(___test_and_change_bit, nr, addr) > +#define test_bit(nr, addr) bitop(_test_bit, nr, addr) > + > /* > * Include this here because some architectures need generic_ffs/fls in > * scope > @@ -35,14 +51,14 @@ extern unsigned long __sw_hweight64(__u64 w); > #include <asm/bitops.h> > > /* Check that the bitops prototypes are sane */ > -#define __check_bitop_pr(name) static_assert(__same_type(name, gen_##name)) > -__check_bitop_pr(__set_bit); > -__check_bitop_pr(__clear_bit); > -__check_bitop_pr(__change_bit); > -__check_bitop_pr(__test_and_set_bit); > -__check_bitop_pr(__test_and_clear_bit); > -__check_bitop_pr(__test_and_change_bit); > -__check_bitop_pr(test_bit); > +#define __check_bitop_pr(name) static_assert(__same_type(name, gen##name)) > +__check_bitop_pr(___set_bit); > +__check_bitop_pr(___clear_bit); > +__check_bitop_pr(___change_bit); > +__check_bitop_pr(___test_and_set_bit); > +__check_bitop_pr(___test_and_clear_bit); > +__check_bitop_pr(___test_and_change_bit); > +__check_bitop_pr(_test_bit); > #undef __check_bitop_pr > > static inline int get_bitmask_order(unsigned int count) > diff --git a/tools/include/asm-generic/bitops/non-atomic.h b/tools/include/asm-generic/bitops/non-atomic.h > index e5e78e42e57b..0c472a833408 100644 > --- a/tools/include/asm-generic/bitops/non-atomic.h > +++ b/tools/include/asm-generic/bitops/non-atomic.h > @@ -5,7 +5,7 @@ > #include <linux/bits.h> > > /** > - * __set_bit - Set a bit in memory > + * ___set_bit - Set a bit in memory > * @nr: the bit to set > * @addr: the address to start counting from > * > @@ -14,7 +14,7 @@ > * may be that only one operation succeeds. > */ > static __always_inline void > -__set_bit(unsigned long nr, volatile unsigned long *addr) > +___set_bit(unsigned long nr, volatile unsigned long *addr) > { > unsigned long mask = BIT_MASK(nr); > unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); > @@ -23,7 +23,7 @@ __set_bit(unsigned long nr, volatile unsigned long *addr) > } > > static __always_inline void > -__clear_bit(unsigned long nr, volatile unsigned long *addr) > +___clear_bit(unsigned long nr, volatile unsigned long *addr) > { > unsigned long mask = BIT_MASK(nr); > unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); > @@ -32,7 +32,7 @@ __clear_bit(unsigned long nr, volatile unsigned long *addr) > } > > /** > - * __change_bit - Toggle a bit in memory > + * ___change_bit - Toggle a bit in memory > * @nr: the bit to change > * @addr: the address to start counting from > * > @@ -41,7 +41,7 @@ __clear_bit(unsigned long nr, volatile unsigned long *addr) > * may be that only one operation succeeds. > */ > static __always_inline void > -__change_bit(unsigned long nr, volatile unsigned long *addr) > +___change_bit(unsigned long nr, volatile unsigned long *addr) > { > unsigned long mask = BIT_MASK(nr); > unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); > @@ -50,7 +50,7 @@ __change_bit(unsigned long nr, volatile unsigned long *addr) > } > > /** > - * __test_and_set_bit - Set a bit and return its old value > + * ___test_and_set_bit - Set a bit and return its old value > * @nr: Bit to set > * @addr: Address to count from > * > @@ -59,7 +59,7 @@ __change_bit(unsigned long nr, volatile unsigned long *addr) > * but actually fail. You must protect multiple accesses with a lock. > */ > static __always_inline bool > -__test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > { > unsigned long mask = BIT_MASK(nr); > unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); > @@ -70,7 +70,7 @@ __test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > } > > /** > - * __test_and_clear_bit - Clear a bit and return its old value > + * ___test_and_clear_bit - Clear a bit and return its old value > * @nr: Bit to clear > * @addr: Address to count from > * > @@ -79,7 +79,7 @@ __test_and_set_bit(unsigned long nr, volatile unsigned long *addr) > * but actually fail. You must protect multiple accesses with a lock. > */ > static __always_inline bool > -__test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > { > unsigned long mask = BIT_MASK(nr); > unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); > @@ -91,7 +91,7 @@ __test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) > > /* WARNING: non atomic and it can be reordered! */ > static __always_inline bool > -__test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > +___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > { > unsigned long mask = BIT_MASK(nr); > unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); > @@ -102,12 +102,12 @@ __test_and_change_bit(unsigned long nr, volatile unsigned long *addr) > } > > /** > - * test_bit - Determine whether a bit is set > + * _test_bit - Determine whether a bit is set > * @nr: bit number to test > * @addr: Address to start counting from > */ > static __always_inline bool > -test_bit(unsigned long nr, const volatile unsigned long *addr) > +_test_bit(unsigned long nr, const volatile unsigned long *addr) > { > return 1UL & (addr[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG-1))); > } > diff --git a/tools/include/linux/bitops.h b/tools/include/linux/bitops.h > index 5fca38fe1ba8..f18683b95ea6 100644 > --- a/tools/include/linux/bitops.h > +++ b/tools/include/linux/bitops.h > @@ -25,6 +25,22 @@ extern unsigned int __sw_hweight16(unsigned int w); > extern unsigned int __sw_hweight32(unsigned int w); > extern unsigned long __sw_hweight64(__u64 w); > > +/* > + * Defined here because those may be needed by architecture-specific static > + * inlines. > + */ > + > +#define bitop(op, nr, addr) \ > + op(nr, addr) > + > +#define __set_bit(nr, addr) bitop(___set_bit, nr, addr) > +#define __clear_bit(nr, addr) bitop(___clear_bit, nr, addr) > +#define __change_bit(nr, addr) bitop(___change_bit, nr, addr) > +#define __test_and_set_bit(nr, addr) bitop(___test_and_set_bit, nr, addr) > +#define __test_and_clear_bit(nr, addr) bitop(___test_and_clear_bit, nr, addr) > +#define __test_and_change_bit(nr, addr) bitop(___test_and_change_bit, nr, addr) > +#define test_bit(nr, addr) bitop(_test_bit, nr, addr) > + > /* > * Include this here because some architectures need generic_ffs/fls in > * scope > -- > 2.36.1 >
From: Mark Rutland <mark.rutland@arm.com> Date: Mon, 6 Jun 2022 17:27:16 +0100 > On Mon, Jun 06, 2022 at 01:49:06PM +0200, Alexander Lobakin wrote: > > In preparation for altering the non-atomic bitops with a macro, wrap > > them in a transparent definition. This requires prepending one more > > '_' to their names in order to be able to do that seamlessly. > > sparc32 already has the triple-underscored functions, so I had to > > rename them ('___' -> 'sp32_'). > > Could we use an 'arch_' prefix here, like we do for the atomics, or is that > already overloaded? Yeah it is, for example, x86 has 'arch_' functions defined in its architecture headers[0] and at the same time uses generic instrumented '__' helpers[1], so on x86 both underscored and 'arch_' are defined and they are not the same. Same with those sparc32 triple-underscored, sparc32 at the same time uses generic non-instrumented, so it has underscored, 'arch_' and triple-underscored. In general, bitops are overloaded with tons of prefixes already :) I'm not really glad that I introduced one more level, but not that we have many options here. > > Thanks, > Mark. > > > > > Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com> > > --- [...] > > -- > > 2.36.1 Thanks, Olek
From: Alexander Lobakin <alexandr.lobakin@intel.com> Date: Tue, 7 Jun 2022 12:57:18 +0200 > From: Mark Rutland <mark.rutland@arm.com> > Date: Mon, 6 Jun 2022 17:27:16 +0100 > > > On Mon, Jun 06, 2022 at 01:49:06PM +0200, Alexander Lobakin wrote: > > > In preparation for altering the non-atomic bitops with a macro, wrap > > > them in a transparent definition. This requires prepending one more > > > '_' to their names in order to be able to do that seamlessly. > > > sparc32 already has the triple-underscored functions, so I had to > > > rename them ('___' -> 'sp32_'). > > > > Could we use an 'arch_' prefix here, like we do for the atomics, or is that > > already overloaded? > > Yeah it is, for example, x86 has 'arch_' functions defined in its > architecture headers[0] and at the same time uses generic > instrumented '__' helpers[1], so on x86 both underscored and 'arch_' > are defined and they are not the same. Oh well, forgot to attach the links. Can be found at the bottom of this mail. > Same with those sparc32 triple-underscored, sparc32 at the same time > uses generic non-instrumented, so it has underscored, 'arch_' and > triple-underscored. > > In general, bitops are overloaded with tons of prefixes already :) > I'm not really glad that I introduced one more level, but not that > we have many options here. > > > > > Thanks, > > Mark. > > > > > > > > Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com> > > > --- > > [...] > > > > -- > > > 2.36.1 > > Thanks, > Olek [0] https://elixir.bootlin.com/linux/v5.19-rc1/source/arch/x86/include/asm/bitops.h#L136 [1] https://elixir.bootlin.com/linux/v5.19-rc1/source/include/asm-generic/bitops/instrumented-non-atomic.h#L93 Thanks, Olek
diff --git a/arch/alpha/include/asm/bitops.h b/arch/alpha/include/asm/bitops.h index 381ad2eae4b4..e7d119826062 100644 --- a/arch/alpha/include/asm/bitops.h +++ b/arch/alpha/include/asm/bitops.h @@ -47,7 +47,7 @@ set_bit(unsigned long nr, volatile void * addr) * WARNING: non atomic version. */ static __always_inline void -__set_bit(unsigned long nr, volatile unsigned long *addr) +___set_bit(unsigned long nr, volatile unsigned long *addr) { int *m = ((int *) addr) + (nr >> 5); @@ -83,7 +83,7 @@ clear_bit_unlock(unsigned long nr, volatile void * addr) * WARNING: non atomic version. */ static __always_inline void -__clear_bit(unsigned long nr, volatile unsigned long *addr) +___clear_bit(unsigned long nr, volatile unsigned long *addr) { int *m = ((int *) addr) + (nr >> 5); @@ -119,7 +119,7 @@ change_bit(unsigned long nr, volatile void * addr) * WARNING: non atomic version. */ static __always_inline void -__change_bit(unsigned long nr, volatile unsigned long *addr) +___change_bit(unsigned long nr, volatile unsigned long *addr) { int *m = ((int *) addr) + (nr >> 5); @@ -187,7 +187,7 @@ test_and_set_bit_lock(unsigned long nr, volatile void *addr) * WARNING: non atomic version. */ static __always_inline bool -__test_and_set_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_set_bit(unsigned long nr, volatile unsigned long *addr) { unsigned long mask = 1 << (nr & 0x1f); int *m = ((int *) addr) + (nr >> 5); @@ -231,7 +231,7 @@ test_and_clear_bit(unsigned long nr, volatile void * addr) * WARNING: non atomic version. */ static __always_inline bool -__test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) { unsigned long mask = 1 << (nr & 0x1f); int *m = ((int *) addr) + (nr >> 5); @@ -273,7 +273,7 @@ test_and_change_bit(unsigned long nr, volatile void * addr) * WARNING: non atomic version. */ static __always_inline bool -__test_and_change_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) { unsigned long mask = 1 << (nr & 0x1f); int *m = ((int *) addr) + (nr >> 5); @@ -284,7 +284,7 @@ __test_and_change_bit(unsigned long nr, volatile unsigned long *addr) } static __always_inline bool -test_bit(unsigned long nr, const volatile unsigned long *addr) +_test_bit(unsigned long nr, const volatile unsigned long *addr) { return (1UL & (((const int *) addr)[nr >> 5] >> (nr & 31))) != 0UL; } diff --git a/arch/hexagon/include/asm/bitops.h b/arch/hexagon/include/asm/bitops.h index a3bfe3a8d4b7..37144f8e0b0c 100644 --- a/arch/hexagon/include/asm/bitops.h +++ b/arch/hexagon/include/asm/bitops.h @@ -128,44 +128,44 @@ static inline void change_bit(int nr, volatile void *addr) * */ static __always_inline void -__clear_bit(unsigned long nr, volatile unsigned long *addr) +___clear_bit(unsigned long nr, volatile unsigned long *addr) { test_and_clear_bit(nr, addr); } static __always_inline void -__set_bit(unsigned long nr, volatile unsigned long *addr) +___set_bit(unsigned long nr, volatile unsigned long *addr) { test_and_set_bit(nr, addr); } static __always_inline void -__change_bit(unsigned long nr, volatile unsigned long *addr) +___change_bit(unsigned long nr, volatile unsigned long *addr) { test_and_change_bit(nr, addr); } /* Apparently, at least some of these are allowed to be non-atomic */ static __always_inline bool -__test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) { return test_and_clear_bit(nr, addr); } static __always_inline bool -__test_and_set_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_set_bit(unsigned long nr, volatile unsigned long *addr) { return test_and_set_bit(nr, addr); } static __always_inline bool -__test_and_change_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) { return test_and_change_bit(nr, addr); } static __always_inline bool -test_bit(unsigned long nr, const volatile unsigned long *addr) +_test_bit(unsigned long nr, const volatile unsigned long *addr) { int retval; @@ -179,7 +179,7 @@ test_bit(unsigned long nr, const volatile unsigned long *addr) return retval; } -#define __test_bit(nr, addr) test_bit(nr, addr) +#define __test_bit(nr, addr) _test_bit(nr, addr) /* * ffz - find first zero in word. diff --git a/arch/ia64/include/asm/bitops.h b/arch/ia64/include/asm/bitops.h index 4267a217a503..3cb231fb0283 100644 --- a/arch/ia64/include/asm/bitops.h +++ b/arch/ia64/include/asm/bitops.h @@ -53,7 +53,7 @@ set_bit (int nr, volatile void *addr) } /** - * __set_bit - Set a bit in memory + * ___set_bit - Set a bit in memory * @nr: the bit to set * @addr: the address to start counting from * @@ -62,7 +62,7 @@ set_bit (int nr, volatile void *addr) * may be that only one operation succeeds. */ static __always_inline void -__set_bit(unsigned long nr, volatile unsigned long *addr) +___set_bit(unsigned long nr, volatile unsigned long *addr) { *((__u32 *) addr + (nr >> 5)) |= (1 << (nr & 31)); } @@ -135,7 +135,7 @@ __clear_bit_unlock(int nr, void *addr) } /** - * __clear_bit - Clears a bit in memory (non-atomic version) + * ___clear_bit - Clears a bit in memory (non-atomic version) * @nr: the bit to clear * @addr: the address to start counting from * @@ -144,7 +144,7 @@ __clear_bit_unlock(int nr, void *addr) * may be that only one operation succeeds. */ static __always_inline void -__clear_bit(unsigned long nr, volatile unsigned long *addr) +___clear_bit(unsigned long nr, volatile unsigned long *addr) { *((__u32 *) addr + (nr >> 5)) &= ~(1 << (nr & 31)); } @@ -175,7 +175,7 @@ change_bit (int nr, volatile void *addr) } /** - * __change_bit - Toggle a bit in memory + * ___change_bit - Toggle a bit in memory * @nr: the bit to toggle * @addr: the address to start counting from * @@ -184,7 +184,7 @@ change_bit (int nr, volatile void *addr) * may be that only one operation succeeds. */ static __always_inline void -__change_bit(unsigned long nr, volatile unsigned long *addr) +___change_bit(unsigned long nr, volatile unsigned long *addr) { *((__u32 *) addr + (nr >> 5)) ^= (1 << (nr & 31)); } @@ -224,7 +224,7 @@ test_and_set_bit (int nr, volatile void *addr) #define test_and_set_bit_lock test_and_set_bit /** - * __test_and_set_bit - Set a bit and return its old value + * ___test_and_set_bit - Set a bit and return its old value * @nr: Bit to set * @addr: Address to count from * @@ -233,7 +233,7 @@ test_and_set_bit (int nr, volatile void *addr) * but actually fail. You must protect multiple accesses with a lock. */ static __always_inline bool -__test_and_set_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_set_bit(unsigned long nr, volatile unsigned long *addr) { __u32 *p = (__u32 *) addr + (nr >> 5); __u32 m = 1 << (nr & 31); @@ -269,7 +269,7 @@ test_and_clear_bit (int nr, volatile void *addr) } /** - * __test_and_clear_bit - Clear a bit and return its old value + * ___test_and_clear_bit - Clear a bit and return its old value * @nr: Bit to clear * @addr: Address to count from * @@ -278,7 +278,7 @@ test_and_clear_bit (int nr, volatile void *addr) * but actually fail. You must protect multiple accesses with a lock. */ static __always_inline bool -__test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) { __u32 *p = (__u32 *) addr + (nr >> 5); __u32 m = 1 << (nr & 31); @@ -314,14 +314,14 @@ test_and_change_bit (int nr, volatile void *addr) } /** - * __test_and_change_bit - Change a bit and return its old value + * ___test_and_change_bit - Change a bit and return its old value * @nr: Bit to change * @addr: Address to count from * * This operation is non-atomic and can be reordered. */ static __always_inline bool -__test_and_change_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) { __u32 old, bit = (1 << (nr & 31)); __u32 *m = (__u32 *) addr + (nr >> 5); @@ -332,7 +332,7 @@ __test_and_change_bit(unsigned long nr, volatile unsigned long *addr) } static __always_inline bool -test_bit(unsigned long nr, const volatile unsigned long *addr) +_test_bit(unsigned long nr, const volatile unsigned long *addr) { return 1 & (((const volatile __u32 *) addr)[nr >> 5] >> (nr & 31)); } diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h index 9d44bd4713cb..ed08c9d9c547 100644 --- a/arch/m68k/include/asm/bitops.h +++ b/arch/m68k/include/asm/bitops.h @@ -66,7 +66,7 @@ static inline void bfset_mem_set_bit(int nr, volatile unsigned long *vaddr) #endif static __always_inline void -__set_bit(unsigned long nr, volatile unsigned long *addr) +___set_bit(unsigned long nr, volatile unsigned long *addr) { set_bit(nr, addr); } @@ -109,7 +109,7 @@ static inline void bfclr_mem_clear_bit(int nr, volatile unsigned long *vaddr) #endif static __always_inline void -__clear_bit(unsigned long nr, volatile unsigned long *addr) +___clear_bit(unsigned long nr, volatile unsigned long *addr) { clear_bit(nr, addr); } @@ -152,13 +152,13 @@ static inline void bfchg_mem_change_bit(int nr, volatile unsigned long *vaddr) #endif static __always_inline void -__change_bit(unsigned long nr, volatile unsigned long *addr) +___change_bit(unsigned long nr, volatile unsigned long *addr) { change_bit(nr, addr); } static __always_inline bool -test_bit(unsigned long nr, const volatile unsigned long *addr) +_test_bit(unsigned long nr, const volatile unsigned long *addr) { return (addr[nr >> 5] & (1UL << (nr & 31))) != 0; } @@ -212,7 +212,7 @@ static inline int bfset_mem_test_and_set_bit(int nr, #endif static __always_inline bool -__test_and_set_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_set_bit(unsigned long nr, volatile unsigned long *addr) { return test_and_set_bit(nr, addr); } @@ -265,7 +265,7 @@ static inline int bfclr_mem_test_and_clear_bit(int nr, #endif static __always_inline bool -__test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) { return test_and_clear_bit(nr, addr); } @@ -318,7 +318,7 @@ static inline int bfchg_mem_test_and_change_bit(int nr, #endif static __always_inline bool -__test_and_change_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) { return test_and_change_bit(nr, addr); } diff --git a/arch/sh/include/asm/bitops-op32.h b/arch/sh/include/asm/bitops-op32.h index dcd85866a394..24b8a809c1b9 100644 --- a/arch/sh/include/asm/bitops-op32.h +++ b/arch/sh/include/asm/bitops-op32.h @@ -19,7 +19,7 @@ #endif static __always_inline void -__set_bit(unsigned long nr, volatile unsigned long *addr) +___set_bit(unsigned long nr, volatile unsigned long *addr) { if (__builtin_constant_p(nr)) { __asm__ __volatile__ ( @@ -37,7 +37,7 @@ __set_bit(unsigned long nr, volatile unsigned long *addr) } static __always_inline void -__clear_bit(unsigned long nr, volatile unsigned long *addr) +___clear_bit(unsigned long nr, volatile unsigned long *addr) { if (__builtin_constant_p(nr)) { __asm__ __volatile__ ( @@ -56,7 +56,7 @@ __clear_bit(unsigned long nr, volatile unsigned long *addr) } /** - * __change_bit - Toggle a bit in memory + * ___change_bit - Toggle a bit in memory * @nr: the bit to change * @addr: the address to start counting from * @@ -65,7 +65,7 @@ __clear_bit(unsigned long nr, volatile unsigned long *addr) * may be that only one operation succeeds. */ static __always_inline void -__change_bit(unsigned long nr, volatile unsigned long *addr) +___change_bit(unsigned long nr, volatile unsigned long *addr) { if (__builtin_constant_p(nr)) { __asm__ __volatile__ ( @@ -84,7 +84,7 @@ __change_bit(unsigned long nr, volatile unsigned long *addr) } /** - * __test_and_set_bit - Set a bit and return its old value + * ___test_and_set_bit - Set a bit and return its old value * @nr: Bit to set * @addr: Address to count from * @@ -93,7 +93,7 @@ __change_bit(unsigned long nr, volatile unsigned long *addr) * but actually fail. You must protect multiple accesses with a lock. */ static __always_inline bool -__test_and_set_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_set_bit(unsigned long nr, volatile unsigned long *addr) { unsigned long mask = BIT_MASK(nr); unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); @@ -104,7 +104,7 @@ __test_and_set_bit(unsigned long nr, volatile unsigned long *addr) } /** - * __test_and_clear_bit - Clear a bit and return its old value + * ___test_and_clear_bit - Clear a bit and return its old value * @nr: Bit to clear * @addr: Address to count from * @@ -113,7 +113,7 @@ __test_and_set_bit(unsigned long nr, volatile unsigned long *addr) * but actually fail. You must protect multiple accesses with a lock. */ static __always_inline bool -__test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) { unsigned long mask = BIT_MASK(nr); unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); @@ -125,7 +125,7 @@ __test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) /* WARNING: non atomic and it can be reordered! */ static __always_inline bool -__test_and_change_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) { unsigned long mask = BIT_MASK(nr); unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); @@ -136,12 +136,12 @@ __test_and_change_bit(unsigned long nr, volatile unsigned long *addr) } /** - * test_bit - Determine whether a bit is set + * _test_bit - Determine whether a bit is set * @nr: bit number to test * @addr: Address to start counting from */ static __always_inline bool -test_bit(unsigned long nr, const volatile unsigned long *addr) +_test_bit(unsigned long nr, const volatile unsigned long *addr) { return 1UL & (addr[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG-1))); } diff --git a/arch/sparc/include/asm/bitops_32.h b/arch/sparc/include/asm/bitops_32.h index 889afa9f990f..3448c191b484 100644 --- a/arch/sparc/include/asm/bitops_32.h +++ b/arch/sparc/include/asm/bitops_32.h @@ -19,9 +19,9 @@ #error only <linux/bitops.h> can be included directly #endif -unsigned long ___set_bit(unsigned long *addr, unsigned long mask); -unsigned long ___clear_bit(unsigned long *addr, unsigned long mask); -unsigned long ___change_bit(unsigned long *addr, unsigned long mask); +unsigned long sp32___set_bit(unsigned long *addr, unsigned long mask); +unsigned long sp32___clear_bit(unsigned long *addr, unsigned long mask); +unsigned long sp32___change_bit(unsigned long *addr, unsigned long mask); /* * Set bit 'nr' in 32-bit quantity at address 'addr' where bit '0' @@ -36,7 +36,7 @@ static inline int test_and_set_bit(unsigned long nr, volatile unsigned long *add ADDR = ((unsigned long *) addr) + (nr >> 5); mask = 1 << (nr & 31); - return ___set_bit(ADDR, mask) != 0; + return sp32___set_bit(ADDR, mask) != 0; } static inline void set_bit(unsigned long nr, volatile unsigned long *addr) @@ -46,7 +46,7 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *addr) ADDR = ((unsigned long *) addr) + (nr >> 5); mask = 1 << (nr & 31); - (void) ___set_bit(ADDR, mask); + (void) sp32___set_bit(ADDR, mask); } static inline int test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) @@ -56,7 +56,7 @@ static inline int test_and_clear_bit(unsigned long nr, volatile unsigned long *a ADDR = ((unsigned long *) addr) + (nr >> 5); mask = 1 << (nr & 31); - return ___clear_bit(ADDR, mask) != 0; + return sp32___clear_bit(ADDR, mask) != 0; } static inline void clear_bit(unsigned long nr, volatile unsigned long *addr) @@ -66,7 +66,7 @@ static inline void clear_bit(unsigned long nr, volatile unsigned long *addr) ADDR = ((unsigned long *) addr) + (nr >> 5); mask = 1 << (nr & 31); - (void) ___clear_bit(ADDR, mask); + (void) sp32___clear_bit(ADDR, mask); } static inline int test_and_change_bit(unsigned long nr, volatile unsigned long *addr) @@ -76,7 +76,7 @@ static inline int test_and_change_bit(unsigned long nr, volatile unsigned long * ADDR = ((unsigned long *) addr) + (nr >> 5); mask = 1 << (nr & 31); - return ___change_bit(ADDR, mask) != 0; + return sp32___change_bit(ADDR, mask) != 0; } static inline void change_bit(unsigned long nr, volatile unsigned long *addr) @@ -86,7 +86,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr) ADDR = ((unsigned long *) addr) + (nr >> 5); mask = 1 << (nr & 31); - (void) ___change_bit(ADDR, mask); + (void) sp32___change_bit(ADDR, mask); } #include <asm-generic/bitops/non-atomic.h> diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c index 8b81d0f00c97..cf80d1ae352b 100644 --- a/arch/sparc/lib/atomic32.c +++ b/arch/sparc/lib/atomic32.c @@ -120,7 +120,7 @@ void arch_atomic_set(atomic_t *v, int i) } EXPORT_SYMBOL(arch_atomic_set); -unsigned long ___set_bit(unsigned long *addr, unsigned long mask) +unsigned long sp32___set_bit(unsigned long *addr, unsigned long mask) { unsigned long old, flags; @@ -131,9 +131,9 @@ unsigned long ___set_bit(unsigned long *addr, unsigned long mask) return old & mask; } -EXPORT_SYMBOL(___set_bit); +EXPORT_SYMBOL(sp32___set_bit); -unsigned long ___clear_bit(unsigned long *addr, unsigned long mask) +unsigned long sp32___clear_bit(unsigned long *addr, unsigned long mask) { unsigned long old, flags; @@ -144,9 +144,9 @@ unsigned long ___clear_bit(unsigned long *addr, unsigned long mask) return old & mask; } -EXPORT_SYMBOL(___clear_bit); +EXPORT_SYMBOL(sp32___clear_bit); -unsigned long ___change_bit(unsigned long *addr, unsigned long mask) +unsigned long sp32___change_bit(unsigned long *addr, unsigned long mask) { unsigned long old, flags; @@ -157,7 +157,7 @@ unsigned long ___change_bit(unsigned long *addr, unsigned long mask) return old & mask; } -EXPORT_SYMBOL(___change_bit); +EXPORT_SYMBOL(sp32___change_bit); unsigned long __cmpxchg_u32(volatile u32 *ptr, u32 old, u32 new) { diff --git a/include/asm-generic/bitops/instrumented-non-atomic.h b/include/asm-generic/bitops/instrumented-non-atomic.h index b019f77ef21c..988a3bbfba34 100644 --- a/include/asm-generic/bitops/instrumented-non-atomic.h +++ b/include/asm-generic/bitops/instrumented-non-atomic.h @@ -14,7 +14,7 @@ #include <linux/instrumented.h> /** - * __set_bit - Set a bit in memory + * ___set_bit - Set a bit in memory * @nr: the bit to set * @addr: the address to start counting from * @@ -23,14 +23,14 @@ * succeeds. */ static __always_inline void -__set_bit(unsigned long nr, volatile unsigned long *addr) +___set_bit(unsigned long nr, volatile unsigned long *addr) { instrument_write(addr + BIT_WORD(nr), sizeof(long)); arch___set_bit(nr, addr); } /** - * __clear_bit - Clears a bit in memory + * ___clear_bit - Clears a bit in memory * @nr: the bit to clear * @addr: the address to start counting from * @@ -39,14 +39,14 @@ __set_bit(unsigned long nr, volatile unsigned long *addr) * succeeds. */ static __always_inline void -__clear_bit(unsigned long nr, volatile unsigned long *addr) +___clear_bit(unsigned long nr, volatile unsigned long *addr) { instrument_write(addr + BIT_WORD(nr), sizeof(long)); arch___clear_bit(nr, addr); } /** - * __change_bit - Toggle a bit in memory + * ___change_bit - Toggle a bit in memory * @nr: the bit to change * @addr: the address to start counting from * @@ -55,7 +55,7 @@ __clear_bit(unsigned long nr, volatile unsigned long *addr) * succeeds. */ static __always_inline void -__change_bit(unsigned long nr, volatile unsigned long *addr) +___change_bit(unsigned long nr, volatile unsigned long *addr) { instrument_write(addr + BIT_WORD(nr), sizeof(long)); arch___change_bit(nr, addr); @@ -86,7 +86,7 @@ static __always_inline void __instrument_read_write_bitop(long nr, volatile unsi } /** - * __test_and_set_bit - Set a bit and return its old value + * ___test_and_set_bit - Set a bit and return its old value * @nr: Bit to set * @addr: Address to count from * @@ -94,14 +94,14 @@ static __always_inline void __instrument_read_write_bitop(long nr, volatile unsi * can appear to succeed but actually fail. */ static __always_inline bool -__test_and_set_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_set_bit(unsigned long nr, volatile unsigned long *addr) { __instrument_read_write_bitop(nr, addr); return arch___test_and_set_bit(nr, addr); } /** - * __test_and_clear_bit - Clear a bit and return its old value + * ___test_and_clear_bit - Clear a bit and return its old value * @nr: Bit to clear * @addr: Address to count from * @@ -109,14 +109,14 @@ __test_and_set_bit(unsigned long nr, volatile unsigned long *addr) * can appear to succeed but actually fail. */ static __always_inline bool -__test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) { __instrument_read_write_bitop(nr, addr); return arch___test_and_clear_bit(nr, addr); } /** - * __test_and_change_bit - Change a bit and return its old value + * ___test_and_change_bit - Change a bit and return its old value * @nr: Bit to change * @addr: Address to count from * @@ -124,19 +124,19 @@ __test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) * can appear to succeed but actually fail. */ static __always_inline bool -__test_and_change_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) { __instrument_read_write_bitop(nr, addr); return arch___test_and_change_bit(nr, addr); } /** - * test_bit - Determine whether a bit is set + * _test_bit - Determine whether a bit is set * @nr: bit number to test * @addr: Address to start counting from */ static __always_inline bool -test_bit(unsigned long nr, const volatile unsigned long *addr) +_test_bit(unsigned long nr, const volatile unsigned long *addr) { instrument_atomic_read(addr + BIT_WORD(nr), sizeof(long)); return arch_test_bit(nr, addr); diff --git a/include/asm-generic/bitops/non-atomic.h b/include/asm-generic/bitops/non-atomic.h index 7ce0ed22fb5f..0c488331c9e7 100644 --- a/include/asm-generic/bitops/non-atomic.h +++ b/include/asm-generic/bitops/non-atomic.h @@ -6,24 +6,24 @@ #include <asm/types.h> #define arch___set_bit gen___set_bit -#define __set_bit arch___set_bit +#define ___set_bit arch___set_bit #define arch___clear_bit gen___clear_bit -#define __clear_bit arch___clear_bit +#define ___clear_bit arch___clear_bit #define arch___change_bit gen___change_bit -#define __change_bit arch___change_bit +#define ___change_bit arch___change_bit #define arch___test_and_set_bit gen___test_and_set_bit -#define __test_and_set_bit arch___test_and_set_bit +#define ___test_and_set_bit arch___test_and_set_bit #define arch___test_and_clear_bit gen___test_and_clear_bit -#define __test_and_clear_bit arch___test_and_clear_bit +#define ___test_and_clear_bit arch___test_and_clear_bit #define arch___test_and_change_bit gen___test_and_change_bit -#define __test_and_change_bit arch___test_and_change_bit +#define ___test_and_change_bit arch___test_and_change_bit #define arch_test_bit gen_test_bit -#define test_bit arch_test_bit +#define _test_bit arch_test_bit #endif /* _ASM_GENERIC_BITOPS_NON_ATOMIC_H_ */ diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 5520ac9b1c24..33cfc836a115 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -26,8 +26,24 @@ extern unsigned int __sw_hweight16(unsigned int w); extern unsigned int __sw_hweight32(unsigned int w); extern unsigned long __sw_hweight64(__u64 w); +/* + * Defined here because those may be needed by architecture-specific static + * inlines. + */ + #include <asm-generic/bitops/generic-non-atomic.h> +#define bitop(op, nr, addr) \ + op(nr, addr) + +#define __set_bit(nr, addr) bitop(___set_bit, nr, addr) +#define __clear_bit(nr, addr) bitop(___clear_bit, nr, addr) +#define __change_bit(nr, addr) bitop(___change_bit, nr, addr) +#define __test_and_set_bit(nr, addr) bitop(___test_and_set_bit, nr, addr) +#define __test_and_clear_bit(nr, addr) bitop(___test_and_clear_bit, nr, addr) +#define __test_and_change_bit(nr, addr) bitop(___test_and_change_bit, nr, addr) +#define test_bit(nr, addr) bitop(_test_bit, nr, addr) + /* * Include this here because some architectures need generic_ffs/fls in * scope @@ -35,14 +51,14 @@ extern unsigned long __sw_hweight64(__u64 w); #include <asm/bitops.h> /* Check that the bitops prototypes are sane */ -#define __check_bitop_pr(name) static_assert(__same_type(name, gen_##name)) -__check_bitop_pr(__set_bit); -__check_bitop_pr(__clear_bit); -__check_bitop_pr(__change_bit); -__check_bitop_pr(__test_and_set_bit); -__check_bitop_pr(__test_and_clear_bit); -__check_bitop_pr(__test_and_change_bit); -__check_bitop_pr(test_bit); +#define __check_bitop_pr(name) static_assert(__same_type(name, gen##name)) +__check_bitop_pr(___set_bit); +__check_bitop_pr(___clear_bit); +__check_bitop_pr(___change_bit); +__check_bitop_pr(___test_and_set_bit); +__check_bitop_pr(___test_and_clear_bit); +__check_bitop_pr(___test_and_change_bit); +__check_bitop_pr(_test_bit); #undef __check_bitop_pr static inline int get_bitmask_order(unsigned int count) diff --git a/tools/include/asm-generic/bitops/non-atomic.h b/tools/include/asm-generic/bitops/non-atomic.h index e5e78e42e57b..0c472a833408 100644 --- a/tools/include/asm-generic/bitops/non-atomic.h +++ b/tools/include/asm-generic/bitops/non-atomic.h @@ -5,7 +5,7 @@ #include <linux/bits.h> /** - * __set_bit - Set a bit in memory + * ___set_bit - Set a bit in memory * @nr: the bit to set * @addr: the address to start counting from * @@ -14,7 +14,7 @@ * may be that only one operation succeeds. */ static __always_inline void -__set_bit(unsigned long nr, volatile unsigned long *addr) +___set_bit(unsigned long nr, volatile unsigned long *addr) { unsigned long mask = BIT_MASK(nr); unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); @@ -23,7 +23,7 @@ __set_bit(unsigned long nr, volatile unsigned long *addr) } static __always_inline void -__clear_bit(unsigned long nr, volatile unsigned long *addr) +___clear_bit(unsigned long nr, volatile unsigned long *addr) { unsigned long mask = BIT_MASK(nr); unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); @@ -32,7 +32,7 @@ __clear_bit(unsigned long nr, volatile unsigned long *addr) } /** - * __change_bit - Toggle a bit in memory + * ___change_bit - Toggle a bit in memory * @nr: the bit to change * @addr: the address to start counting from * @@ -41,7 +41,7 @@ __clear_bit(unsigned long nr, volatile unsigned long *addr) * may be that only one operation succeeds. */ static __always_inline void -__change_bit(unsigned long nr, volatile unsigned long *addr) +___change_bit(unsigned long nr, volatile unsigned long *addr) { unsigned long mask = BIT_MASK(nr); unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); @@ -50,7 +50,7 @@ __change_bit(unsigned long nr, volatile unsigned long *addr) } /** - * __test_and_set_bit - Set a bit and return its old value + * ___test_and_set_bit - Set a bit and return its old value * @nr: Bit to set * @addr: Address to count from * @@ -59,7 +59,7 @@ __change_bit(unsigned long nr, volatile unsigned long *addr) * but actually fail. You must protect multiple accesses with a lock. */ static __always_inline bool -__test_and_set_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_set_bit(unsigned long nr, volatile unsigned long *addr) { unsigned long mask = BIT_MASK(nr); unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); @@ -70,7 +70,7 @@ __test_and_set_bit(unsigned long nr, volatile unsigned long *addr) } /** - * __test_and_clear_bit - Clear a bit and return its old value + * ___test_and_clear_bit - Clear a bit and return its old value * @nr: Bit to clear * @addr: Address to count from * @@ -79,7 +79,7 @@ __test_and_set_bit(unsigned long nr, volatile unsigned long *addr) * but actually fail. You must protect multiple accesses with a lock. */ static __always_inline bool -__test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) { unsigned long mask = BIT_MASK(nr); unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); @@ -91,7 +91,7 @@ __test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) /* WARNING: non atomic and it can be reordered! */ static __always_inline bool -__test_and_change_bit(unsigned long nr, volatile unsigned long *addr) +___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) { unsigned long mask = BIT_MASK(nr); unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); @@ -102,12 +102,12 @@ __test_and_change_bit(unsigned long nr, volatile unsigned long *addr) } /** - * test_bit - Determine whether a bit is set + * _test_bit - Determine whether a bit is set * @nr: bit number to test * @addr: Address to start counting from */ static __always_inline bool -test_bit(unsigned long nr, const volatile unsigned long *addr) +_test_bit(unsigned long nr, const volatile unsigned long *addr) { return 1UL & (addr[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG-1))); } diff --git a/tools/include/linux/bitops.h b/tools/include/linux/bitops.h index 5fca38fe1ba8..f18683b95ea6 100644 --- a/tools/include/linux/bitops.h +++ b/tools/include/linux/bitops.h @@ -25,6 +25,22 @@ extern unsigned int __sw_hweight16(unsigned int w); extern unsigned int __sw_hweight32(unsigned int w); extern unsigned long __sw_hweight64(__u64 w); +/* + * Defined here because those may be needed by architecture-specific static + * inlines. + */ + +#define bitop(op, nr, addr) \ + op(nr, addr) + +#define __set_bit(nr, addr) bitop(___set_bit, nr, addr) +#define __clear_bit(nr, addr) bitop(___clear_bit, nr, addr) +#define __change_bit(nr, addr) bitop(___change_bit, nr, addr) +#define __test_and_set_bit(nr, addr) bitop(___test_and_set_bit, nr, addr) +#define __test_and_clear_bit(nr, addr) bitop(___test_and_clear_bit, nr, addr) +#define __test_and_change_bit(nr, addr) bitop(___test_and_change_bit, nr, addr) +#define test_bit(nr, addr) bitop(_test_bit, nr, addr) + /* * Include this here because some architectures need generic_ffs/fls in * scope
In preparation for altering the non-atomic bitops with a macro, wrap them in a transparent definition. This requires prepending one more '_' to their names in order to be able to do that seamlessly. sparc32 already has the triple-underscored functions, so I had to rename them ('___' -> 'sp32_'). Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com> --- arch/alpha/include/asm/bitops.h | 14 ++++---- arch/hexagon/include/asm/bitops.h | 16 +++++----- arch/ia64/include/asm/bitops.h | 26 +++++++-------- arch/m68k/include/asm/bitops.h | 14 ++++---- arch/sh/include/asm/bitops-op32.h | 22 ++++++------- arch/sparc/include/asm/bitops_32.h | 18 +++++------ arch/sparc/lib/atomic32.c | 12 +++---- .../bitops/instrumented-non-atomic.h | 28 ++++++++-------- include/asm-generic/bitops/non-atomic.h | 14 ++++---- include/linux/bitops.h | 32 ++++++++++++++----- tools/include/asm-generic/bitops/non-atomic.h | 24 +++++++------- tools/include/linux/bitops.h | 16 ++++++++++ 12 files changed, 134 insertions(+), 102 deletions(-)