locking/xchg/alpha: Use smp_mb() in place of __ASM__MB
PATCH 1/2 locking/xchg/alpha: Use smp_mb() in place of __ASM__MB
Replace each occurrence of __ASM__MB with a (trailing) smp_mb() in xchg(), cmpxchg(), and remove the now unused __ASM__MB definitions; this improves readability, with no additional synchronization cost.
--- arch/alpha/include/asm/cmpxchg.h | 6 ------ arch/alpha/include/asm/xchg.h | 16 ++++++++-------- 2 files changed, 8 insertions(+), 14 deletions(-)
arch/alpha/include/asm/cmpxchg.h +0 -6
@@ -6,7 +6,6 @@* Atomic exchange routines. */ -#define __ASM__MB #define ____xchg(type, args...) __xchg ## type ## _local(args) #define ____cmpxchg(type, args...) __cmpxchg ## type ## _local(args)#include <asm/xchg.h>
@@ -33,10 +32,6 @@cmpxchg_local ((ptr), (o), (n)); \ }) -#ifdef CONFIG_SMP -#undef __ASM__MB -#define __ASM__MB "\tmb\n" -#endif #undef ____xchg#undef ____cmpxchg #define ____xchg(type, args...) __xchg ##type(args)
@@ -64,7 +59,6 @@cmpxchg ((ptr), (o), (n)); \ }) -#undef __ASM__MB#undef ____cmpxchg#endif /* _ALPHA_CMPXCHG_H */
arch/alpha/include/asm/xchg.h +8 -8
@@ -28,12 +28,12 @@ ____xchg(_u8, volatile char *m, unsigned long val)" or %1,%2,%2\n" " stq_c %2,0(%3)\n" " beq %2,2f\n" - __ASM__MB".subsection 2\n" "2: br 1b\n" ".previous" : "=&r" (ret), "=&r" (val), "=&r" (tmp), "=&r" (addr64) : "r" ((long)m), "1" (val) : "memory"); + smp_mb();return ret; }
@@ -52,12 +52,12 @@ ____xchg(_u16, volatile short *m, unsigned long val)" or %1,%2,%2\n" " stq_c %2,0(%3)\n" " beq %2,2f\n" - __ASM__MB".subsection 2\n" "2: br 1b\n" ".previous" : "=&r" (ret), "=&r" (val), "=&r" (tmp), "=&r" (addr64) : "r" ((long)m), "1" (val) : "memory"); + smp_mb();return ret; }
@@ -72,12 +72,12 @@ ____xchg(_u32, volatile int *m, unsigned long val)" bis $31,%3,%1\n" " stl_c %1,%2\n" " beq %1,2f\n" - __ASM__MB".subsection 2\n" "2: br 1b\n" ".previous" : "=&r" (val), "=&r" (dummy), "=m" (*m) : "rI" (val), "m" (*m) : "memory"); + smp_mb();return val; }
@@ -92,12 +92,12 @@ ____xchg(_u64, volatile long *m, unsigned long val)" bis $31,%3,%1\n" " stq_c %1,%2\n" " beq %1,2f\n" - __ASM__MB".subsection 2\n" "2: br 1b\n" ".previous" : "=&r" (val), "=&r" (dummy), "=m" (*m) : "rI" (val), "m" (*m) : "memory"); + smp_mb();return val; }
@@ -150,12 +150,12 @@ ____cmpxchg(_u8, volatile char *m, unsigned char old, unsigned char new)" stq_c %2,0(%4)\n" " beq %2,3f\n" "2:\n" - __ASM__MB".subsection 2\n" "3: br 1b\n" ".previous" : "=&r" (prev), "=&r" (new), "=&r" (tmp), "=&r" (cmp), "=&r" (addr64) : "r" ((long)m), "Ir" (old), "1" (new) : "memory"); + smp_mb();return prev; }
@@ -177,12 +177,12 @@ ____cmpxchg(_u16, volatile short *m, unsigned short old, unsigned short new)" stq_c %2,0(%4)\n" " beq %2,3f\n" "2:\n" - __ASM__MB".subsection 2\n" "3: br 1b\n" ".previous" : "=&r" (prev), "=&r" (new), "=&r" (tmp), "=&r" (cmp), "=&r" (addr64) : "r" ((long)m), "Ir" (old), "1" (new) : "memory"); + smp_mb();return prev; }
@@ -200,12 +200,12 @@ ____cmpxchg(_u32, volatile int *m, int old, int new)" stl_c %1,%2\n" " beq %1,3f\n" "2:\n" - __ASM__MB".subsection 2\n" "3: br 1b\n" ".previous" : "=&r"(prev), "=&r"(cmp), "=m"(*m) : "r"((long) old), "r"(new), "m"(*m) : "memory"); + smp_mb();return prev; }
@@ -223,12 +223,12 @@ ____cmpxchg(_u64, volatile long *m, unsigned long old, unsigned long new)" stq_c %1,%2\n" " beq %1,3f\n" "2:\n" - __ASM__MB".subsection 2\n" "3: br 1b\n" ".previous" : "=&r"(prev), "=&r"(cmp), "=m"(*m) : "r"((long) old), "r"(new), "m"(*m) : "memory"); + smp_mb();return prev; }
Signature · 1 line
2.7.4
Quoted 6 lines · Andrea Parri
Replace each occurrence of
__ASM__MBwith a (trailing)smp_mb()inxchg(),cmpxchg(), and remove the now unused__ASM__MBdefinitions; this improves readability, with no additional synchronization cost.Suggested-by Will Deacon <[email protected]>Signed-off-by Andrea Parri <[email protected]>
I am a bit confused by the use of out-of-line branches to do a backwards branch, but those were in place to start with. Maybe the point is to defeat backwards-branch prediction or some such.
Regardless...
Quoted 163 lines
Cc Peter Zijlstra <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Alan Stern <[email protected]>Cc Ivan Kokshaysky <[email protected]>Cc Matt Turner <[email protected]>Cc Richard Henderson <[email protected]>--- arch/alpha/include/asm/cmpxchg.h | 6 ------ arch/alpha/include/asm/xchg.h | 16 ++++++++-------- 2 files changed, 8 insertions(+), 14 deletions(-)arch/alpha/include/asm/cmpxchg.h +0
-6@@ -6,7 +6,6 @@* Atomic exchange routines. */ -#define __ASM__MB #define ____xchg(type, args...) __xchg ## type ## _local(args) #define ____cmpxchg(type, args...) __cmpxchg ## type ## _local(args)#include <asm/xchg.h> @@ -33,10 +32,6 @@cmpxchg_local ((ptr), (o), (n)); \ }) -#ifdef CONFIG_SMP -#undef __ASM__MB -#define __ASM__MB "\tmb\n" -#endif #undef ____xchg#undef ____cmpxchg #define ____xchg(type, args...) __xchg ##type(args)@@ -64,7 +59,6 @@cmpxchg ((ptr), (o), (n)); \ }) -#undef __ASM__MB#undef ____cmpxchg#endif /* _ALPHA_CMPXCHG_H */ arch/alpha/include/asm/xchg.h +8
-8@@ -28,12 +28,12 @@ ____xchg(_u8, volatile char *m, unsigned long val)" or %1,%2,%2\n" " stq_c %2,0(%3)\n" " beq %2,2f\n" - __ASM__MB".subsection 2\n" "2: br 1b\n" ".previous" : "=&r" (ret), "=&r" (val), "=&r" (tmp), "=&r" (addr64) : "r" ((long)m), "1" (val) : "memory"); + smp_mb();return ret; }@@ -52,12 +52,12 @@ ____xchg(_u16, volatile short *m, unsigned long val)" or %1,%2,%2\n" " stq_c %2,0(%3)\n" " beq %2,2f\n" - __ASM__MB".subsection 2\n" "2: br 1b\n" ".previous" : "=&r" (ret), "=&r" (val), "=&r" (tmp), "=&r" (addr64) : "r" ((long)m), "1" (val) : "memory"); + smp_mb();return ret; }@@ -72,12 +72,12 @@ ____xchg(_u32, volatile int *m, unsigned long val)" bis $31,%3,%1\n" " stl_c %1,%2\n" " beq %1,2f\n" - __ASM__MB".subsection 2\n" "2: br 1b\n" ".previous" : "=&r" (val), "=&r" (dummy), "=m" (*m) : "rI" (val), "m" (*m) : "memory"); + smp_mb();return val; }@@ -92,12 +92,12 @@ ____xchg(_u64, volatile long *m, unsigned long val)" bis $31,%3,%1\n" " stq_c %1,%2\n" " beq %1,2f\n" - __ASM__MB".subsection 2\n" "2: br 1b\n" ".previous" : "=&r" (val), "=&r" (dummy), "=m" (*m) : "rI" (val), "m" (*m) : "memory"); + smp_mb();return val; }@@ -150,12 +150,12 @@ ____cmpxchg(_u8, volatile char *m, unsigned char old, unsigned char new)" stq_c %2,0(%4)\n" " beq %2,3f\n" "2:\n" - __ASM__MB".subsection 2\n" "3: br 1b\n" ".previous" : "=&r" (prev), "=&r" (new), "=&r" (tmp), "=&r" (cmp), "=&r" (addr64) : "r" ((long)m), "Ir" (old), "1" (new) : "memory"); + smp_mb();return prev; }@@ -177,12 +177,12 @@ ____cmpxchg(_u16, volatile short *m, unsigned short old, unsigned short new)" stq_c %2,0(%4)\n" " beq %2,3f\n" "2:\n" - __ASM__MB".subsection 2\n" "3: br 1b\n" ".previous" : "=&r" (prev), "=&r" (new), "=&r" (tmp), "=&r" (cmp), "=&r" (addr64) : "r" ((long)m), "Ir" (old), "1" (new) : "memory"); + smp_mb();return prev; }@@ -200,12 +200,12 @@ ____cmpxchg(_u32, volatile int *m, int old, int new)" stl_c %1,%2\n" " beq %1,3f\n" "2:\n" - __ASM__MB".subsection 2\n" "3: br 1b\n" ".previous" : "=&r"(prev), "=&r"(cmp), "=m"(*m) : "r"((long) old), "r"(new), "m"(*m) : "memory"); + smp_mb();return prev; }@@ -223,12 +223,12 @@ ____cmpxchg(_u64, volatile long *m, unsigned long old, unsigned long new)" stq_c %1,%2\n" " beq %1,3f\n" "2:\n" - __ASM__MB".subsection 2\n" "3: br 1b\n" ".previous" : "=&r"(prev), "=&r"(cmp), "=m"(*m) : "r"((long) old), "r"(new), "m"(*m) : "memory"); + smp_mb();return prev; }Signature · 1 line
2.7.4
tip-bot for Andrea Parri
merge bot[tip:locking/urgent] locking/xchg/alpha: Clean up barrier usage by using smp_mb() in place of __ASM__MB
In reply to Andrea Parrilocking/xchg/alpha: Clean up barrier usage by using smp_mb() in place of __ASM__MB
Commit-ID: 79d442461df7478cdd0c50d9b8a76f431f150fa3 Gitweb: https://git.kernel.org/tip/79d442461df7478cdd0c50d9b8a76f431f150fa3 Author: Andrea Parri <[email protected]> AuthorDate: Thu, 22 Feb 2018 10:24:29 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 23 Feb 2018 08:38:15 +0100
locking/xchg/alpha: Clean up barrier usage by using smp_mb() in place of __ASM__MB
Replace each occurrence of __ASM__MB with a (trailing) smp_mb() in xchg(), cmpxchg(), and remove the now unused __ASM__MB definitions; this improves readability, with no additional synchronization cost.
--- arch/alpha/include/asm/cmpxchg.h | 6 ------ arch/alpha/include/asm/xchg.h | 16 ++++++++-------- 2 files changed, 8 insertions(+), 14 deletions(-)
arch/alpha/include/asm/cmpxchg.h +0 -6
@@ -6,7 +6,6 @@* Atomic exchange routines. */ -#define __ASM__MB #define ____xchg(type, args...) __xchg ## type ## _local(args) #define ____cmpxchg(type, args...) __cmpxchg ## type ## _local(args)#include <asm/xchg.h>
@@ -33,10 +32,6 @@cmpxchg_local ((ptr), (o), (n)); \ }) -#ifdef CONFIG_SMP -#undef __ASM__MB -#define __ASM__MB "\tmb\n" -#endif #undef ____xchg#undef ____cmpxchg #define ____xchg(type, args...) __xchg ##type(args)
@@ -64,7 +59,6 @@cmpxchg ((ptr), (o), (n)); \ }) -#undef __ASM__MB#undef ____cmpxchg#endif /* _ALPHA_CMPXCHG_H */
arch/alpha/include/asm/xchg.h +8 -8
@@ -28,12 +28,12 @@ ____xchg(_u8, volatile char *m, unsigned long val)" or %1,%2,%2\n" " stq_c %2,0(%3)\n" " beq %2,2f\n" - __ASM__MB".subsection 2\n" "2: br 1b\n" ".previous" : "=&r" (ret), "=&r" (val), "=&r" (tmp), "=&r" (addr64) : "r" ((long)m), "1" (val) : "memory"); + smp_mb();return ret; }
@@ -52,12 +52,12 @@ ____xchg(_u16, volatile short *m, unsigned long val)" or %1,%2,%2\n" " stq_c %2,0(%3)\n" " beq %2,2f\n" - __ASM__MB".subsection 2\n" "2: br 1b\n" ".previous" : "=&r" (ret), "=&r" (val), "=&r" (tmp), "=&r" (addr64) : "r" ((long)m), "1" (val) : "memory"); + smp_mb();return ret; }
@@ -72,12 +72,12 @@ ____xchg(_u32, volatile int *m, unsigned long val)" bis $31,%3,%1\n" " stl_c %1,%2\n" " beq %1,2f\n" - __ASM__MB".subsection 2\n" "2: br 1b\n" ".previous" : "=&r" (val), "=&r" (dummy), "=m" (*m) : "rI" (val), "m" (*m) : "memory"); + smp_mb();return val; }
@@ -92,12 +92,12 @@ ____xchg(_u64, volatile long *m, unsigned long val)" bis $31,%3,%1\n" " stq_c %1,%2\n" " beq %1,2f\n" - __ASM__MB".subsection 2\n" "2: br 1b\n" ".previous" : "=&r" (val), "=&r" (dummy), "=m" (*m) : "rI" (val), "m" (*m) : "memory"); + smp_mb();return val; }
@@ -150,12 +150,12 @@ ____cmpxchg(_u8, volatile char *m, unsigned char old, unsigned char new)" stq_c %2,0(%4)\n" " beq %2,3f\n" "2:\n" - __ASM__MB".subsection 2\n" "3: br 1b\n" ".previous" : "=&r" (prev), "=&r" (new), "=&r" (tmp), "=&r" (cmp), "=&r" (addr64) : "r" ((long)m), "Ir" (old), "1" (new) : "memory"); + smp_mb();return prev; }
@@ -177,12 +177,12 @@ ____cmpxchg(_u16, volatile short *m, unsigned short old, unsigned short new)" stq_c %2,0(%4)\n" " beq %2,3f\n" "2:\n" - __ASM__MB".subsection 2\n" "3: br 1b\n" ".previous" : "=&r" (prev), "=&r" (new), "=&r" (tmp), "=&r" (cmp), "=&r" (addr64) : "r" ((long)m), "Ir" (old), "1" (new) : "memory"); + smp_mb();return prev; }
@@ -200,12 +200,12 @@ ____cmpxchg(_u32, volatile int *m, int old, int new)" stl_c %1,%2\n" " beq %1,3f\n" "2:\n" - __ASM__MB".subsection 2\n" "3: br 1b\n" ".previous" : "=&r"(prev), "=&r"(cmp), "=m"(*m) : "r"((long) old), "r"(new), "m"(*m) : "memory"); + smp_mb();return prev; }
@@ -223,12 +223,12 @@ ____cmpxchg(_u64, volatile long *m, unsigned long old, unsigned long new)" stq_c %1,%2\n" " beq %1,3f\n" "2:\n" - __ASM__MB".subsection 2\n" "3: br 1b\n" ".previous" : "=&r"(prev), "=&r"(cmp), "=m"(*m) : "r"((long) old), "r"(new), "m"(*m) : "memory"); + smp_mb();return prev; }
Re: [tip:locking/urgent] locking/xchg/alpha: Clean up barrier usage by using smp_mb() in place of __ASM__MB
Hi Andrea,
I know this is in mainline now, but I think the way you've got the barriers here:
Quoted 38 lines · tip-bot for Andrea Parri
arch/alpha/include/asm/cmpxchg.h +0
-6@@ -6,7 +6,6 @@* Atomic exchange routines. */ -#define __ASM__MB #define ____xchg(type, args...) __xchg ## type ## _local(args) #define ____cmpxchg(type, args...) __cmpxchg ## type ## _local(args)#include <asm/xchg.h> @@ -33,10 +32,6 @@cmpxchg_local ((ptr), (o), (n)); \ }) -#ifdef CONFIG_SMP -#undef __ASM__MB -#define __ASM__MB "\tmb\n" -#endif #undef ____xchg#undef ____cmpxchg #define ____xchg(type, args...) __xchg ##type(args)@@ -64,7 +59,6 @@cmpxchg ((ptr), (o), (n)); \ }) -#undef __ASM__MB#undef ____cmpxchg#endif /* _ALPHA_CMPXCHG_H */ arch/alpha/include/asm/xchg.h +0
-0@@ -28,12 +28,12 @@ ____xchg(_u8, volatile char *m, unsigned long val)" or %1,%2,%2\n" " stq_c %2,0(%3)\n"
arch/alpha/include/asm/xchg.h ____xchg(_u8, volatile char *m, unsigned long val) · line 38
Quoted 10 lines
arch/alpha/include/asm/xchg.h +1
-1" beq %2,2f\n" - __ASM__MB".subsection 2\n" "2: br 1b\n" ".previous" : "=&r" (ret), "=&r" (val), "=&r" (tmp), "=&r" (addr64) : "r" ((long)m), "1" (val) : "memory"); + smp_mb();return ret;
ends up adding unnecessary barriers to the _local variants, which the previous code took care to avoid. That's why I suggesting adding the smp_mb() into the cmpxchg macro rather than the ____cmpxchg variants.
I think it's worth spinning another patch to fix this properly.
Will