aboutsummaryrefslogtreecommitdiffstats
path: root/dashboard/config/linux/upstream-usb-base.config
diff options
context:
space:
mode:
authorAleksandr Nogikh <nogikh@google.com>2022-02-23 17:40:44 +0000
committerAleksandr Nogikh <wp32pw@gmail.com>2022-02-24 19:13:59 +0100
commit7c33726645532432752ae4074ccaad36638db7b1 (patch)
treee71b987105b981e15c67a7f9ce53a7327f382ceb /dashboard/config/linux/upstream-usb-base.config
parentb28851a42332f6c5bc36155d3737ca9c89c4d2d3 (diff)
dashboard/config: update configs to next-20220222
Move CONFIG_AID_FOR_SYZBOT to verbatim since it has for some reason disappeared from the linux-next tree. Add CONFIG_RCU_EXP_CPU_STALL_TIMEOUT and set it to the maximum value. Otherwise it overwhelms syzbot with `INFO: rcu_preempt detected expedited stalls on CPUs/tasks` crashes.
Diffstat (limited to 'dashboard/config/linux/upstream-usb-base.config')
-rw-r--r--dashboard/config/linux/upstream-usb-base.config4
1 files changed, 3 insertions, 1 deletions
diff --git a/dashboard/config/linux/upstream-usb-base.config b/dashboard/config/linux/upstream-usb-base.config
index 57493762f..45e8ac1d8 100644
--- a/dashboard/config/linux/upstream-usb-base.config
+++ b/dashboard/config/linux/upstream-usb-base.config
@@ -470,7 +470,7 @@ CONFIG_LEGACY_VSYSCALL_EMULATE=y
# CONFIG_LEGACY_VSYSCALL_XONLY is not set
# CONFIG_LEGACY_VSYSCALL_NONE is not set
CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="earlyprintk=serial net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 ima_policy=tcb 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 binder.debug_mask=0 rcupdate.rcu_expedited=1 no_hash_pointers page_owner=on sysctl.vm.nr_hugepages=4 sysctl.vm.nr_overcommit_hugepages=4 secretmem.enable=1 root=/dev/sda console=ttyS0 vsyscall=native numa=fake=2 kvm-intel.nested=1 spec_store_bypass_disable=prctl nopcid 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 dummy_hcd.num=8 watchdog_thresh=55 workqueue.watchdog_thresh=140 sysctl.net.core.netdev_unregister_timeout_secs=140 panic_on_warn=1"
+CONFIG_CMDLINE="earlyprintk=serial net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 ima_policy=tcb 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 binder.debug_mask=0 rcupdate.rcu_expedited=1 no_hash_pointers page_owner=on sysctl.vm.nr_hugepages=4 sysctl.vm.nr_overcommit_hugepages=4 secretmem.enable=1 sysctl.max_rcu_stall_to_panic=1 root=/dev/sda console=ttyS0 vsyscall=native numa=fake=2 kvm-intel.nested=1 spec_store_bypass_disable=prctl nopcid 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 dummy_hcd.num=8 watchdog_thresh=55 workqueue.watchdog_thresh=140 sysctl.net.core.netdev_unregister_timeout_secs=140 panic_on_warn=1"
# CONFIG_CMDLINE_OVERRIDE is not set
CONFIG_MODIFY_LDT_SYSCALL=y
# CONFIG_STRICT_SIGALTSTACK_SIZE is not set
@@ -5323,3 +5323,5 @@ CONFIG_ARCH_USE_MEMTEST=y
CONFIG_DEBUG_MEMORY=y
CONFIG_TWIST_KERNEL_BEHAVIOR=y
CONFIG_TWIST_FOR_SYZKALLER_TESTING=y
+CONFIG_DEBUG_AID_FOR_SYZBOT=y
+CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=21000