diff options
| author | Marco Elver <elver@google.com> | 2020-11-17 16:36:40 +0100 |
|---|---|---|
| committer | Marco Elver <me@marcoelver.com> | 2020-11-17 17:55:27 +0100 |
| commit | 09323409cdbe048449a5a6819c076492c166f18a (patch) | |
| tree | 560bb348dc1fe4751abf81d41f84173b50d684fc | |
| parent | 7eca15bf0a08747c3f79445ca59ed86eb1ced4fd (diff) | |
dashboard/config/linux: restore KCSAN config to default
Restore the default kernel config value for
CONFIG_KCSAN_ASSUME_PLAIN_WRITES_ATOMIC
Fixes: cc97498cfe89 ("tools/syz-kconf: don't enable configs implicitly")
| -rw-r--r-- | dashboard/config/linux/bits/kcsan.yml | 1 | ||||
| -rw-r--r-- | dashboard/config/linux/upstream-kcsan-base.config | 4 | ||||
| -rw-r--r-- | dashboard/config/linux/upstream-kcsan.config | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/dashboard/config/linux/bits/kcsan.yml b/dashboard/config/linux/bits/kcsan.yml index fbe00495f..cd036d1ab 100644 --- a/dashboard/config/linux/bits/kcsan.yml +++ b/dashboard/config/linux/bits/kcsan.yml @@ -14,4 +14,5 @@ config: - KCSAN_SKIP_WATCH_RANDOMIZE - KCSAN_REPORT_RACE_UNKNOWN_ORIGIN: n - KCSAN_REPORT_VALUE_CHANGE_ONLY + - KCSAN_ASSUME_PLAIN_WRITES_ATOMIC - KCSAN_IGNORE_ATOMICS diff --git a/dashboard/config/linux/upstream-kcsan-base.config b/dashboard/config/linux/upstream-kcsan-base.config index dda0ad52c..433122198 100644 --- a/dashboard/config/linux/upstream-kcsan-base.config +++ b/dashboard/config/linux/upstream-kcsan-base.config @@ -7,7 +7,7 @@ # CONFIG_CC_VERSION_TEXT="clang version 11.0.0 (https://github.com/llvm/llvm-project.git ca2dcbd030eadbf0aa9b660efe864ff08af6e18b)" CONFIG_GCC_VERSION=0 -CONFIG_LD_VERSION=235000000 +CONFIG_LD_VERSION=235010000 CONFIG_CC_IS_CLANG=y CONFIG_CLANG_VERSION=110000 CONFIG_CC_CAN_LINK=y @@ -4715,7 +4715,7 @@ CONFIG_KCSAN_SKIP_WATCH_RANDOMIZE=y CONFIG_KCSAN_REPORT_ONCE_IN_MS=3000 # CONFIG_KCSAN_REPORT_RACE_UNKNOWN_ORIGIN is not set CONFIG_KCSAN_REPORT_VALUE_CHANGE_ONLY=y -# CONFIG_KCSAN_ASSUME_PLAIN_WRITES_ATOMIC is not set +CONFIG_KCSAN_ASSUME_PLAIN_WRITES_ATOMIC=y CONFIG_KCSAN_IGNORE_ATOMICS=y # end of Generic Kernel Debugging Instruments diff --git a/dashboard/config/linux/upstream-kcsan.config b/dashboard/config/linux/upstream-kcsan.config index a320ba33f..43d577144 100644 --- a/dashboard/config/linux/upstream-kcsan.config +++ b/dashboard/config/linux/upstream-kcsan.config @@ -7,7 +7,7 @@ # CONFIG_CC_VERSION_TEXT="clang version 11.0.0 (https://github.com/llvm/llvm-project.git ca2dcbd030eadbf0aa9b660efe864ff08af6e18b)" CONFIG_GCC_VERSION=0 -CONFIG_LD_VERSION=235000000 +CONFIG_LD_VERSION=235010000 CONFIG_CC_IS_CLANG=y CONFIG_CLANG_VERSION=110000 CONFIG_CC_CAN_LINK=y @@ -8332,7 +8332,7 @@ CONFIG_KCSAN_SKIP_WATCH_RANDOMIZE=y CONFIG_KCSAN_REPORT_ONCE_IN_MS=3000 # CONFIG_KCSAN_REPORT_RACE_UNKNOWN_ORIGIN is not set CONFIG_KCSAN_REPORT_VALUE_CHANGE_ONLY=y -# CONFIG_KCSAN_ASSUME_PLAIN_WRITES_ATOMIC is not set +CONFIG_KCSAN_ASSUME_PLAIN_WRITES_ATOMIC=y CONFIG_KCSAN_IGNORE_ATOMICS=y # end of Generic Kernel Debugging Instruments |