From: Greg Kroah-Hartman Date: Tue, 18 Oct 2022 06:45:16 +0000 (+0200) Subject: 5.19-stable patches X-Git-Tag: v6.0.3~84 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88e3b3d2ec3757211673fdcc6e6bc98f7ae63cfc;p=thirdparty%2Fkernel%2Fstable-queue.git 5.19-stable patches added patches: kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch --- diff --git a/queue-5.19/kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch b/queue-5.19/kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch new file mode 100644 index 00000000000..1fbc37a6419 --- /dev/null +++ b/queue-5.19/kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch @@ -0,0 +1,45 @@ +From yakoyoku@gmail.com Tue Oct 18 08:44:34 2022 +From: Martin Rodriguez Reboredo +Date: Fri, 16 Sep 2022 14:12:34 -0300 +Subject: kbuild: Add skip_encoding_btf_enum64 option to pahole +To: stable@vger.kernel.org +Cc: bpf@vger.kernel.org, Arnaldo Carvalho de Melo , Daniel Borkmann , Jiri Olsa , Andrii Nakryiko , Thorsten Leemhuis +Message-ID: <20220916171234.841556-1-yakoyoku@gmail.com> + +From: Martin Rodriguez Reboredo + +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 +Signed-off-by: Jiri Olsa +Signed-off-by: Greg Kroah-Hartman +--- + scripts/pahole-flags.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/scripts/pahole-flags.sh ++++ b/scripts/pahole-flags.sh +@@ -20,4 +20,8 @@ if [ "${pahole_ver}" -ge "122" ]; then + extra_paholeopt="${extra_paholeopt} -j" + fi + ++if [ "${pahole_ver}" -ge "124" ]; then ++ extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64" ++fi ++ + echo ${extra_paholeopt} diff --git a/queue-5.19/series b/queue-5.19/series index 9c6604362bd..0ff03b8c275 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -835,3 +835,4 @@ powerpc-64s-interrupt-fix-lost-interrupts-when-returning-to-soft-masked-context. drm-amd-display-fix-build-breakage-with-config_debug_fs-n.patch phy-qcom-qmp-fix-msm8996-pcie-phy-support.patch clk-fix-pointer-casting-to-prevent-oops-in-devm_clk_release.patch +kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch