From acb1ba7170ce2a5c91ccaa197eb9e1c450e0d73a Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Mon, 7 Aug 2023 17:13:24 +0200 Subject: pkg/vcs: don't supress rcu stall reports twice First check if the cmdline config is already present. --- pkg/vcs/linux_configs_test.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'pkg/vcs/linux_configs_test.go') diff --git a/pkg/vcs/linux_configs_test.go b/pkg/vcs/linux_configs_test.go index 378714174..80be75db7 100644 --- a/pkg/vcs/linux_configs_test.go +++ b/pkg/vcs/linux_configs_test.go @@ -83,6 +83,24 @@ CONFIG_PROVE_LOCKING=y } } +// Ensure we don't add "rcupdate.rcu_cpu_stall_suppress=1" twice. +func TestNoDoubleRcuSuppress(t *testing.T) { + const base = ` +CONFIG_CMDLINE="param1=a rcupdate.rcu_cpu_stall_suppress=1 param2=b" +CONFIG_BUG=y +CONFIG_KASAN=y +` + conf, err := kconfig.ParseConfigData([]byte(base), "base") + if err != nil { + t.Fatal(err) + } + setLinuxSanitizerConfigs(conf, []crash.Type{crash.Warning}, &debugtracer.NullTracer{}) + assert.Equal(t, + `"param1=a rcupdate.rcu_cpu_stall_suppress=1 param2=b"`, + conf.Value("CMDLINE"), + ) +} + func assertConfigs(t *testing.T, cf *kconfig.ConfigFile, names ...string) { var setConfigs []string for _, name := range names { -- cgit mrf-deployment