From: Alan Maguire <almagui@kernel.org>
To: ast@kernel.org
Cc: daniel@iogearbox.net, andrii@kernel.org, eddyz87@gmail.com,
memxor@gmail.com, martin.lau@linux.dev, song@kernel.org,
yonghong.song@linux.dev, jolsa@kernel.org, emil@etsalapatis.com,
ihor.solodrai@linux.dev, nathan@kernel.org,
ndesaulniers@google.com, morbo@google.com,
justinstitt@google.com, a.s.protopopov@gmail.com,
bpf@vger.kernel.org, Alan Maguire <almagui@kernel.org>
Subject: [PATCH bpf-next] resolve_btfids: Match the arm64 NOP opcode for LLVM 24 in text_mc
Date: Wed, 18 Nov 2026 19:40:30 +0000 [thread overview]
Message-ID: <20261118194030.4103149-1-almagui@kernel.org> (raw)
PR #170968, “[AArch64] Treat NOP as a separate instruction” [1]
gave NOP its own instruction definition; LLVM 24 decodes
"1f 20 03 d5" as the opcode NOP. Earlier releases decode it
as HINT #0, which is what the arm64 table looks for. So the
test of the nop fails, text_arch_init() gives up and a kernel
with CONFIG_BPF_FMODRET_SCAN=y cannot be built:
text_mc: LLVM 24.0.0git: 1f 20 03 d5 is NOP, length 4, nop 0 ...
expected: nop 1 ...
text_mc: LLVM 24.0.0git: the table of the arch does not fit it. ...
FAILED: no decoder for the code of ELF machine 183
Add a pattern for NOP. An LLVM before this has no opcode of that name,
and a name which is missing is an error. So a pattern can now be
OPTIONAL: it is left out if this LLVM lacks the opcode. The pattern of
HINT #0 stays for the releases before, and the test shows that one of
the two matches.
With LLVM 24.0.0git the scan of an arm64 vmlinux finds no instruction
it cannot decode: 3385 of 65138 functions are tagged (the smaller
number of matches is due to CONFIG_KCSAN causing functions to be
marked as unsafe for fmod_ret).
[1] https://github.com/llvm/llvm-project/pull/170968
Fixes: 4dd950adacad ("resolve_btfids: Tag the functions that return errors")
Assisted-by: LLM
Signed-off-by: Alan Maguire <almagui@kernel.org>
---
tools/bpf/resolve_btfids/text_mc.cpp | 2 ++
tools/bpf/resolve_btfids/text_mc.h | 6 ++++++
tools/bpf/resolve_btfids/text_mc_arm64.c | 2 ++
3 files changed, 10 insertions(+)
diff --git a/tools/bpf/resolve_btfids/text_mc.cpp b/tools/bpf/resolve_btfids/text_mc.cpp
index 57f45a4bed6f..69668f8b12d7 100644
--- a/tools/bpf/resolve_btfids/text_mc.cpp
+++ b/tools/bpf/resolve_btfids/text_mc.cpp
@@ -195,6 +195,8 @@ bool read_opcodes()
auto it = by_name.find(pattern->opcode);
if (it == by_name.end()) {
+ if (pattern->optional)
+ continue;
error() << "no opcode " << pattern->opcode << "\n";
ok = false;
} else if (pattern->kind == TEXT_RETURN) {
diff --git a/tools/bpf/resolve_btfids/text_mc.h b/tools/bpf/resolve_btfids/text_mc.h
index f2add1f45f4f..574d4a94afa6 100644
--- a/tools/bpf/resolve_btfids/text_mc.h
+++ b/tools/bpf/resolve_btfids/text_mc.h
@@ -50,6 +50,11 @@ struct mc_predicate {
* has, and DEFS.
* With NOP the instruction is a nop if the first predicate holds.
*
+ * An opcode which this LLVM does not have is an error, unless the pattern is
+ * OPTIONAL: then it is left out. That is for an opcode which LLVM split off
+ * from another one in some release, while the pattern of the old one stays
+ * for the releases before. The tests show that one of the two matches.
+ *
* A pattern of kind TEXT_RETURN names a return to the caller. isReturn() holds
* for a return from an exception as well, which does not hand the return value
* register to a caller. Without such a pattern it is an opcode like any other,
@@ -71,6 +76,7 @@ struct mc_pattern {
s64 value;
u32 defs; /* of TEXT_OTHER */
bool nop; /* of TEXT_OTHER */
+ bool optional; /* the opcode is missing in some LLVM releases */
struct mc_predicate predicates[2];
};
diff --git a/tools/bpf/resolve_btfids/text_mc_arm64.c b/tools/bpf/resolve_btfids/text_mc_arm64.c
index 5d2fa8a23a14..9cc41900fa4a 100644
--- a/tools/bpf/resolve_btfids/text_mc_arm64.c
+++ b/tools/bpf/resolve_btfids/text_mc_arm64.c
@@ -25,6 +25,8 @@ static const struct mc_pattern arm64_patterns[] = {
/* HINT: nop, bti, yield, wfe ... */
{ "HINT", TEXT_OTHER }, { "AUTIASP", TEXT_OTHER }, { "PRFMui", TEXT_OTHER },
{ "HINT", TEXT_OTHER, .nop = true, .predicates = { IMM(0, 0) } }, /* nop */
+ /* LLVM 24 decodes nop as NOP, not as HINT #0 */
+ { "NOP", TEXT_OTHER, .nop = true, .optional = true },
{ "DMB", TEXT_OTHER }, { "MRS", TEXT_OTHER }, { "MSR", TEXT_OTHER },
{ "STLRB", TEXT_OTHER }, { "STLRW", TEXT_OTHER },
WX("LDXR", "", TEXT_OTHER), WX("STXR", "", TEXT_OTHER), WX("STLXR", "", TEXT_OTHER),
--
2.56.0
next reply other threads:[~2026-11-18 19:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 19:40 Alan Maguire [this message]
2026-11-18 20:12 ` [PATCH bpf-next] resolve_btfids: Match the arm64 NOP opcode for LLVM 24 in text_mc bot+bpf-ci
2026-11-19 1:44 ` Alexei Starovoitov
2026-11-19 1:50 ` patchwork-bot+netdevbpf
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=20261118194030.4103149-1-almagui@kernel.org \
--to=almagui@kernel.org \
--cc=a.s.protopopov@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=emil@etsalapatis.com \
--cc=ihor.solodrai@linux.dev \
--cc=jolsa@kernel.org \
--cc=justinstitt@google.com \
--cc=martin.lau@linux.dev \
--cc=memxor@gmail.com \
--cc=morbo@google.com \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=song@kernel.org \
--cc=yonghong.song@linux.dev \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.