From: Jiri Olsa <jolsa@kernel.org>
To: stable@vger.kernel.org
Cc: bpf@vger.kernel.org, Arnaldo Carvalho de Melo <acme@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin Rodriguez Reboredo <yakoyoku@gmail.com>,
Andrii Nakryiko <andrii@kernel.org>
Subject: [PATCH stable 5.15 2/2] kbuild: Add skip_encoding_btf_enum64 option to pahole
Date: Sun, 4 Sep 2022 15:19:01 +0200 [thread overview]
Message-ID: <20220904131901.13025-3-jolsa@kernel.org> (raw)
In-Reply-To: <20220904131901.13025-1-jolsa@kernel.org>
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>
---
scripts/pahole-flags.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
index e6093adf4c06..7acee326aa6c 100755
--- a/scripts/pahole-flags.sh
+++ b/scripts/pahole-flags.sh
@@ -17,4 +17,8 @@ if [ "${pahole_ver}" -ge "121" ]; then
extra_paholeopt="${extra_paholeopt} --btf_gen_floats"
fi
+if [ "${pahole_ver}" -ge "124" ]; then
+ extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64"
+fi
+
echo ${extra_paholeopt}
--
2.37.2
next prev parent reply other threads:[~2022-09-04 13:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-04 13:18 [PATCH stable 5.15 0/2] kbuild: Fix compilation for latest pahole release Jiri Olsa
2022-09-04 13:19 ` [PATCH stable 5.15 1/2] kbuild: Unify options for BTF generation for vmlinux and modules Jiri Olsa
2022-09-04 13:19 ` Jiri Olsa [this message]
2022-09-04 14:10 ` [PATCH stable 5.15 0/2] kbuild: Fix compilation for latest pahole release Greg KH
2022-09-05 7:04 ` Jiri Olsa
2022-09-06 12:03 ` Greg KH
2022-09-18 22:14 ` Jiri Olsa
2022-10-17 18:02 ` Nathan Chancellor
2022-10-17 21:27 ` Jiri Olsa
2022-10-18 6:45 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220904131901.13025-3-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=acme@kernel.org \
--cc=andrii@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=stable@vger.kernel.org \
--cc=yakoyoku@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox