From: Alexandre Chartre <alexandre.chartre@oracle.com>
To: linux-kernel@vger.kernel.org, mingo@kernel.org,
jpoimboe@kernel.org, peterz@infradead.org,
david.laight.linux@gmail.com
Cc: alexandre.chartre@oracle.com
Subject: [PATCH v5 23/30] objtool: Disassemble jump table alternatives
Date: Wed, 19 Nov 2025 15:32:40 +0100 [thread overview]
Message-ID: <20251119143247.3944213-24-alexandre.chartre@oracle.com> (raw)
In-Reply-To: <20251119143247.3944213-1-alexandre.chartre@oracle.com>
When using the --disas option, also disable jump tables.
Signed-off-by: Alexandre Chartre <alexandre.chartre@oracle.com>
---
tools/objtool/disas.c | 38 ++++++++++++++++++++++++++++++++------
1 file changed, 32 insertions(+), 6 deletions(-)
diff --git a/tools/objtool/disas.c b/tools/objtool/disas.c
index 018aba37b996b..326e16c9f30a8 100644
--- a/tools/objtool/disas.c
+++ b/tools/objtool/disas.c
@@ -639,6 +639,34 @@ static int disas_alt_add_insn(struct disas_alt *dalt, int index, char *insn_str,
return 0;
}
+static int disas_alt_jump(struct disas_alt *dalt)
+{
+ struct instruction *orig_insn;
+ struct instruction *dest_insn;
+ char suffix[2] = { 0 };
+ char *str;
+
+ orig_insn = dalt->orig_insn;
+ dest_insn = dalt->alt->insn;
+
+ if (orig_insn->type == INSN_NOP) {
+ if (orig_insn->len == 5)
+ suffix[0] = 'q';
+ str = strfmt("jmp%-3s %lx <%s+0x%lx>", suffix,
+ dest_insn->offset, dest_insn->sym->name,
+ dest_insn->offset - dest_insn->sym->offset);
+ } else {
+ str = strfmt("nop%d", orig_insn->len);
+ }
+
+ if (!str)
+ return -1;
+
+ disas_alt_add_insn(dalt, 0, str, 0);
+
+ return 1;
+}
+
/*
* Disassemble an exception table alternative.
*/
@@ -809,10 +837,7 @@ static void *disas_alt(struct disas_context *dctx,
goto done;
}
- /*
- * Only group alternatives and exception tables are
- * supported at the moment.
- */
+ count = -1;
switch (dalt->alt->type) {
case ALT_TYPE_INSTRUCTIONS:
count = disas_alt_group(dctx, dalt);
@@ -820,8 +845,9 @@ static void *disas_alt(struct disas_context *dctx,
case ALT_TYPE_EX_TABLE:
count = disas_alt_extable(dalt);
break;
- default:
- count = 0;
+ case ALT_TYPE_JUMP_TABLE:
+ count = disas_alt_jump(dalt);
+ break;
}
if (count < 0) {
WARN("%s: failed to disassemble alternative %s",
--
2.43.5
next prev parent reply other threads:[~2025-11-19 14:34 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-19 14:32 [PATCH v5 00/30] objtool: Function validation tracing Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 01/30] objtool: Move disassembly functions to a separated file Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 02/30] objtool: Create disassembly context Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 03/30] objtool: Disassemble code with libopcodes instead of running objdump Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 04/30] tool build: Remove annoying newline in build output Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 05/30] objtool: Print symbol during disassembly Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 06/30] objtool: Store instruction disassembly result Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 07/30] objtool: Disassemble instruction on warning or backtrace Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 08/30] objtool: Extract code to validate instruction from the validate branch loop Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 09/30] objtool: Record symbol name max length Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 10/30] objtool: Add option to trace function validation Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 11/30] objtool: Trace instruction state changes during " Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 12/30] objtool: Improve register reporting " Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 13/30] objtool: Identify the different types of alternatives Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 14/30] objtool: Add functions to better name alternatives Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 15/30] objtool: Improve tracing of alternative instructions Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 16/30] objtool: Do not validate IBT for .return_sites and .call_sites Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 17/30] objtool: Add the --disas=<function-pattern> action Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 18/30] objtool: Preserve alternatives order Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 19/30] objtool: Print headers for alternatives Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 20/30] objtool: Disassemble group alternatives Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 21/30] objtool: Print addresses with alternative instructions Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 22/30] objtool: Disassemble exception table alternatives Alexandre Chartre
2025-11-20 17:28 ` Josh Poimboeuf
2025-11-19 14:32 ` Alexandre Chartre [this message]
2025-11-19 14:32 ` [PATCH v5 24/30] objtool: Fix address references in alternatives Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 25/30] objtool: Provide access to feature and flags of group alternatives Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 26/30] objtool: Function to get the name of a CPU feature Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 27/30] objtool: Improve naming of group alternatives Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 28/30] objtool: Compact output for alternatives with one instruction Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 29/30] objtool: Add wide output for disassembly Alexandre Chartre
2025-11-19 14:32 ` [PATCH v5 30/30] objtool: Trim trailing NOPs in alternative Alexandre Chartre
2025-11-20 17:30 ` [PATCH v5 00/30] objtool: Function validation tracing Josh Poimboeuf
2025-11-20 17:37 ` Alexandre Chartre
2025-11-21 10:28 ` Peter Zijlstra
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=20251119143247.3944213-24-alexandre.chartre@oracle.com \
--to=alexandre.chartre@oracle.com \
--cc=david.laight.linux@gmail.com \
--cc=jpoimboe@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
/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
all inboxes | Powered by JetHome®