[PATCH 09/27] atomic: convert to uatomic

Dave Chinner
2020-10-15T07:22:13Z

Now we have liburcu, we can make use of it's atomic variable
implementation. It is almost identical to the kernel API - it's just
got a "uatomic" prefix. liburcu also provides all the same aomtic
variable memory barriers as the kernel, so if we pull memory barrier
dependent kernel code across, it will just work with the right
barrier wrappers.

This is preparation the addition of more extensive atomic operations
the that kernel buffer cache requires to function correctly.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
include/atomic.h | 60 +++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/include/atomic.h b/include/atomic.h
index 1aabecc3ae57..5860d7897ae5 100644
--- a/include/atomic.h
+++ b/include/atomic.h
@@ -7,18 +7,62 @@
#define __ATOMIC_H__

/*
- * Warning: These are not really atomic at all. They are wrappers around the
- * kernel atomic variable interface. If we do need these variables to be atomic
- * (due to multithreading of the code that uses them) we need to add some
- * pthreads magic here.
+ * Atomics are provided by liburcu.
+ *
+ * API and guidelines for which operations provide memory barriers is here:
+ *
+ * https://github.com/urcu/userspace-rcu/blob/master/doc/uatomic-api.md
+ *
+ * Unlike the kernel, the same interface supports 32 and 64 bit atomic integers.
*/
+#include <urcu/uatomic.h>
+#include "spinlock.h"
+
typedef int32_t atomic_t;
typedef int64_t atomic64_t;

-#define atomic_inc_return(x) (++(*(x)))
-#define atomic_dec_return(x) (--(*(x)))
+#define atomic_read(a) uatomic_read(a)
+#define atomic_set(a, v) uatomic_set(a, v)
+
+#define atomic_inc_return(a) uatomic_add_return(a, 1)
+#define atomic_dec_return(a) uatomic_sub_return(a, 1)
+
+#define atomic_inc(a) atomic_inc_return(a)
+#define atomic_dec(a) atomic_inc_return(a)
+
+#define atomic_dec_and_test(a) (atomic_dec_return(a) == 0)
+
+#define cmpxchg(a, o, n) uatomic_cmpxchg(a, o, n);
+
+static inline bool atomic_add_unless(atomic_t *a, int v, int u)
+{
+ int r = atomic_read(a);
+ int n, o;
+
+ do {
+ o = r;
+ if (o == u)
+ break;
+ n = o + v;
+ r = uatomic_cmpxchg(a, o, n);
+ } while (r != o);
+
+ return o != u;
+}
+
+static inline bool atomic_dec_and_lock(atomic_t *a, spinlock_t *lock)
+{
+ if (atomic_add_unless(a, -1, 1))
+ return 0;
+
+ spin_lock(lock);
+ if (atomic_dec_and_test(a))
+ return 1;
+ spin_unlock(lock);
+ return 0;
+}

-#define atomic64_read(x) *(x)
-#define atomic64_set(x, v) (*(x) = v)
+#define atomic64_read(x) uatomic_read(x)
+#define atomic64_set(x, v) uatomic_set(x, v)

#endif /* __ATOMIC_H__ */
--
2.28.0