aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2020-03-30 10:53:59 +0200
committerDmitry Vyukov <dvyukov@google.com>2020-03-30 10:55:36 +0200
commitc8d1cc20df5ca5d9ea437054720fa3cfdfa1f578 (patch)
tree34e5382b7296b683db1d672ba9f7ccee13281098
parent05736b290dd5af17adbb0fb5ea67405a0167a7c8 (diff)
tools/create-gce-image.sh: enable sysctl.kernel.hung_task_all_cpu_backtrace=1
The format of this knob has changed again: https://groups.google.com/d/msg/syzkaller/EJP7uvY4O-c/XLrhrBqGAQAJ
-rw-r--r--dashboard/config/upstream-apparmor.cmdline1
-rw-r--r--dashboard/config/upstream-selinux.cmdline1
-rw-r--r--dashboard/config/upstream-smack.cmdline1
-rw-r--r--pkg/build/linux_generated.go1
-rwxr-xr-xtools/create-gce-image.sh1
5 files changed, 2 insertions, 3 deletions
diff --git a/dashboard/config/upstream-apparmor.cmdline b/dashboard/config/upstream-apparmor.cmdline
index b7355cd0d..dc446e318 100644
--- a/dashboard/config/upstream-apparmor.cmdline
+++ b/dashboard/config/upstream-apparmor.cmdline
@@ -17,4 +17,3 @@ numa=fake=2
nopcid
dummy_hcd.num=8
binder.debug_mask=0
-hung_task_all_cpu_backtrace=1
diff --git a/dashboard/config/upstream-selinux.cmdline b/dashboard/config/upstream-selinux.cmdline
index c957a6795..e307c805f 100644
--- a/dashboard/config/upstream-selinux.cmdline
+++ b/dashboard/config/upstream-selinux.cmdline
@@ -17,4 +17,3 @@ numa=fake=2
nopcid
dummy_hcd.num=8
binder.debug_mask=0
-hung_task_all_cpu_backtrace=1
diff --git a/dashboard/config/upstream-smack.cmdline b/dashboard/config/upstream-smack.cmdline
index bad5c1fa8..92b809152 100644
--- a/dashboard/config/upstream-smack.cmdline
+++ b/dashboard/config/upstream-smack.cmdline
@@ -17,4 +17,3 @@ numa=fake=2
nopcid
dummy_hcd.num=8
binder.debug_mask=0
-hung_task_all_cpu_backtrace=1
diff --git a/pkg/build/linux_generated.go b/pkg/build/linux_generated.go
index 290f0cd66..382b502c8 100644
--- a/pkg/build/linux_generated.go
+++ b/pkg/build/linux_generated.go
@@ -98,6 +98,7 @@ done
echo "kernel.printk = 7 4 1 3" | sudo tee -a disk.mnt/etc/sysctl.conf
echo "debug.exception-trace = 0" | sudo tee -a disk.mnt/etc/sysctl.conf
+echo "sysctl.kernel.hung_task_all_cpu_backtrace = 1" | sudo tee -a disk.mnt/etc/sysctl.conf
SYZ_SYSCTL_FILE="${SYZ_SYSCTL_FILE:-}"
if [ "$SYZ_SYSCTL_FILE" != "" ]; then
cat $SYZ_SYSCTL_FILE | sudo tee -a disk.mnt/etc/sysctl.conf
diff --git a/tools/create-gce-image.sh b/tools/create-gce-image.sh
index 6e53b54ea..1b408f0c2 100755
--- a/tools/create-gce-image.sh
+++ b/tools/create-gce-image.sh
@@ -148,6 +148,7 @@ done
# sysctls
echo "kernel.printk = 7 4 1 3" | sudo tee -a disk.mnt/etc/sysctl.conf
echo "debug.exception-trace = 0" | sudo tee -a disk.mnt/etc/sysctl.conf
+echo "sysctl.kernel.hung_task_all_cpu_backtrace = 1" | sudo tee -a disk.mnt/etc/sysctl.conf
SYZ_SYSCTL_FILE="${SYZ_SYSCTL_FILE:-}"
if [ "$SYZ_SYSCTL_FILE" != "" ]; then
cat $SYZ_SYSCTL_FILE | sudo tee -a disk.mnt/etc/sysctl.conf