| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748 |
- From: Felix Fietkau <[email protected]>
- Subject: kernel: when KALLSYMS is disabled, print module address + size for matching backtrace entries
- [[email protected]: felix will add this to his upstream queue]
- [email protected]: fixed FTB when CONFIG_MODULES=n
- lede-commit 53827cdc824556cda910b23ce5030c363b8f1461
- Signed-off-by: Felix Fietkau <[email protected]>
- Signed-off-by: Maksim Dmitrichenko <[email protected]>
- ---
- lib/vsprintf.c | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
- --- a/lib/vsprintf.c
- +++ b/lib/vsprintf.c
- @@ -990,8 +990,12 @@ char *symbol_string(char *buf, char *end
- struct printf_spec spec, const char *fmt)
- {
- unsigned long value;
- -#ifdef CONFIG_KALLSYMS
- char sym[KSYM_SYMBOL_LEN];
- +#ifndef CONFIG_KALLSYMS
- +#ifdef CONFIG_MODULES
- + struct module *mod;
- +#endif
- + int len;
- #endif
-
- if (fmt[1] == 'R')
- @@ -1012,8 +1016,16 @@ char *symbol_string(char *buf, char *end
-
- 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);
- +#ifdef CONFIG_MODULES
- + mod = __module_address(value);
- + if (mod)
- + snprintf(sym + len, sizeof(sym) - len, " [%s@%p+0x%x]",
- + mod->name, mod->mem[MOD_TEXT].base,
- + mod->mem[MOD_TEXT].size);
- +#endif
- #endif
- + return string(buf, end, sym, spec);
- }
-
- static const struct printf_spec default_str_spec = {
|
