Skip to contentSkip to conversation

btf: remove redundant CONFIG_BPF test in scripts/link-vmlinux.sh

PATCH Applied Masahiro Yamada 4 participants 7 messages Sep 13, 2024 – Sep 14, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 btf: remove redundant CONFIG_BPF test in scripts/link-vmlinux.sh

CONFIG_DEBUG_INFO_BTF depends on CONFIG_BPF_SYSCALL, which in turn selects CONFIG_BPF.

When CONFIG_DEBUG_INFO_BTF=y, CONFIG_BPF=y is always met.

---

(no changes since v1)

 scripts/link-vmlinux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/link-vmlinux.sh +1 -1
index bd196944e350..cfffc41e20ed 100755
@@ -288,7 +288,7 @@ strip_debug=
 vmlinux_link vmlinux
 
 # fill in BTF IDs
-if is_enabled CONFIG_DEBUG_INFO_BTF && is_enabled CONFIG_BPF; then
+if is_enabled CONFIG_DEBUG_INFO_BTF; then
 	info BTFIDS vmlinux
 	${RESOLVE_BTFIDS} vmlinux
 fi
Signature · 1 line
2.43.0
#1 lore raw

PATCH v2 2/3 btf: move pahole check in scripts/link-vmlinux.sh to lib/Kconfig.debug

When DEBUG_INFO_DWARF5 is selected, pahole 1.21+ is required to enable DEBUG_INFO_BTF.

When DEBUG_INFO_DWARF4 or DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is selected, DEBUG_INFO_BTF can be enabled without pahole installed, but a build error will occur in scripts/link-vmlinux.sh:

LD .tmp_vmlinux1
BTF: .tmp_vmlinux1: pahole (pahole) is not available Failed to generate BTF for vmlinux
Try to disable CONFIG_DEBUG_INFO_BTF

We did not guard DEBUG_INFO_BTF by PAHOLE_VERSION when previously discussed [1].

However, commit 613fe1692377 ("kbuild: Add CONFIG_PAHOLE_VERSION") added CONFIG_PAHOLE_VERSION after all. Now several CONFIG options, as well as the combination of DEBUG_INFO_BTF and DEBUG_INFO_DWARF5, are guarded by PAHOLE_VERSION.

The remaining compile-time check in scripts/link-vmlinux.sh now appears to be an awkward inconsistency.

This commit adopts Nathan's original work.

[1]: https://lore.kernel.org/lkml/[email protected]/

---

Changes in v2:
- Reword the help message per Alan

 lib/Kconfig.debug       |  6 ++++--
 scripts/link-vmlinux.sh | 12 ------------
 2 files changed, 4 insertions(+), 14 deletions(-)
lib/Kconfig.debug +4 -2
index 5e2f30921cb2..bdf822bc1bab 100644
@@ -379,13 +379,15 @@ config DEBUG_INFO_BTF
 	depends on !DEBUG_INFO_SPLIT && !DEBUG_INFO_REDUCED
 	depends on !GCC_PLUGIN_RANDSTRUCT || COMPILE_TEST
 	depends on BPF_SYSCALL
+	depends on PAHOLE_VERSION >= 116
 	depends on !DEBUG_INFO_DWARF5 || PAHOLE_VERSION >= 121
 	# pahole uses elfutils, which does not have support for Hexagon relocations
 	depends on !HEXAGON
 	help
 	  Generate deduplicated BTF type information from DWARF debug info.
-	  Turning this on expects presence of pahole tool, which will convert
-	  DWARF type info into equivalent deduplicated BTF type info.
+	  Turning this on requires pahole v1.16 or later (v1.21 or later to
+	  support DWARF 5), which will convert DWARF type info into equivalent
+	  deduplicated BTF type info.
 
 config PAHOLE_HAS_SPLIT_BTF
 	def_bool PAHOLE_VERSION >= 119
