Commit 581b31c3 authored May 05, 2019 by Andrii Nakryiko Committed by Daniel Borkmann May 06, 2019

kbuild: tolerate missing pahole when generating BTF



When BTF generation is enabled through CONFIG_DEBUG_INFO_BTF,
scripts/link-vmlinux.sh detects if pahole version is too old and
gracefully continues build process, skipping BTF generation build step.
But if pahole is not available, build will still fail. This patch adds
check for whether pahole exists at all and bails out gracefully, if not.

Cc: Alexei Starovoitov <ast@fb.com>
Reported-by: Yonghong Song <yhs@fb.com>
Fixes: e83b9f55 ("kbuild: add ability to generate BTF type info for vmlinux")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

parent 7080da89

scripts/link-vmlinux.sh

+5 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,11 @@ gen_btf()
		{
		local pahole_ver;

		if ! [ -x "$(command -v ${PAHOLE})" ]; then
		info "BTF" "${1}: pahole (${PAHOLE}) is not available"
		return 0
		fi

		pahole_ver=$(${PAHOLE} --version \| sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/')
		if [ "${pahole_ver}" -lt "113" ]; then
		info "BTF" "${1}: pahole version $(${PAHOLE} --version) is too old, need at least v1.13"

Admin message