gh/vmtests: actually panic on RCU stalls

This reverts commit dd396c6, which was setting /proc/sys/kernel/panic_on_rcu_stall on the host system rather than the VM and was thus innefective. Instead, add an entry to /etc/sysctl.d/local.conf that properly sets this inside the VM. Signed-off-by: Kornilios Kourtis <[email protected]>
cilium · Aug 12, 2022 · fa862fd · fa862fd
1 parent 9361eb3
commit fa862fd
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 10 deletions.
diff --git a/.github/workflows/vmtests.yml b/.github/workflows/vmtests.yml
@@ -92,10 +92,6 @@ jobs:
       run: |
         sudo chmod go+rX -R /boot/
 
-    - name: set panic on RCU stall
-      run: |
-        sudo sh -c 'echo 1 > /proc/sys/kernel/panic_on_rcu_stall'
-
     - name: download build data
       uses: actions/download-artifact@v3
       with:

diff --git a/cmd/tetragon-vmtests-run/image.go b/cmd/tetragon-vmtests-run/image.go
@@ -166,6 +166,10 @@ func buildTestImage(log *logrus.Logger, rcnf *RunConf) error {
 		{Op: &images.SetHostnameCommand{Hostname: hostname}},
 		// NB: some of the tetragon tests expect a /usr/bin/cp
 		{Op: &images.RunCommand{Cmd: "cp /bin/cp /usr/bin/cp"}},
+		{Op: &images.AppendLineCommand{
+			File: "/etc/sysctl.d/local.conf",
+			Line: "kernel.panic_on_rcu_stall=1",
+		}},
 	}
 	actions = append(actions, fsActions...)
 	actions = append(actions, testerActions...)

diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/cilium/cilium-e2e v0.0.0-00010101000000-000000000000
 	github.com/cilium/ebpf v0.9.0
 	github.com/cilium/hubble v0.5.3-0.20220311154618-3e44df066567
-	github.com/cilium/little-vm-helper v0.0.0-20220729082344-f2ca5b097f67
+	github.com/cilium/little-vm-helper v0.0.0-20220812055014-101c3e342e13
 	github.com/cilium/lumberjack/v2 v2.2.2
 	github.com/cilium/tetragon/api v0.0.0-00010101000000-000000000000
 	github.com/cilium/tetragon/pkg/k8s v0.0.0-00010101000000-000000000000

diff --git a/go.sum b/go.sum
@@ -183,8 +183,8 @@ github.com/cilium/hubble v0.5.3-0.20220311154618-3e44df066567/go.mod h1:Y522N+Ka
 github.com/cilium/ipam v0.0.0-20200217195329-a46f8d55f9db/go.mod h1:URWgSDyRFKKBgnY4Svj37siCG145nu3qJt6oHlZRdqU=
 github.com/cilium/ipam v0.0.0-20201020084809-76717fcdb3a2/go.mod h1:Ascfar4FtgB+K+mwqbZpSb3WVZ5sPFIarg+iAOXNZqI=
 github.com/cilium/kafka v0.0.0-20180809090225-01ce283b732b/go.mod h1:ktgizta3CPZBKz5uW272SJyjiro0vn4nOVP7Pk4RopA=
-github.com/cilium/little-vm-helper v0.0.0-20220729082344-f2ca5b097f67 h1:gVu/1IyhT3t8fDGYVeDFJG3FCknd0lOFHmU6gkgHtlo=
-github.com/cilium/little-vm-helper v0.0.0-20220729082344-f2ca5b097f67/go.mod h1:Ya+Z4TOpZlsTtFZg3teKp9lzNd/BTgC4MlRN4drM328=
+github.com/cilium/little-vm-helper v0.0.0-20220812055014-101c3e342e13 h1:R1X8fZxqDnOZqDEWIcWR3t5utglPk2cWzS8VPBf1PFE=
+github.com/cilium/little-vm-helper v0.0.0-20220812055014-101c3e342e13/go.mod h1:Ya+Z4TOpZlsTtFZg3teKp9lzNd/BTgC4MlRN4drM328=
 github.com/cilium/lumberjack/v2 v2.2.2 h1:RKTdhb63DY0Xu7pE1pipMj7Zq28LyvBGSrCneHiKm4A=
 github.com/cilium/lumberjack/v2 v2.2.2/go.mod h1:yfbtPGmg4i//5oEqzaMxDqSWqgfZFmMoV70Mc2k6v0A=
 github.com/cilium/proxy v0.0.0-20191113190709-4c7b379792e6/go.mod h1:lbRnBzpxwMP5KsTu99cM654ShwTWamyhrF6cCLuYqhE=

diff --git a/vendor/github.com/cilium/little-vm-helper/pkg/images/actions.go b/vendor/github.com/cilium/little-vm-helper/pkg/images/actions.go
diff --git a/vendor/github.com/cilium/little-vm-helper/pkg/images/conf.go b/vendor/github.com/cilium/little-vm-helper/pkg/images/conf.go
diff --git a/vendor/github.com/cilium/little-vm-helper/pkg/images/step_create_image.go b/vendor/github.com/cilium/little-vm-helper/pkg/images/step_create_image.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -74,7 +74,7 @@ github.com/cilium/hubble/pkg/k8s
 github.com/cilium/hubble/pkg/parser/endpoint
 github.com/cilium/hubble/pkg/parser/getters
 github.com/cilium/hubble/pkg/servicecache
-# github.com/cilium/little-vm-helper v0.0.0-20220729082344-f2ca5b097f67
+# github.com/cilium/little-vm-helper v0.0.0-20220812055014-101c3e342e13
 ## explicit; go 1.18
 github.com/cilium/little-vm-helper/pkg/images
 github.com/cilium/little-vm-helper/pkg/logcmd