[PATCH bpf] bpf,kconfig: fix DEBUG_INFO_BTF_MODULES Kconfig definition

[PATCH bpf] bpf,kconfig: fix DEBUG_INFO_BTF_MODULES Kconfig definition

[Andrii Nakryiko]

Turns out that due to CONFIG_DEBUG_INFO_BTF_MODULES not having an
explicitly specified "menu item name" in Kconfig, it's basically
impossible to turn it off (see [0]).

This patch fixes the issue by defining menu name for
CONFIG_DEBUG_INFO_BTF_MODULES, which makes it actually adjustable and
independent of CONFIG_DEBUG_INFO_BTF, in the sense that one can have
DEBUG_INFO_BTF=y and DEBUG_INFO_BTF_MODULES=n.

We still keep it as defaulting to Y, of course.

  [0] https://lore.kernel.org/bpf/CAK3+h2xiFfzQ9UXf56nrRRP=p1+iUxGoEP5B+aq9MDT5jLXDSg@mail.gmail.com/

Reported-by: Vincent Li <vincent.mc.li@gmail.com>
Fixes: 5f9ae91f7c0d ("kbuild: Build kernel module BTFs if BTF is enabled and pahole supports it")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
 lib/Kconfig.debug | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c63a5fbf1f1c..291185f54ee4 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -375,7 +375,7 @@ config DEBUG_INFO_SPLIT
 	  Incompatible with older versions of ccache.
 
 config DEBUG_INFO_BTF
-	bool "Generate BTF typeinfo"
+	bool "Generate BTF type information"
 	depends on !DEBUG_INFO_SPLIT && !DEBUG_INFO_REDUCED
 	depends on !GCC_PLUGIN_RANDSTRUCT || COMPILE_TEST
 	depends on BPF_SYSCALL
@@ -408,7 +408,8 @@ config PAHOLE_HAS_LANG_EXCLUDE
 	  using DEBUG_INFO_BTF_MODULES.
 
 config DEBUG_INFO_BTF_MODULES
-	def_bool y
+	bool "Generate BTF type information for kernel modules"
+	default y
 	depends on DEBUG_INFO_BTF && MODULES && PAHOLE_HAS_SPLIT_BTF
 	help
 	  Generate compact split BTF type information for kernel modules.
-- 
2.43.0

Re: [PATCH bpf] bpf,kconfig: fix DEBUG_INFO_BTF_MODULES Kconfig definition

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:

On Thu,  4 Apr 2024 15:03:44 -0700 you wrote:
> Turns out that due to CONFIG_DEBUG_INFO_BTF_MODULES not having an
> explicitly specified "menu item name" in Kconfig, it's basically
> impossible to turn it off (see [0]).
> 
> This patch fixes the issue by defining menu name for
> CONFIG_DEBUG_INFO_BTF_MODULES, which makes it actually adjustable and
> independent of CONFIG_DEBUG_INFO_BTF, in the sense that one can have
> DEBUG_INFO_BTF=y and DEBUG_INFO_BTF_MODULES=n.
> 
> [...]

Here is the summary with links:
  - [bpf] bpf,kconfig: fix DEBUG_INFO_BTF_MODULES Kconfig definition
    https://git.kernel.org/bpf/bpf/c/229087f6f1dc

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html