History

arch: Prepare for smp_mb__{before,after}_atomic()

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).

Peter Zijlstra committed 12 years ago

Commit febdbfe1 parent 2ab08ee6 files · +82 −14Browse files

Unified · Split

6 files
  1. include/asm-generic/atomic.h +1 −6
  2. include/asm-generic/barrier.h +8 −0
  3. include/asm-generic/bitops.h +1 −8
  4. include/linux/atomic.h +36 −0
  5. include/linux/bitops.h +20 −0
  6. kernel/sched/core.c +16 −0
include/asm-generic/atomic.h+1−6
@@ -16,6 +16,7 @@ · 15 unmodified lines
1616 #define __ASM_GENERIC_ATOMIC_H
1717
1818 #include <asm/cmpxchg.h>
19+#include <asm/barrier.h>
1920
2021 #ifdef CONFIG_SMP
2122 /* 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
182183 }
183184 #endif
184185
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−
191186 #endif /* __KERNEL__ */
192187 #endif /* __ASM_GENERIC_ATOMIC_H */
include/asm-generic/barrier.h+8−0
@@ -62,6 +62,14 @@ · 61 unmodified lines
6262 #define set_mb(var, value) do { (var) = (value); mb(); } while (0)
6363 #endif
6464
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+
6573 #define smp_store_release(p, v) \
6674 do { \
6775 compiletime_assert_atomic_type(*p); \
include/asm-generic/bitops.h+1−8
@@ -11,14 +11,7 @@ · 10 unmodified lines
1111
1212 #include <linux/irqflags.h>
1313 #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>
2215
2316 #include <asm-generic/bitops/__ffs.h>
2417 #include <asm-generic/bitops/ffz.h>
include/linux/atomic.h+36−0
@@ -3,6 +3,42 @@ · 2 unmodified lines
33 #define _LINUX_ATOMIC_H
44 #include <asm/atomic.h>
55
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+
642 /**
743 * atomic_add_unless - add unless the number is already a given value
844 * @v: pointer of type atomic_t
include/linux/bitops.h+20−0
@@ -32,6 +32,26 @@ extern unsigned long __sw_hweight64(__u64 w); · 31 unmodified lines
3232 */
3333 #include <asm/bitops.h>
3434
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+
3555 #define for_each_set_bit(bit, addr, size) \
3656 for ((bit) = find_first_bit((addr), (size)); \
3757 (bit) < (size); \
kernel/sched/core.c+16−0
@@ -90,6 +90,22 @@ · 89 unmodified lines
9090 #define CREATE_TRACE_POINTS
9191 #include <trace/events/sched.h>
9292
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+
93109 void start_bandwidth_timer(struct hrtimer *period_timer, ktime_t period)
94110 {
95111 unsigned long delta;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t