From 045761a60c8beb28e82b68e284bf8e395036688f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 27 Sep 2022 16:21:26 +0200 Subject: [PATCH 37/96] kernel: when KALLSYMS is disabled, print module address + size for matching backtrace entries [john@phrozen.org: felix will add this to his upstream queue] lede-commit 53827cdc824556cda910b23ce5030c363b8f1461 Signed-off-by: Felix Fietkau --- lib/vsprintf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 3c1853a9d1c0..9803f88d7d21 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -980,8 +980,10 @@ char *symbol_string(char *buf, char *end, void *ptr, struct printf_spec spec, const char *fmt) { unsigned long value; -#ifdef CONFIG_KALLSYMS char sym[KSYM_SYMBOL_LEN]; +#ifndef CONFIG_KALLSYMS + struct module *mod; + int len; #endif if (fmt[1] == 'R') @@ -1002,8 +1004,14 @@ char *symbol_string(char *buf, char *end, void *ptr, return string_nocheck(buf, end, sym, spec); #else - return special_hex_number(buf, end, value, sizeof(void *)); + len = snprintf(sym, sizeof(sym), "0x%lx", value); + mod = __module_address(value); + if (mod) + snprintf(sym + len, sizeof(sym) - len, " [%s@%p+0x%x]", + mod->name, mod->core_layout.base, + mod->core_layout.size); #endif + return string(buf, end, sym, spec); } static const struct printf_spec default_str_spec = { -- 2.37.2