Skip to content

Commit 42450f7

Browse files
masahir0yAlexei Starovoitov
authored andcommitted
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 613fe16 ("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/20210111180609.713998-1-natechancellor@gmail.com/ Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Alan Maguire <alan.maguire@oracle.com> Acked-by: Andrii Nakryiko <andrii@kernel.org> Reviewed-by: Nathan Chancellor <nathan@kernel.org> Link: https://lore.kernel.org/r/20240913173759.1316390-2-masahiroy@kernel.org Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1 parent c980dc9 commit 42450f7

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

lib/Kconfig.debug

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,13 +379,15 @@ config DEBUG_INFO_BTF
379379
depends on !DEBUG_INFO_SPLIT && !DEBUG_INFO_REDUCED
380380
depends on !GCC_PLUGIN_RANDSTRUCT || COMPILE_TEST
381381
depends on BPF_SYSCALL
382+
depends on PAHOLE_VERSION >= 116
382383
depends on !DEBUG_INFO_DWARF5 || PAHOLE_VERSION >= 121
383384
# pahole uses elfutils, which does not have support for Hexagon relocations
384385
depends on !HEXAGON
385386
help
386387
Generate deduplicated BTF type information from DWARF debug info.
387-
Turning this on expects presence of pahole tool, which will convert
388-
DWARF type info into equivalent deduplicated BTF type info.
388+
Turning this on requires pahole v1.16 or later (v1.21 or later to
389+
support DWARF 5), which will convert DWARF type info into equivalent
390+
deduplicated BTF type info.
389391

390392
config PAHOLE_HAS_SPLIT_BTF
391393
def_bool PAHOLE_VERSION >= 119

scripts/link-vmlinux.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -107,20 +107,8 @@ vmlinux_link()
107107
# ${1} - vmlinux image
108108
gen_btf()
109109
{
110-
local pahole_ver
111110
local btf_data=${1}.btf.o
112111

113-
if ! [ -x "$(command -v ${PAHOLE})" ]; then
114-
echo >&2 "BTF: ${1}: pahole (${PAHOLE}) is not available"
115-
return 1
116-
fi
117-
118-
pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/')
119-
if [ "${pahole_ver}" -lt "116" ]; then
120-
echo >&2 "BTF: ${1}: pahole version $(${PAHOLE} --version) is too old, need at least v1.16"
121-
return 1
122-
fi
123-
124112
info BTF "${btf_data}"
125113
LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${PAHOLE_FLAGS} ${1}
126114

0 commit comments

Comments
 (0)