Skip to contentSkip to conversation

riscv, atomic: Add #define's for the atomic_{cmp,}xchg_*() variants

PATCH In review Andrea Parri 2 participants 2 messages Dec 1, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 riscv, atomic: Add #define's for the atomic_{cmp,}xchg_*() variants

If an architecture does not define the atomic_{cmp,}xchg_*() variants, the generic implementation defaults them to the fully-ordered version.

riscv's had its own variants since "the beginning", but it never told (#define-d these for) the generic implementation: it is time to do so.

Cc Palmer Dabbelt <[email protected]>
Cc Albert Ou <[email protected]>
Cc Will Deacon <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Boqun Feng <[email protected]>

---
TBH, the delay was not intentional: I've just become aware of it while working on moving riscv over to queued rwlocks. There's currently one callsite for the non-fully-ordered variants mentioned above for riscv:
for atomic_cmpxchg_acquire() in kernel/sched/rt.c:rto_start_trylock(),

[before]

     51a:	100726af          	lr.w	a3,(a4)
     51e:	00069763          	bnez	a3,52c <.L17>
     522:	1af7262f          	sc.w.rl	a2,a5,(a4)
     526:	fa75                	bnez	a2,51a <.L1>
     528:	0330000f          	fence	rw,rw

[after]

     51a:	100726af          	lr.w	a3,(a4)
     51e:	00069763          	bnez	a3,52c <.L17>
     522:	18f7262f          	sc.w	a2,a5,(a4)
     526:	fa75                	bnez	a2,51a <.L1>
     528:	0230000f          	fence	r,rw
---
 arch/riscv/include/asm/atomic.h | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/riscv/include/asm/atomic.h +9 -0
index c452359c9cb8a..93826771b616a 100644
@@ -303,6 +303,15 @@ c_t atomic##prefix##_cmpxchg(atomic##prefix##_t *v, c_t o, c_t n)	\
 
 ATOMIC_OPS()
 
+#define atomic_xchg_relaxed atomic_xchg_relaxed
+#define atomic_xchg_acquire atomic_xchg_acquire
+#define atomic_xchg_release atomic_xchg_release
+#define atomic_xchg atomic_xchg
+#define atomic_cmpxchg_relaxed atomic_cmpxchg_relaxed
+#define atomic_cmpxchg_acquire atomic_cmpxchg_acquire
+#define atomic_cmpxchg_release atomic_cmpxchg_release
+#define atomic_cmpxchg atomic_cmpxchg
+
 #undef ATOMIC_OPS
 #undef ATOMIC_OP
 
Signature · 1 line
2.17.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Andrea Parri

If an architecture does not define the atomic_{cmp,}xchg_*() variants, the generic implementation defaults them to the fully-ordered version.

riscv's had its own variants since "the beginning", but it never told (#define-d these for) the generic implementation: it is time to do so.

Quoted 6 lines
Cc Palmer Dabbelt <[email protected]>
Cc Albert Ou <[email protected]>
Cc Will Deacon <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Boqun Feng <[email protected]>
Quoted 27 lines
---
 arch/riscv/include/asm/atomic.h | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/riscv/include/asm/atomic.h +9 -0
index c452359c9cb8a..93826771b616a 100644
@@ -303,6 +303,15 @@ c_t atomic##prefix##_cmpxchg(atomic##prefix##_t *v, c_t o, c_t n)	\
 
 ATOMIC_OPS()
 
+#define atomic_xchg_relaxed atomic_xchg_relaxed
+#define atomic_xchg_acquire atomic_xchg_acquire
+#define atomic_xchg_release atomic_xchg_release
+#define atomic_xchg atomic_xchg
+#define atomic_cmpxchg_relaxed atomic_cmpxchg_relaxed
+#define atomic_cmpxchg_acquire atomic_cmpxchg_acquire
+#define atomic_cmpxchg_release atomic_cmpxchg_release
+#define atomic_cmpxchg atomic_cmpxchg
+
 #undef ATOMIC_OPS
 #undef ATOMIC_OP
 
Signature · 1 line
2.17.1

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv