uatomic: add memory barrier API for and/or/add/sub/inc/sub

[userspace-rcu.git] / urcu / uatomic / x86.h

diff --git a/urcu/uatomic/x86.h b/urcu/uatomic/x86.h
index b4c108fb2c4e43b4f20c3b24cda20563b0059958..99b0e6c6b405191538ff6ab50de35320c47652ea 100644 (file)
--- a/urcu/uatomic/x86.h
+++ b/urcu/uatomic/x86.h
@@ -102,8 +102,9 @@ unsigned long __uatomic_cmpxchg(void *addr, unsigned long old,
 }
 
 #define _uatomic_cmpxchg(addr, old, _new)                                    \
-       ((__typeof__(*(addr))) __uatomic_cmpxchg((addr), (unsigned long)(old),\
-                                               (unsigned long)(_new),        \
+       ((__typeof__(*(addr))) __uatomic_cmpxchg((addr),                      \
+                                               caa_cast_long_keep_sign(old), \
+                                               caa_cast_long_keep_sign(_new),\
                                                sizeof(*(addr))))
 
 /* xchg */
@@ -163,7 +164,8 @@ unsigned long __uatomic_exchange(void *addr, unsigned long val, int len)
 }
 
 #define _uatomic_xchg(addr, v)                                               \
-       ((__typeof__(*(addr))) __uatomic_exchange((addr), (unsigned long)(v), \
+       ((__typeof__(*(addr))) __uatomic_exchange((addr),                     \
+                                               caa_cast_long_keep_sign(v),   \
                                                sizeof(*(addr))))
 
 /* uatomic_add_return */
@@ -226,10 +228,10 @@ unsigned long __uatomic_add_return(void *addr, unsigned long val,
        return 0;
 }
 
-#define _uatomic_add_return(addr, v)                                   \
-       ((__typeof__(*(addr))) __uatomic_add_return((addr),             \
-                                                 (unsigned long)(v),   \
-                                                 sizeof(*(addr))))
+#define _uatomic_add_return(addr, v)                                       \
+       ((__typeof__(*(addr))) __uatomic_add_return((addr),                 \
+                                               caa_cast_long_keep_sign(v), \
+                                               sizeof(*(addr))))
 
 /* uatomic_and */
 
@@ -283,7 +285,7 @@ void __uatomic_and(void *addr, unsigned long val, int len)
 }
 
 #define _uatomic_and(addr, v)                                             \
-       (__uatomic_and((addr), (unsigned long)(v), sizeof(*(addr))))
+       (__uatomic_and((addr), caa_cast_long_keep_sign(v), sizeof(*(addr))))
 
 /* uatomic_or */
 
@@ -337,7 +339,7 @@ void __uatomic_or(void *addr, unsigned long val, int len)
 }
 
 #define _uatomic_or(addr, v)                                              \
-       (__uatomic_or((addr), (unsigned long)(v), sizeof(*(addr))))
+       (__uatomic_or((addr), caa_cast_long_keep_sign(v), sizeof(*(addr))))
 
 /* uatomic_add */
 
@@ -391,7 +393,7 @@ void __uatomic_add(void *addr, unsigned long val, int len)
 }
 
 #define _uatomic_add(addr, v)                                             \
-       (__uatomic_add((addr), (unsigned long)(v), sizeof(*(addr))))
+       (__uatomic_add((addr), caa_cast_long_keep_sign(v), sizeof(*(addr))))
 
 
 /* uatomic_inc */
@@ -505,9 +507,9 @@ extern int __rcu_cas_avail;
 extern int __rcu_cas_init(void);
 
 #define UATOMIC_COMPAT(insn)                                                   \
