From: Dylan Hatch <dylanbhatch@google.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
"David S . Miller" <davem@davemloft.net>,
Nathan Chancellor <nathan@kernel.org>,
Nicolas Schier <nsc@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Bill Wendling <morbo@google.com>,
Justin Stitt <justinstitt@google.com>,
Weinan Liu <wnliu@google.com>, Jens Remus <jremus@linux.ibm.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
linux-crypto@vger.kernel.org, llvm@lists.linux.dev,
Josh Poimboeuf <jpoimboe@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Ard Biesheuvel <ardb@kernel.org>,
Indu Bhagat <ibhagatgnu@gmail.com>,
Prasanna Kumar T S M <ptsm@linux.microsoft.com>,
live-patching@vger.kernel.org,
Dylan Hatch <dylanbhatch@google.com>
Subject: [RFC PATCH 06/12] scripts/gen_lr_unwind: add --dump option to inspect .lr_unwind tables
Date: Tue, 17 Nov 2026 04:34:58 +0000 [thread overview]
Message-ID: <20261117043504.1021063-7-dylanbhatch@google.com> (raw)
In-Reply-To: <20261117043504.1021063-1-dylanbhatch@google.com>
Add a --dump (-d) flag to scripts/gen_lr_unwind to dump .lr_unwind FDEs
and instruction ranges in human-readable format. Support dumping both
linked/post-processed objects containing .lr_unwind_fde and individual
relocatable .o files containing only .eh_frame.
Signed-off-by: Dylan Hatch <dylanbhatch@google.com>
---
scripts/gen_lr_unwind.c | 268 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 257 insertions(+), 11 deletions(-)
diff --git a/scripts/gen_lr_unwind.c b/scripts/gen_lr_unwind.c
index f65edd86ac78c..2058601ec6135 100644
--- a/scripts/gen_lr_unwind.c
+++ b/scripts/gen_lr_unwind.c
@@ -35,6 +35,8 @@ struct lr_unwind_ctx {
const Elf64_Shdr *eh_sec;
const Elf64_Shdr *rela_eh_sec;
const Elf64_Shdr *fde_sec;
+ const Elf64_Shdr *rela_fde_sec;
+ const Elf64_Shdr *ranges_sec;
unsigned int symtab_shndx;
const Elf64_Rela *eh_relas;
@@ -67,6 +69,13 @@ struct elf_writer {
size_t str_sz;
};
+struct dump_sym {
+ u64 addr;
+ unsigned int shndx;
+ bool is_func;
+ const char *name;
+};
+
static int append_fde_entry(struct lr_unwind_ctx *ctx,
const Elf64_Rela *eh_rela,
s64 byte_off, u32 desc)
@@ -478,6 +487,225 @@ static int emit_lr_unwind_sections(const char *fname, struct lr_unwind_ctx *ctx,
return ret;
}
+static int cmp_dump_sym(const void *a, const void *b)
+{
+ const struct dump_sym *sa = a, *sb = b;
+
+ if (sa->shndx != sb->shndx)
+ return sa->shndx < sb->shndx ? -1 : 1;
+ if (sa->addr != sb->addr)
+ return sa->addr < sb->addr ? -1 : 1;
+ if (sa->is_func != sb->is_func)
+ return sa->is_func ? 1 : -1;
+ return 0;
+}
+
+static const struct dump_sym *find_dump_sym(const struct dump_sym *syms,
+ size_t nr_syms,
+ unsigned int shndx, u64 addr)
+{
+ size_t lo = 0, hi = nr_syms;
+ const struct dump_sym *best = NULL;
+
+ while (lo < hi) {
+ size_t mid = lo + (hi - lo) / 2;
+ const struct dump_sym *s = &syms[mid];
+
+ if ((shndx && s->shndx < shndx) ||
+ ((!shndx || s->shndx == shndx) && s->addr <= addr)) {
+ if (!shndx || s->shndx == shndx)
+ best = s;
+ lo = mid + 1;
+ } else {
+ hi = mid;
+ }
+ }
+
+ return best;
+}
+
+static const char *mode_name(enum lr_unwind_mode mode)
+{
+ switch (mode) {
+ case LR_UNWIND_LIVE:
+ return "LIVE";
+ case LR_UNWIND_FP:
+ return "FP";
+ case LR_UNWIND_SP:
+ return "SP";
+ default:
+ return "UNKNOWN";
+ }
+}
+
+static int dump_lr_unwind(struct lr_unwind_ctx *ctx, const Elf64_Shdr *shdrs,
+ unsigned int shnum, const char *shstrtab)
+{
+ const struct lr_fde *fdes;
+ const Elf64_Rela *relas = NULL;
+ const lr_range_t *ranges = NULL;
+ size_t nr_fdes, nr_ranges = 0;
+ const Elf64_Sym *elf_syms = NULL;
+ size_t nr_elf_syms = 0;
+ const char *strtab = NULL;
+ struct dump_sym *dsyms = NULL;
+ size_t nr_dsyms = 0;
+ bool is_rel = (((const Elf64_Ehdr *)ctx->map)->e_type == ET_REL);
+
+ if (ctx->fde_sec) {
+ fdes = ctx->map + ctx->fde_sec->sh_offset;
+ nr_fdes = ctx->fde_sec->sh_size / sizeof(struct lr_fde);
+ if (ctx->rela_fde_sec)
+ relas = ctx->map + ctx->rela_fde_sec->sh_offset;
+ if (ctx->ranges_sec) {
+ ranges = ctx->map + ctx->ranges_sec->sh_offset;
+ nr_ranges = ctx->ranges_sec->sh_size / sizeof(lr_range_t);
+ }
+ } else {
+ if (!ctx->eh_sec || !ctx->rela_eh_sec || !ctx->symtab_shndx) {
+ fprintf(stderr, "No .lr_unwind_fde or .eh_frame section found\n");
+ return -1;
+ }
+ if (parse_eh_frame(ctx) < 0)
+ return -1;
+ fdes = ctx->fdes;
+ nr_fdes = ctx->nr_fdes;
+ relas = ctx->fde_relas;
+ ranges = ctx->ranges;
+ nr_ranges = ctx->nr_ranges;
+ }
+
+ if (ctx->symtab_shndx) {
+ const Elf64_Shdr *sym_sec = &shdrs[ctx->symtab_shndx];
+
+ elf_syms = ctx->map + sym_sec->sh_offset;
+ nr_elf_syms = sym_sec->sh_size / sizeof(Elf64_Sym);
+ strtab = ctx->map + shdrs[sym_sec->sh_link].sh_offset;
+
+ dsyms = malloc(nr_elf_syms * sizeof(*dsyms));
+ if (!dsyms)
+ return -1;
+
+ for (size_t i = 0; i < nr_elf_syms; i++) {
+ const Elf64_Sym *s = &elf_syms[i];
+ unsigned char type = ELF64_ST_TYPE(s->st_info);
+ const char *name = strtab + s->st_name;
+
+ if (s->st_shndx == SHN_UNDEF ||
+ s->st_shndx >= SHN_LORESERVE)
+ continue;
+ if (type != STT_FUNC && type != STT_NOTYPE)
+ continue;
+ if (!name[0] || name[0] == '$' ||
+ !strncmp(name, ".L", 2))
+ continue;
+
+ dsyms[nr_dsyms++] = (struct dump_sym){
+ .addr = s->st_value,
+ .shndx = is_rel ? s->st_shndx : 0,
+ .is_func = (type == STT_FUNC),
+ .name = name,
+ };
+ }
+
+ qsort(dsyms, nr_dsyms, sizeof(*dsyms), cmp_dump_sym);
+ }
+
+ for (size_t i = 0; i < nr_fdes; i++) {
+ const struct lr_fde *fde = &fdes[i];
+ u32 desc = fde->range_desc;
+ u32 sp_off = LR_FDE_SP_OFF_BYTES(desc);
+ lr_range_t inline_ranges[4];
+ const lr_range_t *r_list;
+ u32 r_cnt, total_insns = 0, insn_off = 0;
+
+ if (desc & LR_FDE_INLINE) {
+ lr_fde_unpack_inline(desc, inline_ranges);
+ r_list = inline_ranges;
+ r_cnt = 4;
+ } else {
+ u32 idx = LR_OOL_IDX(desc);
+
+ r_cnt = LR_OOL_COUNT(desc);
+ if (idx + r_cnt > nr_ranges) {
+ free(dsyms);
+ return -1;
+ }
+ r_list = &ranges[idx];
+ }
+
+ for (u32 j = 0; j < r_cnt; j++)
+ total_insns += LR_RANGE_LEN(r_list[j]);
+
+ printf("FDE[%zu] ", i);
+ if (relas && elf_syms) {
+ u32 sym_idx = ELF64_R_SYM(relas[i].r_info);
+
+ if (sym_idx < nr_elf_syms) {
+ const Elf64_Sym *sym = &elf_syms[sym_idx];
+ unsigned int shndx = sym->st_shndx;
+ u64 off = sym->st_value + relas[i].r_addend;
+
+ if (shndx < shnum && shndx < SHN_LORESERVE) {
+ const char *sec_name =
+ shstrtab + shdrs[shndx].sh_name;
+ const struct dump_sym *ds =
+ find_dump_sym(dsyms, nr_dsyms,
+ shndx, off);
+
+ if (ds)
+ printf("%s+0x%lx <%s+0x%lx>",
+ sec_name,
+ (unsigned long)off,
+ ds->name,
+ (unsigned long)(off - ds->addr));
+ else
+ printf("%s+0x%lx", sec_name,
+ (unsigned long)off);
+ }
+ }
+ } else if (ctx->fde_sec) {
+ u64 field_addr = ctx->fde_sec->sh_addr +
+ i * sizeof(struct lr_fde);
+ u64 pc = field_addr + (s64)fde->start_offset;
+ const struct dump_sym *ds =
+ find_dump_sym(dsyms, nr_dsyms, 0, pc);
+
+ if (ds)
+ printf("0x%016lx <%s+0x%lx>", (unsigned long)pc,
+ ds->name, (unsigned long)(pc - ds->addr));
+ else
+ printf("0x%016lx", (unsigned long)pc);
+ }
+
+ if (desc & LR_FDE_INLINE)
+ printf(" (len=0x%x, inline, sp_off=0x%x):\n",
+ total_insns << 2, sp_off);
+ else
+ printf(" (len=0x%x, ool[%u..%u), sp_off=0x%x):\n",
+ total_insns << 2, LR_OOL_IDX(desc),
+ LR_OOL_IDX(desc) + r_cnt, sp_off);
+
+ for (u32 j = 0; j < r_cnt; j++) {
+ u32 len = LR_RANGE_LEN(r_list[j]);
+ enum lr_unwind_mode mode = LR_RANGE_MODE(r_list[j]);
+
+ if (!len)
+ continue;
+ printf(" [+0x%04x..+0x%04x) %4u insns %s",
+ insn_off << 2, (insn_off + len) << 2,
+ len, mode_name(mode));
+ if (mode == LR_UNWIND_SP)
+ printf(" (sp+0x%x)", sp_off);
+ printf("\n");
+ insn_off += len;
+ }
+ }
+
+ free(dsyms);
+ return 0;
+}
+
int main(int argc, char *argv[])
{
struct lr_unwind_ctx ctx = { 0 };
@@ -485,22 +713,29 @@ int main(int argc, char *argv[])
const Elf64_Ehdr *ehdr;
const Elf64_Shdr *shdrs;
const char *shstrtab;
+ const char *fname;
+ bool dump = false;
struct stat sb;
int fd, ret = 1;
- if (argc != 2) {
- fprintf(stderr, "Usage: %s <file>\n", argv[0]);
+ if (argc == 3 && (!strcmp(argv[1], "--dump") || !strcmp(argv[1], "-d"))) {
+ dump = true;
+ fname = argv[2];
+ } else if (argc == 2 && argv[1][0] != '-') {
+ fname = argv[1];
+ } else {
+ fprintf(stderr, "Usage: %s [--dump] <file>\n", argv[0]);
return 1;
}
- fd = open(argv[1], O_RDONLY);
+ fd = open(fname, O_RDONLY);
if (fd < 0) {
fprintf(stderr, "gen_lr_unwind: cannot open %s: %s\n",
- argv[1], strerror(errno));
+ fname, strerror(errno));
return 1;
}
if (fstat(fd, &sb) < 0 || (size_t)sb.st_size < sizeof(Elf64_Ehdr)) {
- fprintf(stderr, "gen_lr_unwind: invalid file %s\n", argv[1]);
+ fprintf(stderr, "gen_lr_unwind: invalid file %s\n", fname);
close(fd);
return 1;
}
@@ -510,7 +745,7 @@ int main(int argc, char *argv[])
close(fd);
if (ctx.map == MAP_FAILED) {
fprintf(stderr, "gen_lr_unwind: mmap failed on %s: %s\n",
- argv[1], strerror(errno));
+ fname, strerror(errno));
return 1;
}
@@ -518,10 +753,12 @@ int main(int argc, char *argv[])
if (memcmp(ehdr->e_ident, ELFMAG, SELFMAG) ||
ehdr->e_ident[EI_CLASS] != ELFCLASS64 ||
ehdr->e_ident[EI_DATA] != ELFDATA2LSB ||
- ehdr->e_type != ET_REL ||
+ (!dump && ehdr->e_type != ET_REL) ||
+ (dump && ehdr->e_type != ET_REL && ehdr->e_type != ET_EXEC &&
+ ehdr->e_type != ET_DYN) ||
ehdr->e_machine != EM_AARCH64) {
- fprintf(stderr, "gen_lr_unwind: %s is not an AArch64 ET_REL ELF\n",
- argv[1]);
+ fprintf(stderr, "gen_lr_unwind: unsupported ELF file %s\n",
+ fname);
goto out;
}
@@ -536,6 +773,10 @@ int main(int argc, char *argv[])
if (!strcmp(name, ".lr_unwind_fde"))
ctx.fde_sec = &shdrs[i];
+ else if (!strcmp(name, ".rela.lr_unwind_fde"))
+ ctx.rela_fde_sec = &shdrs[i];
+ else if (!strcmp(name, ".lr_unwind_ranges"))
+ ctx.ranges_sec = &shdrs[i];
else if (!strcmp(name, ".eh_frame") ||
!strcmp(name, ".init.eh_frame"))
ctx.eh_sec = &shdrs[i];
@@ -546,6 +787,11 @@ int main(int argc, char *argv[])
ctx.symtab_shndx = i;
}
+ if (dump) {
+ ret = dump_lr_unwind(&ctx, shdrs, shnum, shstrtab) ? 1 : 0;
+ goto out;
+ }
+
if (ctx.fde_sec) {
ret = 0;
goto out;
@@ -558,11 +804,11 @@ int main(int argc, char *argv[])
if (!parse_eh_frame(&ctx) &&
(!ctx.nr_fdes ||
- !emit_lr_unwind_sections(argv[1], &ctx, shnum, shstrndx)))
+ !emit_lr_unwind_sections(fname, &ctx, shnum, shstrndx)))
ret = 0;
else
fprintf(stderr, "gen_lr_unwind: failed to generate .lr_unwind for %s\n",
- argv[1]);
+ fname);
out:
if (ctx.map)
--
2.56.0.679.gc527c65306-goog
next prev parent reply other threads:[~2026-11-17 4:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 4:34 [RFC PATCH 00/12] arm64, unwind: add .lr_unwind unwinder for reliable stacktrace Dylan Hatch
2026-11-17 4:34 ` [RFC PATCH 01/12] arm64, unwind: build with .eh_frame and add gen_lr_unwind skeleton Dylan Hatch
2026-11-17 4:34 ` [RFC PATCH 02/12] arm64: factor .eh_frame parser out of patch-scs.c into <asm/eh_frame.h> Dylan Hatch
2026-11-17 4:34 ` [RFC PATCH 03/12] arm64: eh_frame: track CFA and x29/x30 register state in CFI parser Dylan Hatch
2026-11-17 4:34 ` [RFC PATCH 04/12] arm64, unwind: parse .eh_frame into .lr_unwind entries in gen_lr_unwind Dylan Hatch
2026-11-17 4:34 ` [RFC PATCH 05/12] scripts/gen_lr_unwind: emit .lr_unwind_fde and .lr_unwind_ranges Dylan Hatch
2026-11-17 4:34 ` Dylan Hatch [this message]
2026-11-17 4:34 ` [RFC PATCH 07/12] scripts/sorttable: sort .lr_unwind_fde by start_offset Dylan Hatch
2026-11-17 4:35 ` [RFC PATCH 08/12] arm64, unwind: add in-kernel .lr_unwind lookup and validation Dylan Hatch
2026-11-17 4:35 ` [RFC PATCH 09/12] arm64/module, unwind: add .lr_unwind support for modules Dylan Hatch
2026-11-17 4:35 ` [RFC PATCH 10/12] arm64: entry: add unwind info for call_on_irq_stack() Dylan Hatch
2026-11-17 4:35 ` [RFC PATCH 11/12] arm64, crypto/lib: annotate leaf functions with CFI info Dylan Hatch
2026-11-17 4:35 ` [RFC PATCH 12/12] unwind: arm64: use .lr_unwind to unwind interrupt frames Dylan Hatch
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=20261117043504.1021063-7-dylanbhatch@google.com \
--to=dylanbhatch@google.com \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=ibhagatgnu@gmail.com \
--cc=jpoimboe@kernel.org \
--cc=jremus@linux.ibm.com \
--cc=justinstitt@google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=live-patching@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=mark.rutland@arm.com \
--cc=morbo@google.com \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nsc@kernel.org \
--cc=ptsm@linux.microsoft.com \
--cc=rostedt@goodmis.org \
--cc=will@kernel.org \
--cc=wnliu@google.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