Patch "bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition" has been added to the 6.1-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     bpf-kconfig-fix-debug_info_btf_modules-kconfig-defin.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 216b5e5bd70c1526308f3e834c6b76cee3d9b7ff
Author: Andrii Nakryiko <andrii@xxxxxxxxxx>
Date:   Thu Apr 4 15:03:44 2024 -0700

    bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition
    
    [ Upstream commit 229087f6f1dc2d0c38feba805770f28529980ec0 ]
    
    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.
    
    Fixes: 5f9ae91f7c0d ("kbuild: Build kernel module BTFs if BTF is enabled and pahole supports it")
    Reported-by: Vincent Li <vincent.mc.li@xxxxxxxxx>
    Signed-off-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
    Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
    Link: https://lore.kernel.org/bpf/CAK3+h2xiFfzQ9UXf56nrRRP=p1+iUxGoEP5B+aq9MDT5jLXDSg@xxxxxxxxxxxxxx [0]
    Link: https://lore.kernel.org/bpf/20240404220344.3879270-1-andrii@xxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 95541b99aa8ea..b2dff19358938 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -343,7 +343,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
@@ -374,7 +374,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.




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux