diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2023-07-10 12:19:47 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2023-07-10 10:27:55 +0000 |
| commit | d47e94ee5842166fa9b91e7affdeaa8dc4cfcd39 (patch) | |
| tree | d1173529448fff52390170f758a5b2bef1ecd6fc /pkg/vcs | |
| parent | 45bc0ee6d2f16952a18e421ace35ef96e251bd1d (diff) | |
pkg/vcs: properly disable lockdep
We also need to disable CONFIG_PROVE_LOCKING, which forces
CONFIG_LOCKDEP to be enabled.
Diffstat (limited to 'pkg/vcs')
| -rw-r--r-- | pkg/vcs/linux_configs.go | 13 | ||||
| -rw-r--r-- | pkg/vcs/linux_configs_test.go | 3 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkg/vcs/linux_configs.go b/pkg/vcs/linux_configs.go index c17e3aeca..3d75bc509 100644 --- a/pkg/vcs/linux_configs.go +++ b/pkg/vcs/linux_configs.go @@ -114,11 +114,14 @@ func setLinuxSanitizerConfigs(cf *kconfig.ConfigFile, types []crash.Type, dt deb val[:pos]+" rcupdate.rcu_cpu_stall_suppress=1"+val[pos:]) } }, - crash.MemoryLeak: func() { cf.Unset("DEBUG_KMEMLEAK") }, - crash.UBSAN: func() { cf.Unset("UBSAN") }, - crash.Bug: func() { cf.Unset("BUG") }, - crash.KASAN: func() { cf.Unset("KASAN") }, - crash.LockdepBug: func() { cf.Unset("LOCKDEP") }, + crash.MemoryLeak: func() { cf.Unset("DEBUG_KMEMLEAK") }, + crash.UBSAN: func() { cf.Unset("UBSAN") }, + crash.Bug: func() { cf.Unset("BUG") }, + crash.KASAN: func() { cf.Unset("KASAN") }, + crash.LockdepBug: func() { + cf.Unset("LOCKDEP") + cf.Unset("PROVE_LOCKING") // it selects LOCKDEP + }, crash.AtomicSleep: func() { cf.Unset("DEBUG_ATOMIC_SLEEP") }, } need := map[crash.Type]bool{} diff --git a/pkg/vcs/linux_configs_test.go b/pkg/vcs/linux_configs_test.go index 6ea95645f..378714174 100644 --- a/pkg/vcs/linux_configs_test.go +++ b/pkg/vcs/linux_configs_test.go @@ -47,7 +47,7 @@ func TestDropLinuxSanitizerConfigs(t *testing.T) { name: "lockdep", types: []crash.Type{crash.LockdepBug}, test: func(t *testing.T, cf *kconfig.ConfigFile) { - assertConfigs(t, cf, "LOCKDEP") + assertConfigs(t, cf, "LOCKDEP", "PROVE_LOCKING") }, }, { @@ -68,6 +68,7 @@ CONFIG_LOCKDEP=y CONFIG_RCU_STALL_COMMON=y CONFIG_UBSAN=y CONFIG_DEBUG_ATOMIC_SLEEP=y +CONFIG_PROVE_LOCKING=y ` for _, test := range tests { test := test |