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 v6 14/30] objtool: Add functions to better name alternatives
Date: Fri, 21 Nov 2025 10:53:24 +0100 [thread overview]
Message-ID: <20251121095340.464045-15-alexandre.chartre@oracle.com> (raw)
In-Reply-To: <20251121095340.464045-1-alexandre.chartre@oracle.com>
Add the disas_alt_name() and disas_alt_type_name() to provide a
name and a type name for an alternative. This will be used to
better name alternatives when tracing their execution.
Signed-off-by: Alexandre Chartre <alexandre.chartre@oracle.com>
---
tools/objtool/disas.c | 72 +++++++++++++++++++++++++++
tools/objtool/include/objtool/disas.h | 12 +++++
2 files changed, 84 insertions(+)
diff --git a/tools/objtool/disas.c b/tools/objtool/disas.c
index 0ca6e6c8559fd..b53be240825da 100644
--- a/tools/objtool/disas.c
+++ b/tools/objtool/disas.c
@@ -3,6 +3,8 @@
* Copyright (C) 2015-2017 Josh Poimboeuf <jpoimboe@redhat.com>
*/
+#define _GNU_SOURCE
+
#include <objtool/arch.h>
#include <objtool/check.h>
#include <objtool/disas.h>
@@ -450,6 +452,76 @@ size_t disas_insn(struct disas_context *dctx, struct instruction *insn)
return disasm(insn->offset, &dctx->info);
}
+/*
+ * Provide a name for the type of alternatives present at the
+ * specified instruction.
+ *
+ * An instruction can have alternatives with different types, for
+ * example alternative instructions and an exception table. In that
+ * case the name for the alternative instructions type is used.
+ *
+ * Return NULL if the instruction as no alternative.
+ */
+const char *disas_alt_type_name(struct instruction *insn)
+{
+ struct alternative *alt;
+ const char *name;
+
+ name = NULL;
+ for (alt = insn->alts; alt; alt = alt->next) {
+ if (alt->type == ALT_TYPE_INSTRUCTIONS) {
+ name = "alternative";
+ break;
+ }
+
+ switch (alt->type) {
+ case ALT_TYPE_EX_TABLE:
+ name = "ex_table";
+ break;
+ case ALT_TYPE_JUMP_TABLE:
+ name = "jump_table";
+ break;
+ default:
+ name = "unknown";
+ break;
+ }
+ }
+
+ return name;
+}
+
+/*
+ * Provide a name for an alternative.
+ */
+char *disas_alt_name(struct alternative *alt)
+{
+ char *str = NULL;
+
+ switch (alt->type) {
+
+ case ALT_TYPE_EX_TABLE:
+ str = strdup("EXCEPTION");
+ break;
+
+ case ALT_TYPE_JUMP_TABLE:
+ str = strdup("JUMP");
+ break;
+
+ case ALT_TYPE_INSTRUCTIONS:
+ /*
+ * This is a non-default group alternative. Create a unique
+ * name using the offset of the first original and alternative
+ * instructions.
+ */
+ asprintf(&str, "ALTERNATIVE %lx.%lx",
+ alt->insn->alt_group->orig_group->first_insn->offset,
+ alt->insn->alt_group->first_insn->offset);
+ break;
+ }
+
+ return str;
+}
+
/*
* Disassemble a function.
*/
diff --git a/tools/objtool/include/objtool/disas.h b/tools/objtool/include/objtool/disas.h
index 5db75d06f2197..8959d4c455622 100644
--- a/tools/objtool/include/objtool/disas.h
+++ b/tools/objtool/include/objtool/disas.h
@@ -6,6 +6,7 @@
#ifndef _DISAS_H
#define _DISAS_H
+struct alternative;
struct disas_context;
struct disassemble_info;
@@ -24,6 +25,8 @@ void disas_print_info(FILE *stream, struct instruction *insn, int depth,
void disas_print_insn(FILE *stream, struct disas_context *dctx,
struct instruction *insn, int depth,
const char *format, ...);
+char *disas_alt_name(struct alternative *alt);
+const char *disas_alt_type_name(struct instruction *insn);
#else /* DISAS */
@@ -61,6 +64,15 @@ static inline void disas_print_info(FILE *stream, struct instruction *insn,
static inline void disas_print_insn(FILE *stream, struct disas_context *dctx,
struct instruction *insn, int depth,
const char *format, ...) {}
+static inline char *disas_alt_name(struct alternative *alt)
+{
+ return NULL;
+}
+
+static inline const char *disas_alt_type_name(struct instruction *insn)
+{
+ return NULL;
+}
#endif /* DISAS */
--
2.43.5
next prev parent reply other threads:[~2025-11-21 9:54 UTC|newest]
Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-21 9:53 [PATCH v6 00/30] objtool: Function validation tracing Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 01/30] objtool: Move disassembly functions to a separated file Alexandre Chartre
2025-11-24 9:12 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 02/30] objtool: Create disassembly context Alexandre Chartre
2025-11-24 9:12 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 03/30] objtool: Disassemble code with libopcodes instead of running objdump Alexandre Chartre
2025-11-24 9:12 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-25 18:16 ` [PATCH v6 03/30] " Nathan Chancellor
2025-11-26 9:00 ` Alexandre Chartre
2025-11-26 10:07 ` David Laight
2025-11-26 10:29 ` Alexandre Chartre
2025-12-09 6:58 ` Guenter Roeck
2025-12-09 7:51 ` Alexandre Chartre
2025-12-09 15:11 ` Guenter Roeck
2025-12-09 22:25 ` Maciej W. Rozycki
2025-12-10 5:08 ` Guenter Roeck
2025-12-10 7:53 ` Alexandre Chartre
2025-12-10 15:26 ` Guenter Roeck
2025-12-10 16:36 ` Alexandre Chartre
2025-12-10 18:42 ` Guenter Roeck
2025-12-10 21:54 ` Guenter Roeck
2025-12-15 16:00 ` Alexandre Chartre
2025-12-15 16:46 ` Guenter Roeck
2025-12-10 7:06 ` Alexandre Chartre
2025-12-10 8:56 ` Peter Zijlstra
2025-12-10 8:53 ` Peter Zijlstra
2025-12-10 12:01 ` Maciej W. Rozycki
2025-11-21 9:53 ` [PATCH v6 04/30] tool build: Remove annoying newline in build output Alexandre Chartre
2025-11-24 9:12 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 05/30] objtool: Print symbol during disassembly Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 06/30] objtool: Store instruction disassembly result Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 07/30] objtool: Disassemble instruction on warning or backtrace Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 08/30] objtool: Extract code to validate instruction from the validate branch loop Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 09/30] objtool: Record symbol name max length Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 10/30] objtool: Add option to trace function validation Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 11/30] objtool: Trace instruction state changes during " Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-12-01 20:23 ` [PATCH v6 11/30] " Nathan Chancellor
2025-12-02 1:30 ` Josh Poimboeuf
2025-12-02 8:34 ` Alexandre Chartre
2025-12-02 16:13 ` Josh Poimboeuf
2025-12-02 18:09 ` David Laight
2025-11-21 9:53 ` [PATCH v6 12/30] objtool: Improve register reporting " Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 13/30] objtool: Identify the different types of alternatives Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` Alexandre Chartre [this message]
2025-11-24 9:11 ` [tip: objtool/core] objtool: Add functions to better name alternatives tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 15/30] objtool: Improve tracing of alternative instructions Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 16/30] objtool: Do not validate IBT for .return_sites and .call_sites Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 17/30] objtool: Add the --disas=<function-pattern> action Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 18/30] objtool: Preserve alternatives order Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 19/30] objtool: Print headers for alternatives Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 20/30] objtool: Disassemble group alternatives Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 21/30] objtool: Print addresses with alternative instructions Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 22/30] objtool: Disassemble exception table alternatives Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 23/30] objtool: Disassemble jump " Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 24/30] objtool: Fix address references in alternatives Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 25/30] objtool: Provide access to feature and flags of group alternatives Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 26/30] objtool: Function to get the name of a CPU feature Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-24 10:44 ` tip-bot2 for Alexandre Chartre
2025-11-24 11:59 ` Peter Zijlstra
2025-11-24 12:26 ` Borislav Petkov
2025-11-24 12:40 ` Alexandre Chartre
2025-11-24 19:05 ` david laight
2025-11-24 16:43 ` Alexandre Chartre
2025-11-24 20:14 ` Borislav Petkov
2025-11-24 19:49 ` [tip: objtool/core] objtool: Add " tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 27/30] objtool: Improve naming of group alternatives Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-24 10:44 ` tip-bot2 for Alexandre Chartre
2025-11-24 19:49 ` tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 28/30] objtool: Compact output for alternatives with one instruction Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-24 10:43 ` tip-bot2 for Alexandre Chartre
2025-11-24 19:49 ` tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 29/30] objtool: Add wide output for disassembly Alexandre Chartre
2025-11-24 9:11 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-24 10:43 ` tip-bot2 for Alexandre Chartre
2025-11-24 19:49 ` tip-bot2 for Alexandre Chartre
2025-11-21 9:53 ` [PATCH v6 30/30] objtool: Trim trailing NOPs in alternative Alexandre Chartre
2025-11-24 9:10 ` [tip: objtool/core] " tip-bot2 for Alexandre Chartre
2025-11-24 10:43 ` tip-bot2 for Alexandre Chartre
2025-11-24 19:49 ` tip-bot2 for Alexandre Chartre
2025-11-21 10:36 ` [PATCH v6 00/30] objtool: Function validation tracing Peter Zijlstra
2025-11-21 13:16 ` Alexandre Chartre
2025-11-21 13:51 ` Alexandre Chartre
2025-11-21 14:30 ` Peter Zijlstra
2025-11-24 11:04 ` Borislav Petkov
2025-11-24 11:39 ` Alexandre Chartre
2025-11-24 12:39 ` Borislav Petkov
2025-11-24 12:27 ` David Laight
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=20251121095340.464045-15-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®