-       ((likely(__rcu_cas_avail > 0))                                          \
+       ((caa_likely(__rcu_cas_avail > 0))                                              \
        ? (_uatomic_##insn)                                                     \
-               : ((unlikely(__rcu_cas_avail < 0)                               \
+               : ((caa_unlikely(__rcu_cas_avail < 0)                           \
                        ? ((__rcu_cas_init() > 0)                               \
                                ? (_uatomic_##insn)                             \
                                : (compat_uatomic_##insn))                      \
@@ -517,7 +519,7 @@ extern unsigned long _compat_uatomic_set(void *addr,
                                         unsigned long _new, int len);
 #define compat_uatomic_set(addr, _new)                                        \
        ((__typeof__(*(addr))) _compat_uatomic_set((addr),                     \
-                                               (unsigned long)(_new),         \
+                                               caa_cast_long_keep_sign(_new), \
                                                sizeof(*(addr))))
 
 
@@ -525,36 +527,34 @@ extern unsigned long _compat_uatomic_xchg(void *addr,
                                          unsigned long _new, int len);
 #define compat_uatomic_xchg(addr, _new)                                               \
        ((__typeof__(*(addr))) _compat_uatomic_xchg((addr),                    \
-                                               (unsigned long)(_new),         \
+                                               caa_cast_long_keep_sign(_new), \
                                                sizeof(*(addr))))
 
 extern unsigned long _compat_uatomic_cmpxchg(void *addr, unsigned long old,
                                             unsigned long _new, int len);
 #define compat_uatomic_cmpxchg(addr, old, _new)                                       \
        ((__typeof__(*(addr))) _compat_uatomic_cmpxchg((addr),                 \
-                                               (unsigned long)(old),          \
-                                               (unsigned long)(_new),         \
+                                               caa_cast_long_keep_sign(old),  \
+                                               caa_cast_long_keep_sign(_new), \
                                                sizeof(*(addr))))
 
-extern unsigned long _compat_uatomic_and(void *addr,
-                                        unsigned long _new, int len);
+extern void _compat_uatomic_and(void *addr, unsigned long _new, int len);
 #define compat_uatomic_and(addr, v)                                   \
-       ((__typeof__(*(addr))) _compat_uatomic_and((addr),             \
-                                                  (unsigned long)(v), \
-                                                  sizeof(*(addr))))
+       (_compat_uatomic_and((addr),                                   \
+                       caa_cast_long_keep_sign(v),                    \
+                       sizeof(*(addr))))
 
-extern unsigned long _compat_uatomic_or(void *addr,
-                                       unsigned long _new, int len);
+extern void _compat_uatomic_or(void *addr, unsigned long _new, int len);
 #define compat_uatomic_or(addr, v)                                    \
-       ((__typeof__(*(addr))) _compat_uatomic_or((addr),              \
-                                                 (unsigned long)(v),  \
-                                                 sizeof(*(addr))))
+       (_compat_uatomic_or((addr),                                    \
+                         caa_cast_long_keep_sign(v),                  \
+                         sizeof(*(addr))))
 
 extern unsigned long _compat_uatomic_add_return(void *addr,
                                                unsigned long _new, int len);
-#define compat_uatomic_add_return(addr, v)                                    \
-       ((__typeof__(*(addr))) _compat_uatomic_add_return((addr),              \
-                                               (unsigned long)(v),            \
+#define compat_uatomic_add_return(addr, v)                                 \
+       ((__typeof__(*(addr))) _compat_uatomic_add_return((addr),           \
+                                               caa_cast_long_keep_sign(v), \
                                                sizeof(*(addr))))
 
 #define compat_uatomic_add(addr, v)                                           \
@@ -576,16 +576,31 @@ extern unsigned long _compat_uatomic_add_return(void *addr,
                UATOMIC_COMPAT(cmpxchg(addr, old, _new))
 #define uatomic_xchg(addr, v)                  \
                UATOMIC_COMPAT(xchg(addr, v))
+
 #define uatomic_and(addr, v)           \
                UATOMIC_COMPAT(and(addr, v))
+#define cmm_smp_mb__before_and()       cmm_barrier()
+#define cmm_smp_mb__after_and()                cmm_barrier()
+
 #define uatomic_or(addr, v)            \
                UATOMIC_COMPAT(or(addr, v))
+#define cmm_smp_mb__before_or()                cmm_barrier()
+#define cmm_smp_mb__after_or()         cmm_barrier()
+
 #define uatomic_add_return(addr, v)            \
                UATOMIC_COMPAT(add_return(addr, v))
 
 #define uatomic_add(addr, v)   UATOMIC_COMPAT(add(addr, v))
+#define cmm_smp_mb__before_add()       cmm_barrier()
+#define cmm_smp_mb__after_add()                cmm_barrier()
+
 #define uatomic_inc(addr)      UATOMIC_COMPAT(inc(addr))
+#define cmm_smp_mb__before_inc()       cmm_barrier()
+#define cmm_smp_mb__after_inc()                cmm_barrier()
+
 #define uatomic_dec(addr)      UATOMIC_COMPAT(dec(addr))
+#define cmm_smp_mb__before_dec()       cmm_barrier()
+#define cmm_smp_mb__after_dec()                cmm_barrier()
 
 #ifdef __cplusplus 
 }