Since the smp_mb__{before,after}*() ops are fundamentally dependent on how an arch can implement atomics it doesn't make sense to have 3 variants of them. They must all be the same. Furthermore, the 3 variants suggest they're only valid for those 3 atomic ops, while we have many more where they could be applied. So move away from smp_mb__{before,after}_{atomic,clear}_{dec,inc,bit}() and reduce the interface to just the two: smp_mb__{before,after}_atomic(). This patch prepares the way by introducing default implementations in asm-generic/barrier.h that default to a full barrier and providing __deprecated inlines for the previous 6 barriers if they're not provided by the arch. This should allow for a mostly painless transition (lots of deprecated warns in the interim).
Unified · Split
| @@ -16,6 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #define __ASM_GENERIC_ATOMIC_H |
| 17 | 17 | |
| 18 | 18 | #include <asm/cmpxchg.h> |
| 19 | +#include <asm/barrier.h> | |
| 19 | 20 | |
| 20 | 21 | #ifdef CONFIG_SMP |
| 21 | 22 | /* Force people to define core atomics */ |
| @@ -182,11 +183,5 @@ static inline void atomic_set_mask(unsigned int mask, atomic_t *v) · 160 unmodified lines | ||
| 182 | 183 | } |
| 183 | 184 | #endif |
| 184 | 185 | |
| 185 | −/* Assume that atomic operations are already serializing */ | |
| 186 | −#define smp_mb__before_atomic_dec() barrier() | |
| 187 | −#define smp_mb__after_atomic_dec() barrier() | |
| 188 | −#define smp_mb__before_atomic_inc() barrier() | |
| 189 | −#define smp_mb__after_atomic_inc() barrier() | |
| 190 | − | |
| 191 | 186 | #endif /* __KERNEL__ */ |
| 192 | 187 | #endif /* __ASM_GENERIC_ATOMIC_H */ |
| @@ -62,6 +62,14 @@ · 61 unmodified lines | ||
| 62 | 62 | #define set_mb(var, value) do { (var) = (value); mb(); } while (0) |
| 63 | 63 | #endif |
| 64 | 64 | |
| 65 | +#ifndef smp_mb__before_atomic | |
| 66 | +#define smp_mb__before_atomic() smp_mb() | |
| 67 | +#endif | |
| 68 | + | |
| 69 | +#ifndef smp_mb__after_atomic | |
| 70 | +#define smp_mb__after_atomic() smp_mb() | |
| 71 | +#endif | |
| 72 | + | |
| 65 | 73 | #define smp_store_release(p, v) \ |
| 66 | 74 | do { \ |
| 67 | 75 | compiletime_assert_atomic_type(*p); \ |
| @@ -11,14 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | |
| 12 | 12 | #include <linux/irqflags.h> |
| 13 | 13 | #include <linux/compiler.h> |
| 14 | − | |
| 15 | −/* | |
| 16 | − * clear_bit may not imply a memory barrier | |
| 17 | − */ | |
| 18 | −#ifndef smp_mb__before_clear_bit | |
| 19 | −#define smp_mb__before_clear_bit() smp_mb() | |
| 20 | −#define smp_mb__after_clear_bit() smp_mb() | |
| 21 | −#endif | |
| 14 | +#include <asm/barrier.h> | |
| 22 | 15 | |
| 23 | 16 | #include <asm-generic/bitops/__ffs.h> |
| 24 | 17 | #include <asm-generic/bitops/ffz.h> |
| @@ -3,6 +3,42 @@ · 2 unmodified lines | ||
| 3 | 3 | #define _LINUX_ATOMIC_H |
| 4 | 4 | #include <asm/atomic.h> |
| 5 | 5 | |
| 6 | +/* | |
| 7 | + * Provide __deprecated wrappers for the new interface, avoid flag day changes. | |
| 8 | + * We need the ugly external functions to break header recursion hell. | |
| 9 | + */ | |
| 10 | +#ifndef smp_mb__before_atomic_inc | |
| 11 | +static inline void __deprecated smp_mb__before_atomic_inc(void) | |
| 12 | +{ | |
| 13 | + extern void __smp_mb__before_atomic(void); | |
| 14 | + __smp_mb__before_atomic(); | |
| 15 | +} | |
| 16 | +#endif | |
| 17 | + | |
| 18 | +#ifndef smp_mb__after_atomic_inc | |
| 19 | +static inline void __deprecated smp_mb__after_atomic_inc(void) | |
| 20 | +{ | |
| 21 | + extern void __smp_mb__after_atomic(void); | |
| 22 | + __smp_mb__after_atomic(); | |
| 23 | +} | |
| 24 | +#endif | |
| 25 | + | |
| 26 | +#ifndef smp_mb__before_atomic_dec | |
| 27 | +static inline void __deprecated smp_mb__before_atomic_dec(void) | |
| 28 | +{ | |
| 29 | + extern void __smp_mb__before_atomic(void); | |
| 30 | + __smp_mb__before_atomic(); | |
| 31 | +} | |
| 32 | +#endif | |
| 33 | + | |
| 34 | +#ifndef smp_mb__after_atomic_dec | |
| 35 | +static inline void __deprecated smp_mb__after_atomic_dec(void) | |
| 36 | +{ | |
| 37 | + extern void __smp_mb__after_atomic(void); | |
| 38 | + __smp_mb__after_atomic(); | |
| 39 | +} | |
| 40 | +#endif | |
| 41 | + | |
| 6 | 42 | /** |
| 7 | 43 | * atomic_add_unless - add unless the number is already a given value |
| 8 | 44 | * @v: pointer of type atomic_t |
| @@ -32,6 +32,26 @@ extern unsigned long __sw_hweight64(__u64 w); · 31 unmodified lines | ||
| 32 | 32 | */ |
| 33 | 33 | #include <asm/bitops.h> |
| 34 | 34 | |
| 35 | +/* | |
| 36 | + * Provide __deprecated wrappers for the new interface, avoid flag day changes. | |
| 37 | + * We need the ugly external functions to break header recursion hell. | |
| 38 | + */ | |
| 39 | +#ifndef smp_mb__before_clear_bit | |
| 40 | +static inline void __deprecated smp_mb__before_clear_bit(void) | |
| 41 | +{ | |
| 42 | + extern void __smp_mb__before_atomic(void); | |
| 43 | + __smp_mb__before_atomic(); | |
| 44 | +} | |
| 45 | +#endif | |
| 46 | + | |
| 47 | +#ifndef smp_mb__after_clear_bit | |
| 48 | +static inline void __deprecated smp_mb__after_clear_bit(void) | |
| 49 | +{ | |
| 50 | + extern void __smp_mb__after_atomic(void); | |
| 51 | + __smp_mb__after_atomic(); | |
| 52 | +} | |
| 53 | +#endif | |
| 54 | + | |
| 35 | 55 | #define for_each_set_bit(bit, addr, size) \ |
| 36 | 56 | for ((bit) = find_first_bit((addr), (size)); \ |
| 37 | 57 | (bit) < (size); \ |
| @@ -90,6 +90,22 @@ · 89 unmodified lines | ||
| 90 | 90 | #define CREATE_TRACE_POINTS |
| 91 | 91 | #include <trace/events/sched.h> |
| 92 | 92 | |
| 93 | +#ifdef smp_mb__before_atomic | |
| 94 | +void __smp_mb__before_atomic(void) | |
| 95 | +{ | |
| 96 | + smp_mb__before_atomic(); | |
| 97 | +} | |
| 98 | +EXPORT_SYMBOL(__smp_mb__before_atomic); | |
| 99 | +#endif | |
| 100 | + | |
| 101 | +#ifdef smp_mb__after_atomic | |
| 102 | +void __smp_mb__after_atomic(void) | |
| 103 | +{ | |
| 104 | + smp_mb__after_atomic(); | |
| 105 | +} | |
| 106 | +EXPORT_SYMBOL(__smp_mb__after_atomic); | |
| 107 | +#endif | |
| 108 | + | |
| 93 | 109 | void start_bandwidth_timer(struct hrtimer *period_timer, ktime_t period) |
| 94 | 110 | { |
| 95 | 111 | unsigned long delta; |