EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kernel: when KALLSYMS is disabled, print module address + size for matching backtrace entries

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 45655
This commit is contained in:
Felix Fietkau 2015-05-10 00:02:18 +00:00
parent 53a5647414
commit 53827cdc82
2 changed files with 76 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
target/linux/generic/patches-3.18/205-backtrace_module_info.patch Normal file
View File

@ -0,0 +1,38 @@
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -613,10 +613,12 @@ static noinline_for_stack
char *symbol_string(char *buf, char *end, void *ptr,
struct printf_spec spec, const char *fmt)
{
+#ifndef CONFIG_KALLSYMS
+ struct module *mod;
+#endif
unsigned long value;
-#ifdef CONFIG_KALLSYMS
char sym[KSYM_SYMBOL_LEN];
-#endif
+ int len;
if (fmt[1] == 'R')
ptr = __builtin_extract_return_addr(ptr);
@@ -630,13 +632,15 @@ char *symbol_string(char *buf, char *end
else
sprint_symbol_no_offset(sym, value);
- return string(buf, end, sym, spec);
#else
- spec.field_width = 2 * sizeof(void *);
- spec.flags |= SPECIAL | SMALL | ZEROPAD;
- spec.base = 16;
+ 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->module_core, mod->core_size);
- return number(buf, end, value, spec);
+ return string(buf, end, sym, spec);
#endif
}

38
target/linux/generic/patches-4.0/205-backtrace_module_info.patch Normal file
View File

@ -0,0 +1,38 @@
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -614,10 +614,12 @@ static noinline_for_stack
char *symbol_string(char *buf, char *end, void *ptr,
struct printf_spec spec, const char *fmt)
{
+#ifndef CONFIG_KALLSYMS
+ struct module *mod;
+#endif
unsigned long value;
-#ifdef CONFIG_KALLSYMS
char sym[KSYM_SYMBOL_LEN];
-#endif
+ int len;
if (fmt[1] == 'R')
ptr = __builtin_extract_return_addr(ptr);
@@ -631,13 +633,15 @@ char *symbol_string(char *buf, char *end
else
sprint_symbol_no_offset(sym, value);
- return string(buf, end, sym, spec);
#else
- spec.field_width = 2 * sizeof(void *);
- spec.flags |= SPECIAL | SMALL | ZEROPAD;
- spec.base = 16;
+ 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->module_core, mod->core_size);
- return number(buf, end, value, spec);
+ return string(buf, end, sym, spec);
#endif
}