This is a note to let you know that I've just added the patch titled
kbuild: Add skip_encoding_btf_enum64 option to pahole
to the 5.10-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:
kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Wed Oct 26 06:44:13 PM CEST 2022
From: Jiri Olsa <jolsa@xxxxxxxxxx>
Date: Wed, 19 Oct 2022 10:56:04 +0200
Subject: kbuild: Add skip_encoding_btf_enum64 option to pahole
To: stable@xxxxxxxxxxxxxxx
Cc: bpf@xxxxxxxxxxxxxxx, "Arnaldo Carvalho de Melo" <acme@xxxxxxxxxx>, "Daniel Borkmann" <daniel@xxxxxxxxxxxxx>, "Martin Rodriguez Reboredo" <yakoyoku@xxxxxxxxx>, "Andrii Nakryiko" <andrii@xxxxxxxxxx>, "Javier Martinez Canillas" <javierm@xxxxxxxxxx>, "Ilya Leoshkevich" <iii@xxxxxxxxxxxxx>, "Nathan Chancellor" <nathan@xxxxxxxxxx>, "Philip Müller" <philm@xxxxxxxxxxx>
Message-ID: <20221019085604.1017583-6-jolsa@xxxxxxxxxx>
From: Martin Rodriguez Reboredo <yakoyoku@xxxxxxxxx>
New pahole (version 1.24) generates by default new BTF_KIND_ENUM64 BTF tag,
which is not supported by stable kernel.
As a result the kernel with CONFIG_DEBUG_INFO_BTF option will fail to
compile with following error:
BTFIDS vmlinux
FAILED: load BTF from vmlinux: Invalid argument
New pahole provides --skip_encoding_btf_enum64 option to skip BTF_KIND_ENUM64
generation and produce BTF supported by stable kernel.
Adding this option to scripts/pahole-flags.sh.
This change does not have equivalent commit in linus tree, because linus tree
has support for BTF_KIND_ENUM64 tag, so it does not need to be disabled.
Signed-off-by: Martin Rodriguez Reboredo <yakoyoku@xxxxxxxxx>
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
scripts/pahole-flags.sh | 4 ++++
1 file changed, 4 insertions(+)
--- a/scripts/pahole-flags.sh
+++ b/scripts/pahole-flags.sh
@@ -14,4 +14,8 @@ if [ "${pahole_ver}" -ge "118" ] && [ "$
extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars"
fi
+if [ "${pahole_ver}" -ge "124" ]; then
+ extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64"
+fi
+
echo ${extra_paholeopt}
Patches currently in stable-queue which might be from jolsa@xxxxxxxxxx are
queue-5.10/bpf-generate-btf_kind_float-when-linking-vmlinux.patch
queue-5.10/kbuild-skip-per-cpu-btf-generation-for-pahole-v1.18-v1.21.patch
queue-5.10/kbuild-quote-objcopy-var-to-avoid-a-pahole-call-break-the-build.patch
queue-5.10/kbuild-unify-options-for-btf-generation-for-vmlinux-and-modules.patch
queue-5.10/kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch
