[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250422165446.work.015-kees@kernel.org>
Date: Tue, 22 Apr 2025 09:54:50 -0700
From: Kees Cook <kees@...nel.org>
To: "Matthieu Baerts (NGI0)" <matttbe@...nel.org>
Cc: Kees Cook <kees@...nel.org>,
Jakub Kicinski <kuba@...nel.org>,
Masahiro Yamada <masahiroy@...nel.org>,
Simon Horman <horms@...nel.org>,
Anshuman Khandual <anshuman.khandual@....com>,
Stanislav Fomichev <sdf@...ichev.me>,
Lukas Bulwahn <lukas.bulwahn@...il.com>,
Borislav Petkov <bp@...e.de>,
Nicolas Schier <nicolas.schier@...ux.dev>,
Michael Ellerman <mpe@...erman.id.au>,
Andrew Morton <akpm@...ux-foundation.org>,
"Joel Fernandes (Google)" <joel@...lfernandes.org>,
linux-kernel@...r.kernel.org,
linux-hardening@...r.kernel.org
Subject: [PATCH] configs/debug: Refresh debug config dependencies
Many of the CONFIG_DEBUG* options need CONFIG_DEBUG_KERNEL=y to be set,
so enable it explicitly. Similarly for CONFIG_NET* options, enable
CONFIG_NET=y. Finally, remove CONFIG_DEBUG_VM_VMACACHE, since it was
removed in commit 7964cf8caa4d ("mm: remove vmacache").
Signed-off-by: Kees Cook <kees@...nel.org>
---
Cc: "Matthieu Baerts (NGI0)" <matttbe@...nel.org>
Cc: Jakub Kicinski <kuba@...nel.org>
Cc: Masahiro Yamada <masahiroy@...nel.org>
Cc: Simon Horman <horms@...nel.org>
Cc: Anshuman Khandual <anshuman.khandual@....com>
Cc: Stanislav Fomichev <sdf@...ichev.me>
Cc: Lukas Bulwahn <lukas.bulwahn@...il.com>
Cc: Borislav Petkov <bp@...e.de>
Cc: Nicolas Schier <nicolas.schier@...ux.dev>
Cc: Michael Ellerman <mpe@...erman.id.au>
---
kernel/configs/debug.config | 3 ++-
kernel/configs/x86_debug.config | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/configs/debug.config b/kernel/configs/debug.config
index e81327d2cd63..1a8724f29137 100644
--- a/kernel/configs/debug.config
+++ b/kernel/configs/debug.config
@@ -26,6 +26,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y
#
# Generic Kernel Debugging Instruments
#
+CONFIG_DEBUG_KERNEL=y
# CONFIG_UBSAN_ALIGNMENT is not set
# CONFIG_UBSAN_DIV_ZERO is not set
# CONFIG_UBSAN_TRAP is not set
@@ -42,6 +43,7 @@ CONFIG_UBSAN_UNREACHABLE=y
#
# Networking Debugging
#
+CONFIG_NET=y
CONFIG_NET_DEV_REFCNT_TRACKER=y
CONFIG_NET_NS_REFCNT_TRACKER=y
CONFIG_DEBUG_NET=y
@@ -72,7 +74,6 @@ CONFIG_DEBUG_VIRTUAL=y
CONFIG_DEBUG_VM=y
CONFIG_DEBUG_VM_PGFLAGS=y
CONFIG_DEBUG_VM_RB=y
-CONFIG_DEBUG_VM_VMACACHE=y
CONFIG_KASAN=y
CONFIG_KASAN_GENERIC=y
CONFIG_KASAN_INLINE=y
diff --git a/kernel/configs/x86_debug.config b/kernel/configs/x86_debug.config
index 35f48671b8d5..28d1c6ba3bf0 100644
--- a/kernel/configs/x86_debug.config
+++ b/kernel/configs/x86_debug.config
@@ -2,7 +2,6 @@
CONFIG_X86_DEBUG_FPU=y
CONFIG_LOCK_STAT=y
CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_VM_VMACACHE=y
CONFIG_DEBUG_VM_RB=y
CONFIG_DEBUG_SLAB=y
CONFIG_DEBUG_KMEMLEAK=y
--
2.34.1
Powered by blists - more mailing lists