From 027476ea9c652d07f892bbf9e6d350eae2a63174 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 5 Dec 2016 09:35:34 -0500 Subject: [PATCH] Fix: uatomic arm32: add missing release barrier before uatomic_xchg __sync_lock_test_and_set() only imply a release barrier, but uatomic_xchg() guarantees both acquire and release barrier semantics. Therefore, add the missing release barrier. Signed-off-by: Mathieu Desnoyers --- urcu/uatomic/arm.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/urcu/uatomic/arm.h b/urcu/uatomic/arm.h index e0016b8..4041106 100644 --- a/urcu/uatomic/arm.h +++ b/urcu/uatomic/arm.h @@ -26,13 +26,27 @@ #include #include +#include #ifdef __cplusplus extern "C" { #endif /* xchg */ -#define uatomic_xchg(addr, v) __sync_lock_test_and_set(addr, v) + +/* + * Based on [1], __sync_lock_test_and_set() is not a full barrier, but + * instead only an acquire barrier. Given that uatomic_xchg() acts as + * both release and acquire barriers, we therefore need to have our own + * release barrier before this operation. + * + * [1] https://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + */ +#define uatomic_xchg(addr, v) \ + ({ \ + cmm_smp_mb(); \ + __sync_lock_test_and_set(addr, v); \ + }) #ifdef __cplusplus } -- 2.34.1