aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Elver <elver@google.com>2021-09-06 10:56:54 +0200
committerMarco Elver <me@marcoelver.com>2021-09-06 11:31:26 +0200
commit6ca601483d056968f63fd4735fc54073f4fe3c75 (patch)
tree3d4f2626f98aee98991f968052268ebfde882e2b
parentd236a457274375e5273ac4e958722659929c469f (diff)
dashboard/config: kcsan: select CONFIG_KCSAN_PERMISSIVE
The new CONFIG_KCSAN_PERMISSIVE is now supported in mainline: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=aa829778b16f15266fefe2640f04931b16ce39c0 Select it in the default syzbot config. The configs were updated manually, because we should wait until v5.15-rc1 is out (mainline is still in the merge window), at which point we can update upstream's commit hash for syz-kconf and regenerate all configs.
-rw-r--r--dashboard/config/linux/bits/kcsan.yml1
-rw-r--r--dashboard/config/linux/upstream-kcsan-base.config1
-rw-r--r--dashboard/config/linux/upstream-kcsan.config1
3 files changed, 3 insertions, 0 deletions
diff --git a/dashboard/config/linux/bits/kcsan.yml b/dashboard/config/linux/bits/kcsan.yml
index cd036d1ab..c0d880783 100644
--- a/dashboard/config/linux/bits/kcsan.yml
+++ b/dashboard/config/linux/bits/kcsan.yml
@@ -16,3 +16,4 @@ config:
- KCSAN_REPORT_VALUE_CHANGE_ONLY
- KCSAN_ASSUME_PLAIN_WRITES_ATOMIC
- KCSAN_IGNORE_ATOMICS
+ - KCSAN_PERMISSIVE: [v5.14] # TODO: change to 5.15 once released
diff --git a/dashboard/config/linux/upstream-kcsan-base.config b/dashboard/config/linux/upstream-kcsan-base.config
index 11757d27a..449fcaa77 100644
--- a/dashboard/config/linux/upstream-kcsan-base.config
+++ b/dashboard/config/linux/upstream-kcsan-base.config
@@ -4921,6 +4921,7 @@ CONFIG_KCSAN_REPORT_ONCE_IN_MS=3000
CONFIG_KCSAN_REPORT_VALUE_CHANGE_ONLY=y
CONFIG_KCSAN_ASSUME_PLAIN_WRITES_ATOMIC=y
CONFIG_KCSAN_IGNORE_ATOMICS=y
+CONFIG_KCSAN_PERMISSIVE=y
# end of Generic Kernel Debugging Instruments
CONFIG_DEBUG_KERNEL=y
diff --git a/dashboard/config/linux/upstream-kcsan.config b/dashboard/config/linux/upstream-kcsan.config
index ef88142ea..1e73b0c19 100644
--- a/dashboard/config/linux/upstream-kcsan.config
+++ b/dashboard/config/linux/upstream-kcsan.config
@@ -4881,6 +4881,7 @@ CONFIG_KCSAN_REPORT_ONCE_IN_MS=3000
CONFIG_KCSAN_REPORT_VALUE_CHANGE_ONLY=y
CONFIG_KCSAN_ASSUME_PLAIN_WRITES_ATOMIC=y
CONFIG_KCSAN_IGNORE_ATOMICS=y
+CONFIG_KCSAN_PERMISSIVE=y
# end of Generic Kernel Debugging Instruments
CONFIG_DEBUG_KERNEL=y