scripts/link-vmlinux.sh +0 -12
index cfffc41e20ed..53bd4b727e21 100755
@@ -111,20 +111,8 @@ vmlinux_link()
 # ${1} - vmlinux image
 gen_btf()
 {
-	local pahole_ver
 	local btf_data=${1}.btf.o
 
-	if ! [ -x "$(command -v ${PAHOLE})" ]; then
-		echo >&2 "BTF: ${1}: pahole (${PAHOLE}) is not available"
-		return 1
-	fi
-
-	pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/')
-	if [ "${pahole_ver}" -lt "116" ]; then
-		echo >&2 "BTF: ${1}: pahole version $(${PAHOLE} --version) is too old, need at least v1.16"
-		return 1
-	fi
-
 	info BTF "${btf_data}"
 	LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${PAHOLE_FLAGS} ${1}
 
Signature · 1 line
2.43.0
#2 lore raw

PATCH v2 3/3 btf: require pahole 1.21+ for DEBUG_INFO_BTF with default DWARF version

In reply to Masahiro Yamada

As described in commit 42d9b379e3e1 ("lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+"), the combination of CONFIG_DEBUG_INFO_BTF and CONFIG_DEBUG_INFO_DWARF5 requires pahole 1.21+.

GCC 11+ and Clang 14+ default to DWARF 5 when the -g flag is passed. For the same reason, the combination of CONFIG_DEBUG_INFO_BTF and CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is also likely to require pahole 1.21+ these days. (At least, it is uncertain whether the actual requirement is pahole 1.16+ or 1.21+.)

---

(no changes since v1)

 lib/Kconfig.debug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/Kconfig.debug +1 -1
index bdf822bc1bab..e24c4caaa067 100644
@@ -380,7 +380,7 @@ config DEBUG_INFO_BTF
 	depends on !GCC_PLUGIN_RANDSTRUCT || COMPILE_TEST
 	depends on BPF_SYSCALL
 	depends on PAHOLE_VERSION >= 116
-	depends on !DEBUG_INFO_DWARF5 || PAHOLE_VERSION >= 121
+	depends on DEBUG_INFO_DWARF4 || PAHOLE_VERSION >= 121
 	# pahole uses elfutils, which does not have support for Hexagon relocations
 	depends on !HEXAGON
 	help
Signature · 1 line
2.43.0
#3 lore raw
In reply to Masahiro Yamada
Quoted 4 lines · Masahiro Yamada

CONFIG_DEBUG_INFO_BTF depends on CONFIG_BPF_SYSCALL, which in turn selects CONFIG_BPF.

Quoted 8 lines

When CONFIG_DEBUG_INFO_BTF=y, CONFIG_BPF=y is always met.

---

Masahiro,

Are you planning to take this through your tree, or you'd prefer us routing it through bpf-next?

Quoted 21 lines

(no changes since v1)

 scripts/link-vmlinux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/link-vmlinux.sh +1 -2
index bd196944e350..cfffc41e20ed 100755
@@ -288,7 +288,7 @@ strip_debug=
 vmlinux_link vmlinux
 
 # fill in BTF IDs
-if is_enabled CONFIG_DEBUG_INFO_BTF && is_enabled CONFIG_BPF; then
+if is_enabled CONFIG_DEBUG_INFO_BTF; then
        info BTFIDS vmlinux
        ${RESOLVE_BTFIDS} vmlinux
 fi
--

2.43.0

#4 lore raw
Quoted 15 lines · Andrii Nakryiko
Quoted 4 lines · Masahiro Yamada

CONFIG_DEBUG_INFO_BTF depends on CONFIG_BPF_SYSCALL, which in turn selects CONFIG_BPF.

Quoted 8 lines

When CONFIG_DEBUG_INFO_BTF=y, CONFIG_BPF=y is always met.

---

Quoted 4 lines

Masahiro,

Are you planning to take this through your tree, or you'd prefer us routing it through bpf-next?

Hi,

If possible, could you apply it to bpf-next
for the upcoming MW?

Signature · 2 lines
Best Regards
Masahiro Yamada
#5 lore raw
Quoted 20 lines · Masahiro Yamada
Quoted 17 lines · Andrii Nakryiko
Quoted 4 lines · Masahiro Yamada

CONFIG_DEBUG_INFO_BTF depends on CONFIG_BPF_SYSCALL, which in turn selects CONFIG_BPF.

Quoted 8 lines

When CONFIG_DEBUG_INFO_BTF=y, CONFIG_BPF=y is always met.

---

Masahiro,

Quoted 7 lines
Quoted 2 lines

Are you planning to take this through your tree, or you'd prefer us routing it through bpf-next?

Hi,

If possible, could you apply it to bpf-next
for the upcoming MW?

Sure thing. We'll do.

#6 lore raw
In reply to Masahiro Yamada
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Hello:

This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Quoted 11 lines · On Sat, 14 Sep 2024 02:37:52 +0900 you wrote:

CONFIG_DEBUG_INFO_BTF depends on CONFIG_BPF_SYSCALL, which in turn selects CONFIG_BPF.

When CONFIG_DEBUG_INFO_BTF=y, CONFIG_BPF=y is always met.

[...]

Here is the summary with links:
- [v2,1/3] btf: remove redundant CONFIG_BPF test in scripts/link-vmlinux.sh

    https://git.kernel.org/bpf/bpf-next/c/c980dc9c67a9
  - [v2,2/3] btf: move pahole check in scripts/link-vmlinux.sh to lib/Kconfig.debug
    https://git.kernel.org/bpf/bpf-next/c/42450f7a9086
  - [v2,3/3] btf: require pahole 1.21+ for DEBUG_INFO_BTF with default DWARF version
    https://git.kernel.org/bpf/bpf-next/c/5277d130947b

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html