Skip to contentSkip to conversation

init: Do not select DEBUG_KERNEL by default

PATCH In review Sinan Kaya 3 participants 10 messages Apr 13, 2019 – Apr 23, 2019

Subsystems (7)
lore
Share & tools
lore

Sinan Kaya

author
#0 lore raw

v5 cover init: Do not select DEBUG_KERNEL by default

CONFIG_DEBUG_KERNEL has been designed to just enable Kconfig options. Kernel code generatoin should not depend on CONFIG_DEBUG_KERNEL.

Proposed alternative plan: let's add a new symbol, something like DEBUG_MISC ("Miscellaneous debug code that should be under a more specific debug option but isn't"), make it depend on DEBUG_KERNEL and be "default DEBUG_KERNEL" but allow itself to be turned off, and then mechanically change the small handful of "#ifdef CONFIG_DEBUG_KERNEL" to "#ifdef CONFIG_DEBUG_MISC".

Diff from v4:
- collect reviewed-by
- collect acked-by
- fix nit on 1/5

Sinan Kaya (5):
init: Introduce DEBUG_MISC option
powerpc: Replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC
mips: Replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC
xtensa: Replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC
net: Replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC

 arch/mips/kernel/setup.c           | 2 +-
 arch/powerpc/kernel/sysfs.c        | 8 ++++----
 arch/xtensa/include/asm/irqflags.h | 2 +-
 arch/xtensa/kernel/smp.c           | 2 +-
 lib/Kconfig.debug                  | 9 +++++++++
 net/netfilter/core.c               | 2 +-
 6 files changed, 17 insertions(+), 8 deletions(-)
Signature · 1 line
2.21.0
author
#1 lore raw

PATCH v5 1/5 init: Introduce DEBUG_MISC option

Introduce DEBUG_MISC ("Miscellaneous debug code that should be under a more specific debug option but isn't"), make it depend on DEBUG_KERNEL and be "default DEBUG_KERNEL" but allow itself to be turned off, and then mechanically change the small handful of "#ifdef CONFIG_DEBUG_KERNEL" to "#ifdef CONFIG_DEBUG_MISC".

---
 lib/Kconfig.debug | 9 +++++++++
 1 file changed, 9 insertions(+)
lib/Kconfig.debug +9 -0
index 0d9e81779e37..0103a092ce3d 100644
@@ -438,6 +438,15 @@ config DEBUG_KERNEL
 	  Say Y here if you are developing drivers or trying to debug and
 	  identify kernel problems.
 
+config DEBUG_MISC
+	bool "Miscellaneous debug code"
+	default DEBUG_KERNEL
+	depends on DEBUG_KERNEL
+	help
+	  Say Y here if you need to enable miscellaneous debug code that should
+	  be under a more specific debug option but isn't.
+
+
 menu "Memory Debugging"
 
 source "mm/Kconfig.debug"
Signature · 1 line
2.21.0
author
#2 lore raw

PATCH v5 2/5 powerpc: Replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC

In reply to Sinan Kaya

CONFIG_DEBUG_KERNEL should not impact code generation. Use the newly defined CONFIG_DEBUG_MISC instead to keep the current code.

---
 arch/powerpc/kernel/sysfs.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/kernel/sysfs.c +4 -4
index e8e93c2c7d03..7a1708875d27 100644
@@ -610,7 +610,7 @@ SYSFS_PMCSETUP(pa6t_pmc2, SPRN_PA6T_PMC2);
 SYSFS_PMCSETUP(pa6t_pmc3, SPRN_PA6T_PMC3);
 SYSFS_PMCSETUP(pa6t_pmc4, SPRN_PA6T_PMC4);
 SYSFS_PMCSETUP(pa6t_pmc5, SPRN_PA6T_PMC5);
-#ifdef CONFIG_DEBUG_KERNEL
+#ifdef CONFIG_DEBUG_MISC
 SYSFS_SPRSETUP(hid0, SPRN_HID0);
 SYSFS_SPRSETUP(hid1, SPRN_HID1);
 SYSFS_SPRSETUP(hid4, SPRN_HID4);
