Skip to contentSkip to conversation

x86/configs: update configs in x86_debug.config

PATCH Applied Lukas Bulwahn 3 participants 4 messages Jul 22, 2022 – Jul 28, 2022 Kernel janitors

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/configs: update configs in x86_debug.config

Commit 4675ff05de2d ("kmemcheck: rip it out") removes kmemcheck and its corresponding build config KMEMCHECK.

Commit 0f620cefd775 ("objtool: Rename "VMLINUX_VALIDATION" -> "NOINSTR_VALIDATION"") renamed the debug config option.

Adjust x86_debug.config to those changes in debug configs.

---
 kernel/configs/x86_debug.config | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/configs/x86_debug.config +1 -2
index dcd86f32f4ed..6fac5b405334 100644
@@ -7,12 +7,11 @@ CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_KMEMLEAK=y
 CONFIG_DEBUG_PAGEALLOC=y
 CONFIG_SLUB_DEBUG_ON=y
-CONFIG_KMEMCHECK=y
 CONFIG_DEBUG_OBJECTS=y
 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 CONFIG_GCOV_KERNEL=y
 CONFIG_LOCKDEP=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_SCHEDSTATS=y
-CONFIG_VMLINUX_VALIDATION=y
+CONFIG_NOINSTR_VALIDATION=y
 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
Signature · 1 line
2.17.1
#1 lore raw
Quoted 18 lines · Lukas Bulwahn

Commit 4675ff05de2d ("kmemcheck: rip it out") removes kmemcheck and its corresponding build config KMEMCHECK.

Commit 0f620cefd775 ("objtool: Rename "VMLINUX_VALIDATION" -> "NOINSTR_VALIDATION"") renamed the debug config option.

Adjust x86_debug.config to those changes in debug configs.

---
 kernel/configs/x86_debug.config | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/configs/x86_debug.config +0 -0
index dcd86f32f4ed..6fac5b405334 100644

kernel/configs/x86_debug.config CONFIG_DEBUG_SLAB=y · line 10

Quoted 4 lines
kernel/configs/x86_debug.config +0 -1
@@ -7,12 +7,11 @@ CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_KMEMLEAK=y
 CONFIG_DEBUG_PAGEALLOC=y
 CONFIG_SLUB_DEBUG_ON=y
-CONFIG_KMEMCHECK=y

While at it, you might also whack the last mention of KMEMCHECK:

$ git grep KMEMCHECK
kernel/configs/x86_debug.config:10:CONFIG_KMEMCHECK=y
tools/testing/selftests/wireguard/qemu/debug.config:21:CONFIG_HAVE_ARCH_KMEMCHECK=y

Thx.

Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
#2 lore raw
Quoted 27 lines · Borislav Petkov
Quoted 18 lines · Lukas Bulwahn

Commit 4675ff05de2d ("kmemcheck: rip it out") removes kmemcheck and its corresponding build config KMEMCHECK.

Commit 0f620cefd775 ("objtool: Rename "VMLINUX_VALIDATION" -> "NOINSTR_VALIDATION"") renamed the debug config option.

Adjust x86_debug.config to those changes in debug configs.

---
 kernel/configs/x86_debug.config | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/configs/x86_debug.config +0 -0
index dcd86f32f4ed..6fac5b405334 100644

kernel/configs/x86_debug.config CONFIG_DEBUG_SLAB=y · line 10

Quoted 4 lines
kernel/configs/x86_debug.config +0 -1
@@ -7,12 +7,11 @@ CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_KMEMLEAK=y
 CONFIG_DEBUG_PAGEALLOC=y
 CONFIG_SLUB_DEBUG_ON=y
-CONFIG_KMEMCHECK=y

While at it, you might also whack the last mention of KMEMCHECK:

Quoted 4 lines
$ git grep KMEMCHECK
kernel/configs/x86_debug.config:10:CONFIG_KMEMCHECK=y
tools/testing/selftests/wireguard/qemu/debug.config:21:CONFIG_HAVE_ARCH_KMEMCHECK=y

Boris, I did so and sent out a patch for wireguard selftests:

https://lore.kernel.org/all/[email protected]/

I hope you can pick this patch for the x86 config.

Thanks for the pointer.

Lukas

merge bot Applied
#3 lore raw

[tip: x86/urgent] x86/configs: Update configs in x86_debug.config

In reply to Lukas Bulwahn
The following commit has been merged into the x86/urgent branch of tip:

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     871808fd6981bcc6bb48f71032f983ca77748e96
Gitweb:        https://git.kernel.org/tip/871808fd6981bcc6bb48f71032f983ca77748e96
Author:        Lukas Bulwahn <[email protected]>
AuthorDate:    Fri, 22 Jul 2022 14:18:15 +02:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Wed, 27 Jul 2022 18:09:11 +02:00

x86/configs: Update configs in x86_debug.config

Commit

4675ff05de2d ("kmemcheck: rip it out")

removed kmemcheck and its corresponding build config KMEMCHECK.

Commit

0f620cefd775 ("objtool: Rename "VMLINUX_VALIDATION" -> "NOINSTR_VALIDATION"")

renamed the debug config option.

Adjust x86_debug.config to those changes in debug configs.

---
 kernel/configs/x86_debug.config | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/configs/x86_debug.config +1 -2
index dcd86f3..6fac5b4 100644
@@ -7,12 +7,11 @@ CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_KMEMLEAK=y
 CONFIG_DEBUG_PAGEALLOC=y
 CONFIG_SLUB_DEBUG_ON=y
-CONFIG_KMEMCHECK=y
 CONFIG_DEBUG_OBJECTS=y
 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 CONFIG_GCOV_KERNEL=y
 CONFIG_LOCKDEP=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_SCHEDSTATS=y
-CONFIG_VMLINUX_VALIDATION=y
+CONFIG_NOINSTR_VALIDATION=y
 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y