atomic.h : standardising atomic primitives
Subsystems (3)
cover atomic.h : standardising 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 applies on 2.6.20-rc1-git7.
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
PATCH 1/9 atomic.h : alpha architecture
This patch adds atomic64_cmpxchg, atomic64_xchg and atomic64_add_unless to alpha.
include/asm-alpha/atomic.h +48 -3
@@ -175,19 +175,64 @@ static __inline__ long atomic64_sub_retureturn result; } -#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic64_cmpxchg (v, old, new) \ + ((__typeof__((v)->counter))cmpxchg(&((v)->counter), old, new)) +#define atomic64_xchg (v, new) (xchg(&((v)->counter), new)) + +#define atomic_cmpxchg (v, old, new) \ + ((__typeof__((v)->counter))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)
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
PATCH 2/9 atomic.h : generic atomic_long
In reply to Mathieu DesnoyersThis patch completes the atomic_long operations in asm-generic.
include/asm-generic/atomic.h +168 -0
@@ -66,6 +66,90 @@ static inline void atomic_long_sub(longatomic64_sub (i, v); } +static inline int atomic_long_sub_and_test (long i,atomic_long_t *l) +{ +atomic64_t *v = (atomic64_t *)l; + +return (long )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 (long )atomic64_dec_and_test (v); +} + +static inline int atomic_long_inc_and_test (atomic_long_t *l) +{ +atomic64_t *v = (atomic64_t *)l; + +return (long )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 (long )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); +} + +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); +} + +static inline long atomic_long_inc_not_zero (atomic_long_t *l) +{ +atomic64_t *v = (atomic64_t *)l; + +return (long )atomic64_inc_not_zero (v); +} + +static inline long atomic_long_cmpxchg (atomic_long_t *l,long old,long new) +{ +atomic64_t *v = (atomic64_t *)l; + +return (long )atomic64_cmpxchg (v, old, new); +} + +static inline long atomic_long_xchg (atomic_long_t *l,long new) +{ +atomic64_t *v = (atomic64_t *)l; + +return (long )atomic64_xchg (v, new); +} +#else /* BITS_PER_LONG == 64 */ typedef atomic_t atomic_long_t ;
@@ -113,6 +197,90 @@ static inline void atomic_long_sub(longatomic_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); +} + +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); +} + +static inline long atomic_long_inc_not_zero (atomic_long_t *l) +{ +atomic_t *v = (atomic_t *)l; + +return (long )atomic_inc_not_zero (v); +} + +static inline long atomic_long_cmpxchg (atomic_long_t *l,long old,long new) +{ +atomic_t *v = (atomic_t *)l; + +return (long )atomic_cmpxchg (v, old, new); +} + +static inline long atomic_long_xchg (atomic_long_t *l,long new) +{ +atomic_t *v = (atomic_t *)l; + +return (long )atomic_xchg (v, new); +} +#endif /* BITS_PER_LONG == 64 */ #endif /* _ASM_GENERIC_ATOMIC_H */
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
PATCH 3/9 atomic.h : i386 "64 bits" ready fix.
In reply to Mathieu DesnoyersThis patch changes the cmpxchg, xchg and add_unless atomic operations on i386 so they will still work if, for instance, they are cut'n'pasted to operate of atomic64_t types. The correct fix might be to create inline functions for cmpxchg for every architecture, but until then, it looks safer to put this kind of automatic typing instead of using an integer.
include/asm-i386/atomic.h +4 -3
@@ -207,8 +207,9 @@ static __inline__ int atomic_sub_return(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) \ + ((__typeof__((v)->counter))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 +222,7 @@ #define atomic_xchg(v, new) (xchg(&((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))) \
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
PATCH 4/9 atomic.h : ia64
In reply to Mathieu Desnoyers64 bits cmpxchg, xchg and add_unless for ia64.
include/asm-ia64/atomic.h +23 -2
@@ -88,12 +88,17 @@ ia64_atomic64_sub (__s64 i, atomic64_t *return new; } -#define atomic_cmpxchg (v, old, new) ((int)cmpxchg(&((v)->counter), old, new)) +#define atomic_cmpxchg (v, old, new) \ + ((__typeof__((v)->counter))cmpxchg(&((v)->counter), old, new))#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) +#define atomic64_cmpxchg (v, old, new) \ + ((__typeof__((v)->counter))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 +112,22 @@ ({ \ })#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); \
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
PATCH 5/9 atomic.h : standardising atomic primitives
In reply to Mathieu Desnoyers64 bits cmpxchg, xchg and add_unless for MIPS.
include/asm-mips/atomic.h +27 -3
@@ -291,8 +291,9 @@ static __inline__ int atomic_sub_if_posireturn 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) \ + (((__typeof__((v)->counter)))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 +306,7 @@ #define atomic_xchg(v, new) (xchg(&((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 +652,29 @@ static __inline__ long atomic64_sub_if_preturn 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))
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
PATCH 6/9 atomic.h : parisc
In reply to Mathieu Desnoyers64 bits cmpxchg, xchg, add_unless operations for parisc.
include/asm-parisc/atomic.h +28 -2
@@ -163,7 +163,8 @@ static __inline__ int atomic_read(const }/* exported interface */ -#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_cmpxchg (v, o, n) \ + ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))#define atomic_xchg (v, new) (xchg(&((v)->counter), new))/**
@@ -177,7 +178,7 @@ #define atomic_xchg(v, new) (xchg(&((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 +271,31 @@ #define atomic64_inc_and_test(v) (atomi#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>
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
PATCH 7/9 atomic.h : powerpc
In reply to Mathieu Desnoyers64 bits cmpxchg, xchg and add_unless for powerpc.
include/asm-powerpc/atomic.h +40 -1
@@ -165,7 +165,8 @@ static __inline__ int atomic_dec_return(return t; } -#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_cmpxchg (v, o, n) \ + ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))#define atomic_xchg (v, new) (xchg(&((v)->counter), new))/**
@@ -411,6 +412,44 @@ static __inline__ long atomic64_dec_if_preturn t; } +#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. +*/ +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" + PPC405_ERR77(0,%2) +" 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>
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
Re: [PATCH 7/9] atomic.h : powerpc
Quoted 24 lines
include/asm-powerpc/atomic.h +23
-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. +*/ +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" + PPC405_ERR77(0,%2) +" stdcx. %0,0,%1 \n\ +bne- 1b \n"
include/asm-powerpc/atomic.h static __inline__ long atomic64_dec_if_p · line 450
Quoted 10 lines
include/asm-powerpc/atomic.h +10
-0+ISYNC_ON_SMP +" subf %0,%2,%0 \n\ +2:" + : "=&r" (t) + : "r" (&v->counter), "r" (a), "r" (u) + : "cc", "memory"); + + return t != u; +} +
You shouldn't try to define those when building 32 bits code... Also, the PPC405 errata, as it's name implies, is specific to 405 cores which are all 32 bits.
Ben.
Re: [PATCH 7/9] atomic.h : powerpc
Quoted 39 lines · * Benjamin Herrenschmidt ([email protected]) wrote:
Quoted 24 lines
include/asm-powerpc/atomic.h +23
-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. +*/ +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" + PPC405_ERR77(0,%2) +" stdcx. %0,0,%1 \n\ +bne- 1b \n" include/asm-powerpc/atomic.h static __inline__ long atomic64_dec_if_p · line 450
Quoted 10 lines
include/asm-powerpc/atomic.h +10
-0+ISYNC_ON_SMP +" subf %0,%2,%0 \n\ +2:" + : "=&r" (t) + : "r" (&v->counter), "r" (a), "r" (u) + : "cc", "memory"); + + return t != u; +} +You shouldn't try to define those when building 32 bits code... Also, the PPC405 errata, as it's name implies, is specific to 405 cores which are all 32 bits.
Quoted 3 lines
Ben.
Hi Ben,
It is within a
#ifdef __powerpc64__
...
#endif /* __powerpc64__ */
so it should only build on 64 bits.
You are right about the PPC405 errata, it seems unnecessary.
The same is true for my asm-powerpc/local.h modification.
Thanks,
Mathieu
Signature · 2 lines
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
PATCH 8/9 atomic.h : sparc
In reply to Mathieu Desnoyers64 bits cmpxchg, xchg and add_unless for sparc.
include/asm-sparc64/atomic.h +23 -2
@@ -70,12 +70,13 @@ #define atomic64_dec(v) atomic64_sub(1,#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) \ + ((__typeof__((v)->counter))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 +90,26 @@ ({ \ })#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();
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
PATCH 9/9 atomic.h : x86_64
In reply to Mathieu Desnoyers64 bits cmpxchg, xchg and add_less for x86_64.
include/asm-x86_64/atomic.h +32 -2
@@ -388,7 +388,12 @@ static __inline__ long atomic64_sub_retu#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) \ + ((__typeof__((v)->counter))cmpxchg(&((v)->counter), old, new)) +#define atomic64_xchg (v, new) (xchg(&((v)->counter), new)) + +#define atomic_cmpxchg (v, old, new) \ + ((__typeof__((v)->counter))cmpxchg(&((v)->counter), old, new))#define atomic_xchg (v, new) (xchg(&((v)->counter), new))/**
@@ -402,7 +407,7 @@ #define atomic_xchg(v, new) (xchg(&((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 +421,31 @@ ({ \ })#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" \
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
PATCH 1/1 atomic.h : x86_64 atomic64_add_return
atomic64_add_return fix for volatile removal
atomic64_add_return should follow the change done to atomic.h following the removal of "volatile" in the atomic_t type, just like atomic_add_return.
It applies cleanly on top of my "atomic.h : x86_64" patch posted in this thread.
include/asm-x86_64/atomic.h +2 -3
@@ -375,8 +375,8 @@ static __inline__ long atomic64_add_retulong __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; } --
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68