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.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkg/vcs/linux_configs.go') diff --git a/pkg/vcs/linux_configs.go b/pkg/vcs/linux_configs.go index 3d75bc509..8d972edd3 100644 --- a/pkg/vcs/linux_configs.go +++ b/pkg/vcs/linux_configs.go @@ -107,11 +107,11 @@ func setLinuxSanitizerConfigs(cf *kconfig.ConfigFile, types []crash.Type, dt deb cf.Unset("HARDLOCKUP_DETECTOR") cf.Unset("DETECT_HUNG_TASK") // It looks like it's the only reliable way to completely disable hung errors. - val := cf.Value("CMDLINE") - pos := strings.LastIndexByte(val, '"') - if pos >= 0 { - cf.Set("CMDLINE", - val[:pos]+" rcupdate.rcu_cpu_stall_suppress=1"+val[pos:]) + cmdline := cf.Value("CMDLINE") + pos := strings.LastIndexByte(cmdline, '"') + const rcuStallSuppress = "rcupdate.rcu_cpu_stall_suppress=1" + if pos >= 0 && !strings.Contains(cmdline, rcuStallSuppress) { + cf.Set("CMDLINE", cmdline[:pos]+" "+rcuStallSuppress+cmdline[pos:]) } }, crash.MemoryLeak: func() { cf.Unset("DEBUG_KMEMLEAK") }, -- cgit mrf-deployment