atomic.h : standardizing atomic primitives
Subsystems (2)
cover atomic.h : standardizing atomic primitives
atomic.h : standardizing atomic primitives
It mainly adds support for missing 64 bits cmpxchg and 64 bits atomic add unless. Therefore, principally 64 bits architectures are targeted by these patches. It also adds the complete list of atomic operations on the atomic_long type.
These patches compile fine against :
arm
i686
ia64
m68k
mips
mipselx86_64
ppc 405
powerpc 970
s390
sparc
sparc64
I haven't built cross-compilers for other architectures yet.
These patches apply on 2.6.20
PATCH 1/10 atomic.h : Add atomic64 cmpxchg, xchg and add_unless to alpha
atomic.h : Add atomic64 cmpxchg, xchg and add_unless to alpha
include/asm-alpha/atomic.h +46 -3
@@ -175,19 +175,62 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)return result; } -#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic64_cmpxchg (v, old, new) (cmpxchg(&((v)->counter), old, new)) +#define atomic64_xchg (v, new) (xchg(&((v)->counter), new)) + +#define atomic_cmpxchg (v, old, new) (cmpxchg(&((v)->counter), old, new))#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) +/** +* atomic_add_unless - add unless the number is a given value +* @v: pointer of type atomic_t +* @a: the amount to add to v... +* @u: ...unless v is equal to u. +* +* Atomically adds @a to @v, so long as it was not @u. +* Returns non-zero if @v was not @u, and zero otherwise. +*/ #define atomic_add_unless (v, a, u) \ ({ \ - int c, old; \ + __typeof__((v)->counter) c, old; \ c = atomic_read(v); \ - while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \ + for (;;) { \ + if (unlikely(c == (u))) \ + break; \ + old = atomic_cmpxchg((v), c, c + (a)); \ + if (likely(old == c)) \ + break; \ c = old; \ + } \ c != (u); \ })#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0) +/** +* atomic64_add_unless - add unless the number is a given value +* @v: pointer of type atomic64_t +* @a: the amount to add to v... +* @u: ...unless v is equal to u. +* +* Atomically adds @a to @v, so long as it was not @u. +* Returns non-zero if @v was not @u, and zero otherwise. +*/ +#define atomic64_add_unless (v, a, u) \ +({ \ + __typeof__((v)->counter) c, old; \ + c = atomic64_read(v); \ + for (;;) { \ + if (unlikely(c == (u))) \ + break; \ + old = atomic64_cmpxchg((v), c, c + (a)); \ + if (likely(old == c)) \ + break; \ + c = old; \ + } \ + c != (u); \ +}) +#define atomic64_inc_not_zero (v) atomic64_add_unless((v), 1, 0) +#define atomic_add_negative (a, v) (atomic_add_return((a), (v)) < 0)#define atomic64_add_negative (a, v) (atomic64_add_return((a), (v)) < 0)
PATCH 2/10 atomic.h : Complete atomic_long operations in asm-generic
In reply to Mathieu Desnoyersatomic.h : Complete atomic_long operations in asm-generic
include/asm-generic/atomic.h +133 -0
@@ -9,6 +9,7 @@*/ #include <asm/types.h> +#include <asm/system.h> /* * Suppport for atomic_long_t
@@ -66,6 +67,72 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)atomic64_sub (i, v); } +static inline int atomic_long_sub_and_test (long i,atomic_long_t *l) +{ +atomic64_t *v = (atomic64_t *)l; + +return atomic64_sub_and_test (i, v); +} + +static inline int atomic_long_dec_and_test (atomic_long_t *l) +{ +atomic64_t *v = (atomic64_t *)l; + +return atomic64_dec_and_test (v); +} + +static inline int atomic_long_inc_and_test (atomic_long_t *l) +{ +atomic64_t *v = (atomic64_t *)l; + +return atomic64_inc_and_test (v); +} + +static inline int atomic_long_add_negative (long i,atomic_long_t *l) +{ +atomic64_t *v = (atomic64_t *)l; + +return atomic64_add_negative (i, v); +} + +static inline long atomic_long_add_return (long i,atomic_long_t *l) +{ +atomic64_t *v = (atomic64_t *)l; + +return (long )atomic64_add_return (i, v); +} + +static inline long atomic_long_sub_return (long i,atomic_long_t *l) +{ +atomic64_t *v = (atomic64_t *)l; + +return (long )atomic64_sub_return (i, v); +} + +static inline long atomic_long_inc_return (atomic_long_t *l) +{ +atomic64_t *v = (atomic64_t *)l; + +return (long )atomic64_inc_return (v); +} + +static inline long atomic_long_dec_return (atomic_long_t *l) +{ +atomic64_t *v = (atomic64_t *)l; + +return (long )atomic64_dec_return (v); +} + +#define atomic_long_add_unless (l, a, u) \ + atomic64_add_unless((atomic64_t *)(l), (a), (u)) + +#define atomic_long_inc_not_zero (l) atomic64_inc_not_zero((atomic64_t *)(l)) + +#define atomic_long_cmpxchg (l, old, new) \ + (atomic_cmpxchg((atomic64_t *)(l), (old), (new))) +#define atomic_long_xchg (v, new) \ + (atomic_xchg((atomic64_t *)(l), (new))) +#else /* BITS_PER_LONG == 64 */ typedef atomic_t atomic_long_t ;
@@ -113,6 +180,72 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)atomic_sub (i, v); } +static inline int atomic_long_sub_and_test (long i,atomic_long_t *l) +{ +atomic_t *v = (atomic_t *)l; + +return atomic_sub_and_test (i, v); +} + +static inline int atomic_long_dec_and_test (atomic_long_t *l) +{ +atomic_t *v = (atomic_t *)l; + +return atomic_dec_and_test (v); +} + +static inline int atomic_long_inc_and_test (atomic_long_t *l) +{ +atomic_t *v = (atomic_t *)l; + +return atomic_inc_and_test (v); +} + +static inline int atomic_long_add_negative (long i,atomic_long_t *l) +{ +atomic_t *v = (atomic_t *)l; + +return atomic_add_negative (i, v); +} + +static inline long atomic_long_add_return (long i,atomic_long_t *l) +{ +atomic_t *v = (atomic_t *)l; + +return (long )atomic_add_return (i, v); +} + +static inline long atomic_long_sub_return (long i,atomic_long_t *l) +{ +atomic_t *v = (atomic_t *)l; + +return (long )atomic_sub_return (i, v); +} + +static inline long atomic_long_inc_return (atomic_long_t *l) +{ +atomic_t *v = (atomic_t *)l; + +return (long )atomic_inc_return (v); +} + +static inline long atomic_long_dec_return (atomic_long_t *l) +{ +atomic_t *v = (atomic_t *)l; + +return (long )atomic_dec_return (v); +} + +#define atomic_long_add_unless (l, a, u) \ + atomic_add_unless((atomic_t *)(l), (a), (u)) + +#define atomic_long_inc_not_zero (l) atomic_inc_not_zero((atomic_t *)(l)) + +#define atomic_long_cmpxchg (l, old, new) \ + (atomic_cmpxchg((atomic_t *)(l), (old), (new))) +#define atomic_long_xchg (v, new) \ + (atomic_xchg((atomic_t *)(l), (new))) +#endif /* BITS_PER_LONG == 64 */ #endif /* _ASM_GENERIC_ATOMIC_H */
PATCH 3/10 atomic.h : i386 type safety fix
In reply to Mathieu Desnoyersatomic.h : i386 type safety fix
This patch removes an explicit cast to an integer type for the result returned by cmpxchg. It is not per se a problem on the i386 architecture, because sizeof(int) == sizeof(long), but whenever this code is cut'n'pasted to a different architecture (which happened at least for x86_64), it would simply accept passing an atomic64_t value as parameter to cmpxchg, xchg and add_unless, having 64 bits inputs casted to 32 bits.
include/asm-i386/atomic.h +3 -3
@@ -207,8 +207,8 @@ static __inline__ int atomic_sub_return(int i, atomic_t *v)return atomic_add_return (-i,v); } -#define atomic_cmpxchg (v, old, new) ((int)cmpxchg(&((v)->counter), old, new)) -#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) +#define atomic_cmpxchg (v, old, new) (cmpxchg(&((v)->counter), (old), (new))) +#define atomic_xchg (v, new) (xchg(&((v)->counter), (new)))/** * atomic_add_unless - add unless the number is a given value
@@ -221,7 +221,7 @@ static __inline__ int atomic_sub_return(int i, atomic_t *v)*/ #define atomic_add_unless (v, a, u) \ ({ \ - int c, old; \ + __typeof__((v)->counter) c, old; \ c = atomic_read(v); \ for (;;) { \ if (unlikely(c == (u))) \
PATCH 4/10 atomic.h : Add atomic64 cmpxchg, xchg and add_unless to ia64
In reply to Mathieu Desnoyersatomic.h : Add atomic64 cmpxchg, xchg and add_unless to ia64
include/asm-ia64/atomic.h +22 -2
@@ -88,12 +88,16 @@ ia64_atomic64_sub (__s64 i, atomic64_t *v)return new; } -#define atomic_cmpxchg (v, old, new) ((int)cmpxchg(&((v)->counter), old, new)) +#define atomic_cmpxchg (v, old, new) (cmpxchg(&((v)->counter), old, new))#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) +#define atomic64_cmpxchg (v, old, new) \ + (cmpxchg(&((v)->counter), old, new)) +#define atomic64_xchg (v, new) (xchg(&((v)->counter), new)) +#define atomic_add_unless (v, a, u) \ ({ \ - int c, old; \ + __typeof__(v->counter) c, old; \ c = atomic_read(v); \ for (;;) { \ if (unlikely(c == (u))) \
@@ -107,6 +111,22 @@ ia64_atomic64_sub (__s64 i, atomic64_t *v) })#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0) +#define atomic64_add_unless (v, a, u) \ +({ \ + __typeof__(v->counter) c, old; \ + c = atomic64_read(v); \ + for (;;) { \ + if (unlikely(c == (u))) \ + break; \ + old = atomic64_cmpxchg((v), c, c + (a)); \ + if (likely(old == c)) \ + break; \ + c = old; \ + } \ + c != (u); \ +}) +#define atomic64_inc_not_zero (v) atomic64_add_unless((v), 1, 0) +#define atomic_add_return (i,v) \ ({ \ int __ia64_aar_i = (i); \
PATCH 5/10 atomic.h : Add atomic64 cmpxchg, xchg and add_unless to mips
In reply to Mathieu Desnoyersatomic.h : Add atomic64 cmpxchg, xchg and add_unless to mips
include/asm-mips/atomic.h +26 -3
@@ -291,8 +291,8 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)return result; } -#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) -#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) +#define atomic_cmpxchg (v, o, n) (cmpxchg(&((v)->counter), (o), (n))) +#define atomic_xchg (v, new) (xchg(&((v)->counter), (new)))/** * atomic_add_unless - add unless the number is a given value
@@ -305,7 +305,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)*/ #define atomic_add_unless (v, a, u) \ ({ \ - int c, old; \ + __typeof__((v)->counter) c, old; \ c = atomic_read(v); \ while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \ c = old; \
@@ -651,6 +651,29 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)return result; } +#define atomic64_cmpxchg (v, o, n) \ + (((__typeof__((v)->counter)))cmpxchg(&((v)->counter), (o), (n))) +#define atomic64_xchg (v, new) (xchg(&((v)->counter), (new))) + +/** +* atomic64_add_unless - add unless the number is a given value +* @v: pointer of type atomic64_t +* @a: the amount to add to v... +* @u: ...unless v is equal to u. +* +* Atomically adds @a to @v, so long as it was not @u. +* Returns non-zero if @v was not @u, and zero otherwise. +*/ +#define atomic64_add_unless (v, a, u) \ +({ \ + __typeof__((v)->counter) c, old; \ + c = atomic_read(v); \ + while (c != (u) && (old = atomic64_cmpxchg((v), c, c + (a))) != c) \ + c = old; \ + c != (u); \ +}) +#define atomic64_inc_not_zero (v) atomic64_add_unless((v), 1, 0) +#define atomic64_dec_return (v) atomic64_sub_return(1,(v))#define atomic64_inc_return (v) atomic64_add_return(1,(v))
PATCH 6/10 atomic.h : Add atomic64 cmpxchg, xchg and add_unless to parisc
In reply to Mathieu Desnoyersatomic.h : Add atomic64 cmpxchg, xchg and add_unless to parisc
include/asm-parisc/atomic.h +27 -3
@@ -6,7 +6,6 @@#define _ASM_PARISC_ATOMIC_H_#include <linux/types.h> -#include <asm/system.h> /* * Atomic operations that C can't guarantee us. Useful for
@@ -163,7 +162,7 @@ static __inline__ int atomic_read(const atomic_t *v) }/* exported interface */ -#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_cmpxchg (v, o, n) (cmpxchg(&((v)->counter), (o), (n)))#define atomic_xchg (v, new) (xchg(&((v)->counter), new))/**
@@ -177,7 +176,7 @@ static __inline__ int atomic_read(const atomic_t *v)*/ #define atomic_add_unless (v, a, u) \ ({ \ - int c, old; \ + __typeof__((v)->counter) c, old; \ c = atomic_read(v); \ while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \ c = old; \
@@ -270,6 +269,31 @@ atomic64_read(const atomic64_t *v)#define atomic64_dec_and_test (v) (atomic64_dec_return(v) == 0)#define atomic64_sub_and_test (i,v) (atomic64_sub_return((i),(v)) == 0) +/* exported interface */ +#define atomic64_cmpxchg (v, o, n) \ + ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n))) +#define atomic64_xchg (v, new) (xchg(&((v)->counter), new)) + +/** +* atomic64_add_unless - add unless the number is a given value +* @v: pointer of type atomic64_t +* @a: the amount to add to v... +* @u: ...unless v is equal to u. +* +* Atomically adds @a to @v, so long as it was not @u. +* Returns non-zero if @v was not @u, and zero otherwise. +*/ +#define atomic64_add_unless (v, a, u) \ +({ \ + __typeof__((v)->counter) c, old; \ + c = atomic64_read(v); \ + while (c != (u) && (old = atomic64_cmpxchg((v), c, c + (a))) != c) \ + c = old; \ + c != (u); \ +}) +#define atomic64_inc_not_zero (v) atomic64_add_unless((v), 1, 0) + +#endif /* __LP64__ */ #include <asm-generic/atomic.h>
PATCH 7/10 atomic.h : Add atomic64 cmpxchg, xchg and add_unless to powerpc
In reply to Mathieu Desnoyersatomic.h : Add atomic64 cmpxchg, xchg and add_unless to powerpc
include/asm-powerpc/atomic.h +37 -1
@@ -165,7 +165,7 @@ static __inline__ int atomic_dec_return(atomic_t *v)return t; } -#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_cmpxchg (v, o, n) (cmpxchg(&((v)->counter), (o), (n)))#define atomic_xchg (v, new) (xchg(&((v)->counter), new))/**
@@ -413,6 +413,42 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v) return t; } +#define atomic64_cmpxchg (v, o, n) (cmpxchg(&((v)->counter), (o), (n))) +#define atomic64_xchg (v, new) (xchg(&((v)->counter), new)) + +/** +* atomic64_add_unless - add unless the number is a given value +* @v: pointer of type atomic64_t +* @a: the amount to add to v... +* @u: ...unless v is equal to u. +* +* Atomically adds @a to @v, so long as it was not @u. +* Returns non-zero if @v was not @u, and zero otherwise. +*/ +static __inline__int atomic64_add_unless (atomic64_t *v,long a,long u) +{ +long t; + + __asm__ __volatile__ ( +LWSYNC_ON_SMP +"1: ldarx %0,0,%1 # atomic_add_unless\n\ +cmpd 0,%0,%3 \n\ +beq- 2f \n\ +add %0,%2,%0 \n" +" stdcx. %0,0,%1 \n\ +bne- 1b \n" +ISYNC_ON_SMP +" subf %0,%2,%0 \n\ +2:" + :"=&r" (t) + :"r" (&v->counter),"r" (a),"r" (u) + :"cc" ,"memory" ); + +return t != u; +} + +#define atomic64_inc_not_zero (v) atomic64_add_unless((v), 1, 0) +#endif /* __powerpc64__ */ #include <asm-generic/atomic.h>
include/asm-powerpc/bitops.h +0 -1
@@ -39,7 +39,6 @@#ifdef __KERNEL__#include <linux/compiler.h> -#include <asm/atomic.h> #include <asm/asm-compat.h> #include <asm/synch.h>
include/asm-powerpc/system.h +129 -1
184 lines not on this page · raw message
PATCH 8/10 atomic.h : Add atomic64 cmpxchg, xchg and add_unless to sparc64
In reply to Mathieu Desnoyersatomic.h : Add atomic64 cmpxchg, xchg and add_unless to sparc64
include/asm-sparc64/atomic.h +22 -2
@@ -70,12 +70,12 @@ extern int atomic64_sub_ret(int, atomic64_t *);#define atomic_add_negative (i, v) (atomic_add_ret(i, v) < 0)#define atomic64_add_negative (i, v) (atomic64_add_ret(i, v) < 0) -#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_cmpxchg (v, o, n) (cmpxchg(&((v)->counter), (o), (n)))#define atomic_xchg (v, new) (xchg(&((v)->counter), new))#define atomic_add_unless (v, a, u) \ ({ \ - int c, old; \ + __typeof__((v)->counter) c, old; \ c = atomic_read(v); \ for (;;) { \ if (unlikely(c == (u))) \
@@ -89,6 +89,26 @@ extern int atomic64_sub_ret(int, atomic64_t *); })#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0) +#define atomic64_cmpxchg (v, o, n) \ + ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n))) +#define atomic64_xchg (v, new) (xchg(&((v)->counter), new)) + +#define atomic64_add_unless (v, a, u) \ +({ \ + __typeof__((v)->counter) c, old; \ + c = atomic64_read(v); \ + for (;;) { \ + if (unlikely(c == (u))) \ + break; \ + old = atomic64_cmpxchg((v), c, c + (a)); \ + if (likely(old == c)) \ + break; \ + c = old; \ + } \ + likely(c != (u)); \ +}) +#define atomic64_inc_not_zero (v) atomic64_add_unless((v), 1, 0) +/* Atomic operations are already serializing */ #ifdef CONFIG_SMP #define smp_mb__before_atomic_dec () membar_storeload_loadload();
PATCH 9/10 atomic.h : Add atomic64_xchg to s390
In reply to Mathieu Desnoyersatomic.h : Add atomic64_xchg to s390
include/asm-s390/atomic.h +2 -0
@@ -215,6 +215,8 @@ static __inline__ void atomic64_set_mask(unsigned long mask, atomic64_t * v)__CSG_LOOP (v, mask,"ogr" ); } +#define atomic64_xchg (v, new) (xchg(&((v)->counter), new)) +static __inline__long long atomic64_cmpxchg (atomic64_t *v,long long old,long long new) {
PATCH 10/10 atomic.h : Add atomic64 cmpxchg, xchg and add_unless to x86_64
In reply to Mathieu Desnoyersatomic.h : Add atomic64 cmpxchg, xchg and add_unless to x86_64
include/asm-x86_64/atomic.h +32 -4
@@ -375,8 +375,8 @@ static __inline__ long atomic64_add_return(long i, atomic64_t *v)long __i = i; __asm__ __volatile__(LOCK_PREFIX "xaddq %0, %1;" - :"=r" (i) - :"m" (v->counter),"0" (i)); + :"+r" (i),"+m" (v->counter) + : :"memory" );return i + __i; }
@@ -388,7 +388,10 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t *v)#define atomic64_inc_return (v) (atomic64_add_return(1,v))#define atomic64_dec_return (v) (atomic64_sub_return(1,v)) -#define atomic_cmpxchg (v, old, new) ((int)cmpxchg(&((v)->counter), old, new)) +#define atomic64_cmpxchg (v, old, new) (cmpxchg(&((v)->counter), old, new)) +#define atomic64_xchg (v, new) (xchg(&((v)->counter), new)) + +#define atomic_cmpxchg (v, old, new) (cmpxchg(&((v)->counter), old, new))#define atomic_xchg (v, new) (xchg(&((v)->counter), new))/**
@@ -402,7 +405,7 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t *v)*/ #define atomic_add_unless (v, a, u) \ ({ \ - int c, old; \ + __typeof__((v)->counter) c, old; \ c = atomic_read(v); \ for (;;) { \ if (unlikely(c == (u))) \
@@ -416,6 +419,31 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t *v) })#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0) +/** +* atomic64_add_unless - add unless the number is a given value +* @v: pointer of type atomic64_t +* @a: the amount to add to v... +* @u: ...unless v is equal to u. +* +* Atomically adds @a to @v, so long as it was not @u. +* Returns non-zero if @v was not @u, and zero otherwise. +*/ +#define atomic64_add_unless (v, a, u) \ +({ \ + __typeof__((v)->counter) c, old; \ + c = atomic64_read(v); \ + for (;;) { \ + if (unlikely(c == (u))) \ + break; \ + old = atomic64_cmpxchg((v), c, c + (a)); \ + if (likely(old == c)) \ + break; \ + c = old; \ + } \ + c != (u); \ +}) +#define atomic64_inc_not_zero (v) atomic64_add_unless((v), 1, 0) +/* These are x86-specific, used by some header files */ #define atomic_clear_mask (mask, addr) \ __asm__ __volatile__(LOCK_PREFIX "andl %0,%1" \
Re: [PATCH 10/10] atomic.h : Add atomic64 cmpxchg, xchg and add_unless to x86_64
include/asm-x86_64/atomic.h static __inline__ long atomic64_sub_return(long i, atomic64_t *v) · line 408
Quoted 8 lines · Mathieu Desnoyers
/**
include/asm-x86_64/atomic.h +1
-1@@ -402,7 +405,7 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t *v)*/ #define atomic_add_unless (v, a, u) \ ({ \ - int c, old; \ + __typeof__((v)->counter) c, old; \
This change seems useless. Please drop.
In general you should enforce atomic_t vs atomic64_t types on x86, otherwise people will write code that won't compile on other architectures that have truly different implementations.
I would suggest using inlines.
-Andi
Re: [PATCH 10/10] atomic.h : Add atomic64 cmpxchg, xchg and add_unless to x86_64
Quoted 12 lines · * Andi Kleen ([email protected]) wrote:
Review static __inline__ long atomic64_sub_return(long i, atomic64_t *v) · line 408
Quoted 8 lines · Mathieu Desnoyers
/**
(quoted diff) +1
-1@@ -402,7 +405,7 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t *v) */ #define atomic_add_unless(v, a, u) \ ({ \ - int c, old; \ + __typeof__((v)->counter) c, old; \This change seems useless. Please drop.
Quoted 7 lines
In general you should enforce
atomic_tvsatomic64_ttypes on x86, otherwise people will write code that won't compile on other architectures that have truly different implementations.I would suggest using inlines.
-Andi
Hi Andi,
Yes, I agree this typeof is not needed and more error prone. All the original atomic.h code that uses cmpxchg (which includes the atomic_add_unless) uses defines instead of inline functions, probably to circumvent a circular dependency between system.h and atomic.h on powerpc (which my patch addresses). Therefore, it makes sense to use inline functions that will provide type checking.
Digging into the FRV architecture shows me that it is also affected by such a circular dependency. Here is the diff applying this against the rest of my atomic.h patches.
include/asm-alpha/atomic.h +31 -28
@@ -2,6 +2,7 @@#define _ALPHA_ATOMIC_H#include <asm/barrier.h> +#include <asm/system.h> /* * Atomic operations that C can't guarantee us. Useful for
@@ -190,20 +191,21 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)* Atomically adds @a to @v, so long as it was not @u. * Returns non-zero if @v was not @u, and zero otherwise. */ -#define atomic_add_unless (v, a, u) \ -({ \ - __typeof__((v)->counter) c, old; \ - c = atomic_read(v); \ - for (;;) { \ - if (unlikely(c == (u))) \ - break; \ - old = atomic_cmpxchg((v), c, c + (a)); \ - if (likely(old == c)) \ - break; \ - c = old; \ - } \ - c != (u); \ -}) +static __inline__int atomic_add_unless (atomic_t *v,int a,int u) +{ +int c, old; + c =atomic_read (v); +for (;;) { +if (unlikely (c == (u))) +break ; + old =atomic_cmpxchg ((v), c, c + (a)); +if (likely (old == c)) +break ; + c = old; + } +return c != (u); +} +#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0)/**
@@ -215,20 +217,21 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)* Atomically adds @a to @v, so long as it was not @u. * Returns non-zero if @v was not @u, and zero otherwise. */ -#define atomic64_add_unless (v, a, u) \ -({ \ - __typeof__((v)->counter) c, old; \ - c = atomic64_read(v); \ - for (;;) { \ - if (unlikely(c == (u))) \ - break; \ - old = atomic64_cmpxchg((v), c, c + (a)); \ - if (likely(old == c)) \ - break; \ - c = old; \ - } \ - c != (u); \ -}) +static __inline__int atomic64_add_unless (atomic64_t *v,long a,long u) +{ +long c, old; + c =atomic64_read (v); +for (;;) { +if (unlikely (c == (u))) +break ; + old =atomic64_cmpxchg ((v), c, c + (a)); +if (likely (old == c)) +break ; + c = old; + } +return c != (u); +} +#define atomic64_inc_not_zero (v) atomic64_add_unless((v), 1, 0)#define atomic_add_negative (a, v) (atomic_add_return((a), (v)) < 0)
include/asm-arm/atomic.h +1 -0
@@ -12,6 +12,7 @@#define __ASM_ARM_ATOMIC_H#include <linux/compiler.h> +#include <asm/system.h> typedef struct {volatile int counter; }atomic_t ;
include/asm-arm26/atomic.h +0 -1
@@ -20,7 +20,6 @@#ifndef __ASM_ARM_ATOMIC_H#define __ASM_ARM_ATOMIC_H -#ifdef CONFIG_SMP #error SMP is NOT supported#endif
include/asm-avr32/atomic.h +0 -0
include/asm-frv/atomic.h +15 -76
106 lines not on this page · raw message
include/asm-frv/bitops.h +0 -0
include/asm-frv/system.h +69 -1
80 lines not on this page · raw message
include/asm-generic/atomic.h +12 -5
@@ -9,7 +9,6 @@*/ #include <asm/types.h> -#include <asm/system.h> /* * Suppport for atomic_long_t
@@ -123,8 +122,12 @@ static inline long atomic_long_dec_return(atomic_long_t *l)return (long )atomic64_dec_return (v); } -#define atomic_long_add_unless (l, a, u) \ - atomic64_add_unless((atomic64_t *)(l), (a), (u)) +static inline long atomic_long_add_unless (atomic_long_t *l,long a,long u) +{ +atomic64_t *v = (atomic64_t *)l; + +return (long )atomic64_add_unless (v, a, u); +}#define atomic_long_inc_not_zero (l) atomic64_inc_not_zero((atomic64_t *)(l))
@@ -236,8 +239,12 @@ static inline long atomic_long_dec_return(atomic_long_t *l)return (long )atomic_dec_return (v); } -#define atomic_long_add_unless (l, a, u) \ - atomic_add_unless((atomic_t *)(l), (a), (u)) +static inline long atomic_long_add_unless (atomic_long_t *l,long a,long u) +{ +atomic_t *v = (atomic_t *)l; + +return (long )atomic_add_unless (v, a, u); +}#define atomic_long_inc_not_zero (l) atomic_inc_not_zero((atomic_t *)(l))
include/asm-i386/atomic.h +15 -14
@@ -219,20 +219,21 @@ static __inline__ int atomic_sub_return(int i, atomic_t *v)* Atomically adds @a to @v, so long as it was not @u. * Returns non-zero if @v was not @u, and zero otherwise. */ -#define atomic_add_unless (v, a, u) \ -({ \ - __typeof__((v)->counter) c, old; \ - c = atomic_read(v); \ - for (;;) { \ - if (unlikely(c == (u))) \ - break; \ - old = atomic_cmpxchg((v), c, c + (a)); \ - if (likely(old == c)) \ - break; \ - c = old; \ - } \ - c != (u); \ -}) +static __inline__int atomic_add_unless (atomic_t *v,int a,int u) +{ +int c, old; + c =atomic_read (v); +for (;;) { +if (unlikely (c == (u))) +break ; + old =atomic_cmpxchg ((v), c, c + (a)); +if (likely (old == c)) +break ; + c = old; + } +return c != (u); +} +#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0)#define atomic_inc_return (v) (atomic_add_return(1,v))
include/asm-ia64/atomic.h +31 -28
73 lines not on this page · raw message
include/asm-m32r/atomic.h +15 -8
@@ -253,14 +253,21 @@ static __inline__ int atomic_dec_return(atomic_t *v)* Atomically adds @a to @v, so long as it was not @u. * Returns non-zero if @v was not @u, and zero otherwise. */ -#define atomic_add_unless (v, a, u) \ -({ \ - int c, old; \ - c = atomic_read(v); \ - while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \ - c = old; \ - c != (u); \ -}) +static __inline__int atomic_add_unless (atomic_t *v,int a,int u) +{ +int c, old; + c =atomic_read (v); +for (;;) { +if (unlikely (c == (u))) +break ; + old =atomic_cmpxchg ((v), c, c + (a)); +if (likely (old == c)) +break ; + c = old; + } +return c != (u); +} +#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0)static __inline__void atomic_clear_mask (unsigned long mask,atomic_t *addr)
include/asm-m68k/atomic.h +16 -15
@@ -2,7 +2,7 @@#define __ARCH_M68K_ATOMIC__ -#include <asm/system.h> /* local_irq_XXX() */ +#include <asm/system.h> /* * Atomic operations that C can't guarantee us. Useful for
@@ -170,20 +170,21 @@ static inline void atomic_set_mask(unsigned long mask, unsigned long *v) __asm__ __volatile__("orl %1,%0" :"+m" (*v) :"id" (mask)); } -#define atomic_add_unless (v, a, u) \ -({ \ - int c, old; \ - c = atomic_read(v); \ - for (;;) { \ - if (unlikely(c == (u))) \ - break; \ - old = atomic_cmpxchg((v), c, c + (a)); \ - if (likely(old == c)) \ - break; \ - c = old; \ - } \ - c != (u); \ -}) +static __inline__int atomic_add_unless (atomic_t *v,int a,int u) +{ +int c, old; + c =atomic_read (v); +for (;;) { +if (unlikely (c == (u))) +break ; + old =atomic_cmpxchg ((v), c, c + (a)); +if (likely (old == c)) +break ; + c = old; + } +return c != (u); +} +#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0)/* Atomic operations are already serializing */
include/asm-m68knommu/atomic.h +16 -9
@@ -1,7 +1,7 @@#ifndef __ARCH_M68KNOMMU_ATOMIC__#define __ARCH_M68KNOMMU_ATOMIC__ -#include <asm/system.h> /* local_irq_XXX() */ +#include <asm/system.h> /* * Atomic operations that C can't guarantee us. Useful for
@@ -131,14 +131,21 @@ static inline int atomic_sub_return(int i, atomic_t * v)#define atomic_cmpxchg (v, o, n) (cmpxchg(&((v)->counter), (o), (n)))#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) -#define atomic_add_unless (v, a, u) \ -({ \ - int c, old; \ - c = atomic_read(v); \ - while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \ - c = old; \ - c != (u); \ -}) +static __inline__int atomic_add_unless (atomic_t *v,int a,int u) +{ +int c, old; + c =atomic_read (v); +for (;;) { +if (unlikely (c == (u))) +break ; + old =atomic_cmpxchg ((v), c, c + (a)); +if (likely (old == c)) +break ; + c = old; + } +return c != (u); +} +#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0)#define atomic_dec_return (v) atomic_sub_return(1,(v))
include/asm-mips/atomic.h +30 -16
64 lines not on this page · raw message
include/asm-parisc/atomic.h +31 -16
65 lines not on this page · raw message
include/asm-powerpc/atomic.h +1 -0
@@ -11,6 +11,7 @@ typedef struct { volatile int counter; } atomic_t;#include <linux/compiler.h> #include <asm/synch.h> #include <asm/asm-compat.h> +#include <asm/system.h> #define ATOMIC_INIT (i) { (i) }
include/asm-ppc/system.h +0 -1
@@ -6,7 +6,6 @@#include <linux/kernel.h> -#include <asm/atomic.h> #include <asm/hw_irq.h> /*
include/asm-sparc64/atomic.h +31 -28
77 lines not on this page · raw message
include/asm-x86_64/atomic.h +31 -28
77 lines not on this page · raw message
include/asm-xtensa/atomic.h +15 -8
@@ -234,14 +234,21 @@ static inline int atomic_sub_return(int i, atomic_t * v)* Atomically adds @a to @v, so long as it was not @u. * Returns non-zero if @v was not @u, and zero otherwise. */ -#define atomic_add_unless (v, a, u) \ -({ \ - int c, old; \ - c = atomic_read(v); \ - while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \ - c = old; \ - c != (u); \ -}) +static __inline__int atomic_add_unless (atomic_t *v,int a,int u) +{ +int c, old; + c =atomic_read (v); +for (;;) { +if (unlikely (c == (u))) +break ; + old =atomic_cmpxchg ((v), c, c + (a)); +if (likely (old == c)) +break ; + c = old; + } +return c != (u); +} +#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0)static inline void atomic_clear_mask (unsigned int mask,atomic_t *v)
Signature · 3 lines
Mathieu Desnoyers Computer Engineering Ph.D. Candidate, École Polytechnique de Montréal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
Re: [PATCH] atomic.h : atomic_add_unless as inline. Remove system.h atomic.h circular dependency
atomic_add_unless as inline. Remove system.h atomic.h circular dependency.
I agree (with Andi Kleen) this typeof is not needed and more error prone. All the original atomic.h code that uses cmpxchg (which includes the atomic_add_unless) uses defines instead of inline functions, probably to circumvent a circular dependency between system.h and atomic.h on powerpc (which my patch addresses). Therefore, it makes sense to use inline functions that will provide type checking.
Digging into the FRV architecture shows me that it is also affected by such a circular dependency. Here is the diff applying this against the rest of my atomic.h patches.
It applies over the atomic.h standardization patches.
include/asm-alpha/atomic.h +31 -28
@@ -2,6 +2,7 @@#define _ALPHA_ATOMIC_H#include <asm/barrier.h> +#include <asm/system.h> /* * Atomic operations that C can't guarantee us. Useful for
@@ -190,20 +191,21 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)* Atomically adds @a to @v, so long as it was not @u. * Returns non-zero if @v was not @u, and zero otherwise. */ -#define atomic_add_unless (v, a, u) \ -({ \ - __typeof__((v)->counter) c, old; \ - c = atomic_read(v); \ - for (;;) { \ - if (unlikely(c == (u))) \ - break; \ - old = atomic_cmpxchg((v), c, c + (a)); \ - if (likely(old == c)) \ - break; \ - c = old; \ - } \ - c != (u); \ -}) +static __inline__int atomic_add_unless (atomic_t *v,int a,int u) +{ +int c, old; + c =atomic_read (v); +for (;;) { +if (unlikely (c == (u))) +break ; + old =atomic_cmpxchg ((v), c, c + (a)); +if (likely (old == c)) +break ; + c = old; + } +return c != (u); +} +#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0)/**
@@ -215,20 +217,21 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)* Atomically adds @a to @v, so long as it was not @u. * Returns non-zero if @v was not @u, and zero otherwise. */ -#define atomic64_add_unless (v, a, u) \ -({ \ - __typeof__((v)->counter) c, old; \ - c = atomic64_read(v); \ - for (;;) { \ - if (unlikely(c == (u))) \ - break; \ - old = atomic64_cmpxchg((v), c, c + (a)); \ - if (likely(old == c)) \ - break; \ - c = old; \ - } \ - c != (u); \ -}) +static __inline__int atomic64_add_unless (atomic64_t *v,long a,long u) +{ +long c, old; + c =atomic64_read (v); +for (;;) { +if (unlikely (c == (u))) +break ; + old =atomic64_cmpxchg ((v), c, c + (a)); +if (likely (old == c)) +break ; + c = old; + } +return c != (u); +} +#define atomic64_inc_not_zero (v) atomic64_add_unless((v), 1, 0)#define atomic_add_negative (a, v) (atomic_add_return((a), (v)) < 0)
include/asm-arm/atomic.h +1 -0
@@ -12,6 +12,7 @@#define __ASM_ARM_ATOMIC_H#include <linux/compiler.h> +#include <asm/system.h> typedef struct {volatile int counter; }atomic_t ;
include/asm-arm26/atomic.h +0 -1
@@ -20,7 +20,6 @@#ifndef __ASM_ARM_ATOMIC_H#define __ASM_ARM_ATOMIC_H -#ifdef CONFIG_SMP #error SMP is NOT supported#endif
include/asm-avr32/atomic.h +0 -0
include/asm-frv/atomic.h +15 -76
106 lines not on this page · raw message
include/asm-frv/bitops.h +0 -0
include/asm-frv/system.h +69 -1
80 lines not on this page · raw message
include/asm-generic/atomic.h +12 -5
@@ -9,7 +9,6 @@*/ #include <asm/types.h> -#include <asm/system.h> /* * Suppport for atomic_long_t
@@ -123,8 +122,12 @@ static inline long atomic_long_dec_return(atomic_long_t *l)return (long )atomic64_dec_return (v); } -#define atomic_long_add_unless (l, a, u) \ - atomic64_add_unless((atomic64_t *)(l), (a), (u)) +static inline long atomic_long_add_unless (atomic_long_t *l,long a,long u) +{ +atomic64_t *v = (atomic64_t *)l; + +return (long )atomic64_add_unless (v, a, u); +}#define atomic_long_inc_not_zero (l) atomic64_inc_not_zero((atomic64_t *)(l))
@@ -236,8 +239,12 @@ static inline long atomic_long_dec_return(atomic_long_t *l)return (long )atomic_dec_return (v); } -#define atomic_long_add_unless (l, a, u) \ - atomic_add_unless((atomic_t *)(l), (a), (u)) +static inline long atomic_long_add_unless (atomic_long_t *l,long a,long u) +{ +atomic_t *v = (atomic_t *)l; + +return (long )atomic_add_unless (v, a, u); +}#define atomic_long_inc_not_zero (l) atomic_inc_not_zero((atomic_t *)(l))
include/asm-i386/atomic.h +15 -14
@@ -219,20 +219,21 @@ static __inline__ int atomic_sub_return(int i, atomic_t *v)* Atomically adds @a to @v, so long as it was not @u. * Returns non-zero if @v was not @u, and zero otherwise. */ -#define atomic_add_unless (v, a, u) \ -({ \ - __typeof__((v)->counter) c, old; \ - c = atomic_read(v); \ - for (;;) { \ - if (unlikely(c == (u))) \ - break; \ - old = atomic_cmpxchg((v), c, c + (a)); \ - if (likely(old == c)) \ - break; \ - c = old; \ - } \ - c != (u); \ -}) +static __inline__int atomic_add_unless (atomic_t *v,int a,int u) +{ +int c, old; + c =atomic_read (v); +for (;;) { +if (unlikely (c == (u))) +break ; + old =atomic_cmpxchg ((v), c, c + (a)); +if (likely (old == c)) +break ; + c = old; + } +return c != (u); +} +#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0)#define atomic_inc_return (v) (atomic_add_return(1,v))
include/asm-ia64/atomic.h +31 -28
73 lines not on this page · raw message
include/asm-m32r/atomic.h +15 -8
@@ -253,14 +253,21 @@ static __inline__ int atomic_dec_return(atomic_t *v)* Atomically adds @a to @v, so long as it was not @u. * Returns non-zero if @v was not @u, and zero otherwise. */ -#define atomic_add_unless (v, a, u) \ -({ \ - int c, old; \ - c = atomic_read(v); \ - while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \ - c = old; \ - c != (u); \ -}) +static __inline__int atomic_add_unless (atomic_t *v,int a,int u) +{ +int c, old; + c =atomic_read (v); +for (;;) { +if (unlikely (c == (u))) +break ; + old =atomic_cmpxchg ((v), c, c + (a)); +if (likely (old == c)) +break ; + c = old; + } +return c != (u); +} +#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0)static __inline__void atomic_clear_mask (unsigned long mask,atomic_t *addr)
include/asm-m68k/atomic.h +16 -15
@@ -2,7 +2,7 @@#define __ARCH_M68K_ATOMIC__ -#include <asm/system.h> /* local_irq_XXX() */ +#include <asm/system.h> /* * Atomic operations that C can't guarantee us. Useful for
@@ -170,20 +170,21 @@ static inline void atomic_set_mask(unsigned long mask, unsigned long *v) __asm__ __volatile__("orl %1,%0" :"+m" (*v) :"id" (mask)); } -#define atomic_add_unless (v, a, u) \ -({ \ - int c, old; \ - c = atomic_read(v); \ - for (;;) { \ - if (unlikely(c == (u))) \ - break; \ - old = atomic_cmpxchg((v), c, c + (a)); \ - if (likely(old == c)) \ - break; \ - c = old; \ - } \ - c != (u); \ -}) +static __inline__int atomic_add_unless (atomic_t *v,int a,int u) +{ +int c, old; + c =atomic_read (v); +for (;;) { +if (unlikely (c == (u))) +break ; + old =atomic_cmpxchg ((v), c, c + (a)); +if (likely (old == c)) +break ; + c = old; + } +return c != (u); +} +#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0)/* Atomic operations are already serializing */
include/asm-m68knommu/atomic.h +16 -9
@@ -1,7 +1,7 @@#ifndef __ARCH_M68KNOMMU_ATOMIC__#define __ARCH_M68KNOMMU_ATOMIC__ -#include <asm/system.h> /* local_irq_XXX() */ +#include <asm/system.h> /* * Atomic operations that C can't guarantee us. Useful for
@@ -131,14 +131,21 @@ static inline int atomic_sub_return(int i, atomic_t * v)#define atomic_cmpxchg (v, o, n) (cmpxchg(&((v)->counter), (o), (n)))#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) -#define atomic_add_unless (v, a, u) \ -({ \ - int c, old; \ - c = atomic_read(v); \ - while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \ - c = old; \ - c != (u); \ -}) +static __inline__int atomic_add_unless (atomic_t *v,int a,int u) +{ +int c, old; + c =atomic_read (v); +for (;;) { +if (unlikely (c == (u))) +break ; + old =atomic_cmpxchg ((v), c, c + (a)); +if (likely (old == c)) +break ; + c = old; + } +return c != (u); +} +#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0)#define atomic_dec_return (v) atomic_sub_return(1,(v))
include/asm-mips/atomic.h +30 -16
64 lines not on this page · raw message
include/asm-parisc/atomic.h +31 -16
65 lines not on this page · raw message
include/asm-powerpc/atomic.h +1 -0
@@ -11,6 +11,7 @@ typedef struct { volatile int counter; } atomic_t;#include <linux/compiler.h> #include <asm/synch.h> #include <asm/asm-compat.h> +#include <asm/system.h> #define ATOMIC_INIT (i) { (i) }
include/asm-ppc/system.h +0 -1
@@ -6,7 +6,6 @@#include <linux/kernel.h> -#include <asm/atomic.h> #include <asm/hw_irq.h> /*
include/asm-sparc64/atomic.h +31 -28
77 lines not on this page · raw message
include/asm-x86_64/atomic.h +31 -28
77 lines not on this page · raw message
include/asm-xtensa/atomic.h +15 -8
@@ -234,14 +234,21 @@ static inline int atomic_sub_return(int i, atomic_t * v)* Atomically adds @a to @v, so long as it was not @u. * Returns non-zero if @v was not @u, and zero otherwise. */ -#define atomic_add_unless (v, a, u) \ -({ \ - int c, old; \ - c = atomic_read(v); \ - while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \ - c = old; \ - c != (u); \ -}) +static __inline__int atomic_add_unless (atomic_t *v,int a,int u) +{ +int c, old; + c =atomic_read (v); +for (;;) { +if (unlikely (c == (u))) +break ; + old =atomic_cmpxchg ((v), c, c + (a)); +if (likely (old == c)) +break ; + c = old; + } +return c != (u); +} +#define atomic_inc_not_zero (v) atomic_add_unless((v), 1, 0)static inline void atomic_clear_mask (unsigned int mask,atomic_t *v)
Signature · 3 lines
Mathieu Desnoyers Computer Engineering Ph.D. Candidate, École Polytechnique de Montréal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68