@@ -639,7 +639,7 @@ SYSFS_SPRSETUP(tsr0, SPRN_PA6T_TSR0);
 SYSFS_SPRSETUP(tsr1, SPRN_PA6T_TSR1);
 SYSFS_SPRSETUP(tsr2, SPRN_PA6T_TSR2);
 SYSFS_SPRSETUP(tsr3, SPRN_PA6T_TSR3);
-#endif /* CONFIG_DEBUG_KERNEL */
+#endif /* CONFIG_DEBUG_MISC */
 #endif /* HAS_PPC_PMC_PA6T */
 
 #ifdef HAS_PPC_PMC_IBM
@@ -680,7 +680,7 @@ static struct device_attribute pa6t_attrs[] = {
 	__ATTR(pmc3, 0600, show_pa6t_pmc3, store_pa6t_pmc3),
 	__ATTR(pmc4, 0600, show_pa6t_pmc4, store_pa6t_pmc4),
 	__ATTR(pmc5, 0600, show_pa6t_pmc5, store_pa6t_pmc5),
-#ifdef CONFIG_DEBUG_KERNEL
+#ifdef CONFIG_DEBUG_MISC
 	__ATTR(hid0, 0600, show_hid0, store_hid0),
 	__ATTR(hid1, 0600, show_hid1, store_hid1),
 	__ATTR(hid4, 0600, show_hid4, store_hid4),
@@ -709,7 +709,7 @@ static struct device_attribute pa6t_attrs[] = {
 	__ATTR(tsr1, 0600, show_tsr1, store_tsr1),
 	__ATTR(tsr2, 0600, show_tsr2, store_tsr2),
 	__ATTR(tsr3, 0600, show_tsr3, store_tsr3),
-#endif /* CONFIG_DEBUG_KERNEL */
+#endif /* CONFIG_DEBUG_MISC */
 };
 #endif /* HAS_PPC_PMC_PA6T */
 #endif /* HAS_PPC_PMC_CLASSIC */
Signature · 1 line
2.21.0
author
#3 lore raw

PATCH v5 3/5 mips: Replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC

In reply to Sinan Kaya

CONFIG_DEBUG_KERNEL should not impact code generation. Use the newly defined CONFIG_DEBUG_MISC instead to keep the current code.

---
 arch/mips/kernel/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/setup.c +1 -1
index 8d1dc6c71173..9fc8fadb8418 100644
@@ -563,7 +563,7 @@ static void __init bootmem_init(void)
 		offset = __pa_symbol(_text) - __pa_symbol(VMLINUX_LOAD_ADDRESS);
 		memblock_free(__pa_symbol(VMLINUX_LOAD_ADDRESS), offset);
 
-#if defined(CONFIG_DEBUG_KERNEL) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_MISC) && defined(CONFIG_DEBUG_INFO)
 		/*
 		 * This information is necessary when debugging the kernel
 		 * But is a security vulnerability otherwise!
Signature · 1 line
2.21.0
author
#4 lore raw

PATCH v5 4/5 xtensa: Replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC

In reply to Sinan Kaya

CONFIG_DEBUG_KERNEL should not impact code generation. Use the newly defined CONFIG_DEBUG_MISC instead to keep the current code.

---
 arch/xtensa/include/asm/irqflags.h | 2 +-
 arch/xtensa/kernel/smp.c           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/xtensa/include/asm/irqflags.h +1 -1
index 9b5e8526afe5..12890681587b 100644
@@ -27,7 +27,7 @@ static inline unsigned long arch_local_irq_save(void)
 {
 	unsigned long flags;
 #if XTENSA_FAKE_NMI
-#if defined(CONFIG_DEBUG_KERNEL) && (LOCKLEVEL | TOPLEVEL) >= XCHAL_DEBUGLEVEL
+#if defined(CONFIG_DEBUG_MISC) && (LOCKLEVEL | TOPLEVEL) >= XCHAL_DEBUGLEVEL
 	unsigned long tmp;
 
 	asm volatile("rsr	%0, ps\t\n"
arch/xtensa/kernel/smp.c +1 -1
index 3699d6d3e479..83b244ce61ee 100644
@@ -126,7 +126,7 @@ void secondary_start_kernel(void)
 
 	init_mmu();
 
-#ifdef CONFIG_DEBUG_KERNEL
+#ifdef CONFIG_DEBUG_MISC
 	if (boot_secondary_processors == 0) {
 		pr_debug("%s: boot_secondary_processors:%d; Hanging cpu:%d\n",
 			__func__, boot_secondary_processors, cpu);
Signature · 1 line
2.21.0
maintainer Acked-by on v5 4/5
#5 lore raw

Re: [PATCH v5 4/5] xtensa: Replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC

Quoted 10 lines · Sinan Kaya

CONFIG_DEBUG_KERNEL should not impact code generation. Use the newly defined CONFIG_DEBUG_MISC instead to keep the current code.

---
 arch/xtensa/include/asm/irqflags.h | 2 +-
 arch/xtensa/kernel/smp.c           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 2 lines
Thanks.
-- Max
author
#6 lore raw

PATCH v5 5/5 net: Replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC

In reply to Sinan Kaya

CONFIG_DEBUG_KERNEL should not impact code generation. Use the newly defined CONFIG_DEBUG_MISC instead to keep the current code.

---
 net/netfilter/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/core.c +1 -1
index 93aaec3a54ec..cac3bad47f5e 100644
@@ -162,7 +162,7 @@ nf_hook_entries_grow(const struct nf_hook_entries *old,
 
 static void hooks_validate(const struct nf_hook_entries *hooks)
 {
-#ifdef CONFIG_DEBUG_KERNEL
+#ifdef CONFIG_DEBUG_MISC
 	struct nf_hook_ops **orig_ops;
 	int prio = INT_MIN;
 	size_t i = 0;
Signature · 1 line
2.21.0
Reviewed-by on the v5 series
#7 lore raw
In reply to Sinan Kaya
Quoted 10 lines · Sinan Kaya

CONFIG_DEBUG_KERNEL has been designed to just enable Kconfig options. Kernel code generatoin should not depend on CONFIG_DEBUG_KERNEL.

Proposed alternative plan: let's add a new symbol, something like DEBUG_MISC ("Miscellaneous debug code that should be under a more specific debug option but isn't"), make it depend on DEBUG_KERNEL and be "default DEBUG_KERNEL" but allow itself to be turned off, and then mechanically change the small handful of "#ifdef CONFIG_DEBUG_KERNEL" to "#ifdef CONFIG_DEBUG_MISC".

Thanks! This looks good to me. For the series:

Andrew, can you take these from lkml, or should the series get resent directly to you? I think you might be the best to carry this?

Thanks!

-Kees

Quoted 24 lines

Diff from v4:
- collect reviewed-by
- collect acked-by
- fix nit on 1/5

Sinan Kaya (5):
init: Introduce DEBUG_MISC option
powerpc: Replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC
mips: Replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC
xtensa: Replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC
net: Replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC

 arch/mips/kernel/setup.c           | 2 +-
 arch/powerpc/kernel/sysfs.c        | 8 ++++----
 arch/xtensa/include/asm/irqflags.h | 2 +-
 arch/xtensa/kernel/smp.c           | 2 +-
 lib/Kconfig.debug                  | 9 +++++++++
 net/netfilter/core.c               | 2 +-
 6 files changed, 17 insertions(+), 8 deletions(-)

--
2.21.0

Signature · 1 line
Kees Cook
author
#8 lore raw
Quoted 6 lines · Kees Cook

Thanks! This looks good to me. For the series:

Andrew, can you take these from lkml, or should the series get resent directly to you? I think you might be the best to carry this?

Where do we stand on this?

Anything for me to do, here?

#9 lore raw
Quoted 4 lines · Sinan Kaya
Quoted 2 lines · Kees Cook

Thanks! This looks good to me. For the series:

Quoted 8 lines
Quoted 4 lines

Andrew, can you take these from lkml, or should the series get resent directly to you? I think you might be the best to carry this?

Where do we stand on this?

Anything for me to do, here?

I think we're done. I'm just waiting to hear back from Andrew.

Andrew, do you want me to resend this directly to you, or can you fetch them from lkml?

Thanks!

Signature · 1 line
Kees Cook