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 (file)
index 0000000..1fbc37a
--- /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 <yakoyoku@gmail.com>
+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 <acme@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, Jiri Olsa <jolsa@kernel.org>, Andrii Nakryiko <andrii@kernel.org>, Thorsten Leemhuis <linux@leemhuis.info>
+Message-ID: <20220916171234.841556-1-yakoyoku@gmail.com>
+
+From: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
+
+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@gmail.com>
+Signed-off-by: Jiri Olsa <jolsa@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 9c6604362bdbbe054ad1a3f712cfc1c25f1b2199..0ff03b8c2750125c041c4be7cdc23f9db6b34587 100644 (file)
--- 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