History

locking/barriers, kcsan: Add instrumentation for barriers

Adds the required KCSAN instrumentation for barriers if CONFIG_SMP. KCSAN supports modeling the effects of: smp_mb() smp_rmb() smp_wmb() smp_store_release()

Marco Elver committed 4 years ago

Commit f9486661 parent 71b0e3a2 files · +16 −15Browse files

Unified · Split

2 files
  1. include/asm-generic/barrier.h +15 −14
  2. include/linux/spinlock.h +1 −1
include/asm-generic/barrier.h+15−14
@@ -14,6 +14,7 @@ · 13 unmodified lines
1414 #ifndef __ASSEMBLY__
1515
1616 #include <linux/compiler.h>
17+#include <linux/kcsan-checks.h>
1718 #include <asm/rwonce.h>
1819
1920 #ifndef nop
@@ -62,15 +63,15 @@ · 42 unmodified lines
6263 #ifdef CONFIG_SMP
6364
6465 #ifndef smp_mb
65−#define smp_mb() __smp_mb()
66+#define smp_mb() do { kcsan_mb(); __smp_mb(); } while (0)
6667 #endif
6768
6869 #ifndef smp_rmb
69−#define smp_rmb() __smp_rmb()
70+#define smp_rmb() do { kcsan_rmb(); __smp_rmb(); } while (0)
7071 #endif
7172
7273 #ifndef smp_wmb
73−#define smp_wmb() __smp_wmb()
74+#define smp_wmb() do { kcsan_wmb(); __smp_wmb(); } while (0)
7475 #endif
7576
7677 #else /* !CONFIG_SMP */
@@ -123,19 +124,19 @@ do { \ · 46 unmodified lines
123124 #ifdef CONFIG_SMP
124125
125126 #ifndef smp_store_mb
126−#define smp_store_mb(var, value) __smp_store_mb(var, value)
127+#define smp_store_mb(var, value) do { kcsan_mb(); __smp_store_mb(var, value); } while (0)
127128 #endif
128129
129130 #ifndef smp_mb__before_atomic
130−#define smp_mb__before_atomic() __smp_mb__before_atomic()
131+#define smp_mb__before_atomic() do { kcsan_mb(); __smp_mb__before_atomic(); } while (0)
131132 #endif
132133
133134 #ifndef smp_mb__after_atomic
134−#define smp_mb__after_atomic() __smp_mb__after_atomic()
135+#define smp_mb__after_atomic() do { kcsan_mb(); __smp_mb__after_atomic(); } while (0)
135136 #endif
136137
137138 #ifndef smp_store_release
138−#define smp_store_release(p, v) __smp_store_release(p, v)
139+#define smp_store_release(p, v) do { kcsan_release(); __smp_store_release(p, v); } while (0)
139140 #endif
140141
141142 #ifndef smp_load_acquire
@@ -178,13 +179,13 @@ do { \ · 36 unmodified lines
178179 #endif /* CONFIG_SMP */
179180
180181 /* Barriers for virtual machine guests when talking to an SMP host */
181−#define virt_mb() __smp_mb()
182−#define virt_rmb() __smp_rmb()
183−#define virt_wmb() __smp_wmb()
184−#define virt_store_mb(var, value) __smp_store_mb(var, value)
185−#define virt_mb__before_atomic() __smp_mb__before_atomic()
186−#define virt_mb__after_atomic() __smp_mb__after_atomic()
187−#define virt_store_release(p, v) __smp_store_release(p, v)
182+#define virt_mb() do { kcsan_mb(); __smp_mb(); } while (0)
183+#define virt_rmb() do { kcsan_rmb(); __smp_rmb(); } while (0)
184+#define virt_wmb() do { kcsan_wmb(); __smp_wmb(); } while (0)
185+#define virt_store_mb(var, value) do { kcsan_mb(); __smp_store_mb(var, value); } while (0)
186+#define virt_mb__before_atomic() do { kcsan_mb(); __smp_mb__before_atomic(); } while (0)
187+#define virt_mb__after_atomic() do { kcsan_mb(); __smp_mb__after_atomic(); } while (0)
188+#define virt_store_release(p, v) do { kcsan_release(); __smp_store_release(p, v); } while (0)
188189 #define virt_load_acquire(p) __smp_load_acquire(p)
189190
190191 /**
include/linux/spinlock.h+1−1
@@ -171,7 +171,7 @@ do { \ · 170 unmodified lines
171171 * Architectures that can implement ACQUIRE better need to take care.
172172 */
173173 #ifndef smp_mb__after_spinlock
174−#define smp_mb__after_spinlock() do { } while (0)
174+#define smp_mb__after_spinlock() kcsan_mb()
175175 #endif
176176
177177 #ifdef CONFIG_DEBUG_SPINLOCK

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