aboutsummaryrefslogtreecommitdiffstats
path: root/dashboard/config/linux/bits
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2021-03-03 18:30:25 +0100
committerDmitry Vyukov <dvyukov@google.com>2021-03-03 21:00:00 +0100
commit8ccc3ea6ba077cf2c1e5672bf7ddd21a4aaf5cdd (patch)
treea06d1f9ad34d7ca01a7660cf83286b15a5097051 /dashboard/config/linux/bits
parent06ed56cd22e24a55c40d152880b66b108834c8f2 (diff)
dashboard/config/linux: remove panic_on_warn from kcsan/kmsan
These instances ignore WARNINGs, so they don't want panic_on_warn.
Diffstat (limited to 'dashboard/config/linux/bits')
-rw-r--r--dashboard/config/linux/bits/base.yml2
-rw-r--r--dashboard/config/linux/bits/debug.yml3
-rw-r--r--dashboard/config/linux/bits/s390.yml1
3 files changed, 4 insertions, 2 deletions
diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml
index c955c1589..0f71e6b82 100644
--- a/dashboard/config/linux/bits/base.yml
+++ b/dashboard/config/linux/bits/base.yml
@@ -19,7 +19,7 @@ config:
- DEBUG_KERNEL
# panic=86400: prevents kernel from rebooting so that we don't get reboot output in all crash reports.
- - CMDLINE: "earlyprintk=serial oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 ima_policy=tcb kvm-intel.nested=1 nf-conntrack-ftp.ports=20000 nf-conntrack-tftp.ports=20000 nf-conntrack-sip.ports=20000 nf-conntrack-irc.ports=20000 nf-conntrack-sane.ports=20000 vivid.n_devs=16 vivid.multiplanar=1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2 netrom.nr_ndevs=16 rose.rose_ndevs=16 spec_store_bypass_disable=prctl numa=fake=2 nopcid dummy_hcd.num=8 binder.debug_mask=0 rcupdate.rcu_expedited=1"
+ - CMDLINE: "earlyprintk=serial oops=panic nmi_watchdog=panic panic=86400 net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 ima_policy=tcb kvm-intel.nested=1 nf-conntrack-ftp.ports=20000 nf-conntrack-tftp.ports=20000 nf-conntrack-sip.ports=20000 nf-conntrack-irc.ports=20000 nf-conntrack-sane.ports=20000 vivid.n_devs=16 vivid.multiplanar=1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2 netrom.nr_ndevs=16 rose.rose_ndevs=16 spec_store_bypass_disable=prctl numa=fake=2 nopcid dummy_hcd.num=8 binder.debug_mask=0 rcupdate.rcu_expedited=1"
# This config can be used to enable any additional temporal debugging features in linux-next tree.
- DEBUG_AID_FOR_SYZBOT: [linux-next]
diff --git a/dashboard/config/linux/bits/debug.yml b/dashboard/config/linux/bits/debug.yml
index 8b4fdedee..bc2cb5759 100644
--- a/dashboard/config/linux/bits/debug.yml
+++ b/dashboard/config/linux/bits/debug.yml
@@ -4,6 +4,9 @@
# Auxiliary debug configs that detect non-critical bugs.
config:
+ # Instances that use nonoise also ignore WARNINGs, so they don't want panic_on_warn.
+ - CMDLINE: [append, "panic_on_warn=1"]
+
- LOCKDEP
- PROVE_LOCKING
- DEBUG_ATOMIC_SLEEP
diff --git a/dashboard/config/linux/bits/s390.yml b/dashboard/config/linux/bits/s390.yml
index 378072e7f..a1f62842f 100644
--- a/dashboard/config/linux/bits/s390.yml
+++ b/dashboard/config/linux/bits/s390.yml
@@ -10,4 +10,3 @@ config:
- CMDLINE: [n, override]
# See the comment in x86_64.yml re these numbers.
- RCU_CPU_STALL_TIMEOUT: 300
- - DEFAULT_HUNG_TASK_TIMEOUT: 420