The following commit has been merged into the locking/core branch of tip:
Commit-ID: 9d1335cc1e97cc3da0d14f640dd716e614083e8b
Gitweb:
https://git.kernel.org/tip/9d1335cc1e97cc3da0d14f640dd716e614083e8b
Author: Marco Elver <el...@google.com>
AuthorDate: Fri, 24 Jul 2020 09:00:04 +02:00
Committer: Paul E. McKenney <paul...@kernel.org>
CommitterDate: Mon, 24 Aug 2020 15:09:57 -07:00
kcsan: Add missing CONFIG_KCSAN_IGNORE_ATOMICS checks
Add missing CONFIG_KCSAN_IGNORE_ATOMICS checks for the builtin atomics
instrumentation.
Acked-by: Peter Zijlstra (Intel) <pet...@infradead.org>
Signed-off-by: Marco Elver <el...@google.com>
Signed-off-by: Paul E. McKenney <paul...@kernel.org>
---
kernel/kcsan/core.c | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/kernel/kcsan/core.c b/kernel/kcsan/core.c
index 95a364e..99e5044 100644
--- a/kernel/kcsan/core.c
+++ b/kernel/kcsan/core.c
@@ -914,14 +914,19 @@ EXPORT_SYMBOL(__tsan_init);
u##bits __tsan_atomic##bits##_load(const u##bits *ptr, int memorder);
\
u##bits __tsan_atomic##bits##_load(const u##bits *ptr, int memorder)
\
{
\
- check_access(ptr, bits / BITS_PER_BYTE, KCSAN_ACCESS_ATOMIC);
\
+ if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) {
\
+ check_access(ptr, bits / BITS_PER_BYTE,
KCSAN_ACCESS_ATOMIC); \
+ }
\
return __atomic_load_n(ptr, memorder);
\
}
\
EXPORT_SYMBOL(__tsan_atomic##bits##_load);
\
void __tsan_atomic##bits##_store(u##bits *ptr, u##bits v, int
memorder); \
void __tsan_atomic##bits##_store(u##bits *ptr, u##bits v, int memorder)
\
{
\
- check_access(ptr, bits / BITS_PER_BYTE, KCSAN_ACCESS_WRITE |
KCSAN_ACCESS_ATOMIC); \
+ if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) {
\
+ check_access(ptr, bits / BITS_PER_BYTE,
\
+ KCSAN_ACCESS_WRITE | KCSAN_ACCESS_ATOMIC);
\
+ }
\
__atomic_store_n(ptr, v, memorder);
\
}
\
EXPORT_SYMBOL(__tsan_atomic##bits##_store)
@@ -930,8 +935,11 @@ EXPORT_SYMBOL(__tsan_init);
u##bits __tsan_atomic##bits##_##op(u##bits *ptr, u##bits v, int
memorder); \
u##bits __tsan_atomic##bits##_##op(u##bits *ptr, u##bits v, int
memorder) \
{
\
- check_access(ptr, bits / BITS_PER_BYTE,
\
- KCSAN_ACCESS_COMPOUND | KCSAN_ACCESS_WRITE |
KCSAN_ACCESS_ATOMIC); \
+ if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) {
\
+ check_access(ptr, bits / BITS_PER_BYTE,
\
+ KCSAN_ACCESS_COMPOUND | KCSAN_ACCESS_WRITE
| \
+ KCSAN_ACCESS_ATOMIC);
\
+ }
\
return __atomic_##op##suffix(ptr, v, memorder);
\
}
\
EXPORT_SYMBOL(__tsan_atomic##bits##_##op)
@@ -959,8 +967,11 @@ EXPORT_SYMBOL(__tsan_init);
int __tsan_atomic##bits##_compare_exchange_##strength(u##bits *ptr,
u##bits *exp, \
u##bits val, int
mo, int fail_mo) \
{
\
- check_access(ptr, bits / BITS_PER_BYTE,
\
- KCSAN_ACCESS_COMPOUND | KCSAN_ACCESS_WRITE |
KCSAN_ACCESS_ATOMIC); \
+ if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) {
\
+ check_access(ptr, bits / BITS_PER_BYTE,
\
+ KCSAN_ACCESS_COMPOUND | KCSAN_ACCESS_WRITE
| \
+ KCSAN_ACCESS_ATOMIC);
\
+ }
\
return __atomic_compare_exchange_n(ptr, exp, val, weak, mo,
fail_mo); \
}
\
EXPORT_SYMBOL(__tsan_atomic##bits##_compare_exchange_##strength)
@@ -971,8 +982,11 @@ EXPORT_SYMBOL(__tsan_init);
u##bits __tsan_atomic##bits##_compare_exchange_val(u##bits *ptr,
u##bits exp, u##bits val, \
int mo, int fail_mo)
\
{
\
- check_access(ptr, bits / BITS_PER_BYTE,
\
- KCSAN_ACCESS_COMPOUND | KCSAN_ACCESS_WRITE |
KCSAN_ACCESS_ATOMIC); \
+ if (!IS_ENABLED(CONFIG_KCSAN_IGNORE_ATOMICS)) {
\
+ check_access(ptr, bits / BITS_PER_BYTE,
\
+ KCSAN_ACCESS_COMPOUND | KCSAN_ACCESS_WRITE
| \
+ KCSAN_ACCESS_ATOMIC);
\
+ }
\
__atomic_compare_exchange_n(ptr, &exp, val, 0, mo, fail_mo);
\
return exp;
\
}
\
