[PATCH v9 07/11] sframe: Add debug helpers with object name
From: Dylan Hatch
Date: Mon Nov 16 2026 - 21:07:23 EST
Include the object name for kernel .sframe sections, indicated with the
format "(<module-name>)" or "(vmlinux)".
Suggested-by: Jens Remus <jremus@xxxxxxxxxxxxx>
Reviewed-by: Jens Remus <jremus@xxxxxxxxxxxxx>
Signed-off-by: Dylan Hatch <dylanbhatch@xxxxxxxxxx>
---
Changes since v8:
- (sashiko) Include <linux/container_of.h>, <linux/module.h>,
<linux/printk.h>, and <linux/stddef.h> in sframe_debug.h.
---
kernel/unwind/sframe.c | 11 +++++++----
kernel/unwind/sframe_debug.h | 38 ++++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 4 deletions(-)
create mode 100644 kernel/unwind/sframe_debug.h
diff --git a/kernel/unwind/sframe.c b/kernel/unwind/sframe.c
index d5c1c8148dadd..4d804f2ad9dde 100644
--- a/kernel/unwind/sframe.c
+++ b/kernel/unwind/sframe.c
@@ -19,6 +19,7 @@
#include <asm/unwind_sframe.h>
#include "sframe.h"
+#include "sframe_debug.h"
static bool sframe_init __ro_after_init;
struct sframe_section kernel_sfsec __ro_after_init;
@@ -516,7 +517,7 @@ static int sframe_read_header(struct sframe_section *sec)
if (check_add_overflow(sec->sframe_start, sizeof(struct sframe_header), &header_end) ||
header_end >= sec->sframe_end) {
- pr_debug("header struct doesn't fit in section\n");
+ dbg_sec(sec, "header struct doesn't fit in section\n");
return -EINVAL;
}
@@ -526,12 +527,12 @@ static int sframe_read_header(struct sframe_section *sec)
shdr->preamble.version != SFRAME_VERSION_3 ||
!(shdr->preamble.flags & SFRAME_F_FDE_FUNC_START_PCREL) ||
shdr->auxhdr_len) {
- pr_debug("bad/unsupported sframe header\n");
+ dbg_sec(sec, "bad/unsupported sframe header\n");
return -EINVAL;
}
if (!shdr->num_fdes || !shdr->num_fres) {
- pr_debug("no fde/fre entries\n");
+ dbg_sec(sec, "no fde/fre entries\n");
return -EINVAL;
}
@@ -542,7 +543,7 @@ static int sframe_read_header(struct sframe_section *sec)
check_add_overflow(header_end, shdr->fres_off, &fres_start) ||
check_add_overflow(fres_start, shdr->fre_len, &fres_end) ||
fres_start < fdes_end || fres_end > sec->sframe_end) {
- pr_debug("inconsistent fde/fre offsets\n");
+ dbg_sec(sec, "inconsistent fde/fre offsets\n");
return -EINVAL;
}
@@ -569,6 +570,7 @@ void __init init_sframe_table(void)
}
sframe_init = true;
+ dbg_print_header(&kernel_sfsec);
}
#ifdef CONFIG_MODULES
@@ -629,6 +631,7 @@ void sframe_module_init(struct module *mod, void *addr, unsigned int size)
/* Ensure SFrame is initialized when sframe_find() happens */
smp_store_release(&mod->sframe_init, true);
+ dbg_print_header(sec);
}
#endif
diff --git a/kernel/unwind/sframe_debug.h b/kernel/unwind/sframe_debug.h
new file mode 100644
index 0000000000000..748d69ff6c103
--- /dev/null
+++ b/kernel/unwind/sframe_debug.h
@@ -0,0 +1,38 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _SFRAME_DEBUG_H
+#define _SFRAME_DEBUG_H
+
+#include <linux/container_of.h>
+#include <linux/module.h>
+#include <linux/printk.h>
+#include <linux/sframe.h>
+#include <linux/stddef.h>
+#include "sframe.h"
+
+#ifdef CONFIG_MODULES
+
+#define objname(sec) ((sec) == &kernel_sfsec \
+ ? "vmlinux" \
+ : container_of((sec), struct module, sframe_sec)->name)
+
+#else
+
+#define objname(...) "vmlinux"
+
+#endif
+
+#define dbg_sec(sec, fmt, ...) \
+ pr_debug("(%s): " fmt, objname(sec), ##__VA_ARGS__)
+
+static __always_inline void dbg_print_header(struct sframe_section *sec)
+{
+ unsigned long fdes_end;
+
+ fdes_end = sec->fdes_start + (sec->num_fdes * sizeof(struct sframe_fde_v3));
+
+ dbg_sec(sec, "SEC:0x%lx-0x%lx fdes:0x%lx-0x%lx fres:0x%lx-0x%lx ra_off:%d fp_off:%d\n",
+ sec->sframe_start, sec->sframe_end, sec->fdes_start, fdes_end, sec->fres_start,
+ sec->fres_end, sec->ra_off, sec->fp_off);
+}
+
+#endif /* _SFRAME_DEBUG_H */
--
2.56.0.679.gc527c65306-goog