summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-05-10 00:02:18 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-05-10 00:02:18 +0000
commit53827cdc824556cda910b23ce5030c363b8f1461 (patch)
tree3e395913a07ab9ae25a18440097d29bc969b9948
parent53a5647414838b204bf21ff33781374588feb737 (diff)
downloadmaster-31e0f0ae-53827cdc824556cda910b23ce5030c363b8f1461.tar.gz
master-31e0f0ae-53827cdc824556cda910b23ce5030c363b8f1461.tar.bz2
master-31e0f0ae-53827cdc824556cda910b23ce5030c363b8f1461.zip
kernel: when KALLSYMS is disabled, print module address + size for matching backtrace entries
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45655
-rw-r--r--target/linux/generic/patches-3.18/205-backtrace_module_info.patch38
-rw-r--r--target/linux/generic/patches-4.0/205-backtrace_module_info.patch38
2 files changed, 76 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/205-backtrace_module_info.patch b/target/linux/generic/patches-3.18/205-backtrace_module_info.patch
new file mode 100644
index 0000000000..594871b715
--- /dev/null
+++ b/target/linux/generic/patches-3.18/205-backtrace_module_info.patch
@@ -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
+ }
+
diff --git a/target/linux/generic/patches-4.0/205-backtrace_module_info.patch b/target/linux/generic/patches-4.0/205-backtrace_module_info.patch
new file mode 100644
index 0000000000..8417d609d3
--- /dev/null
+++ b/target/linux/generic/patches-4.0/205-backtrace_module_info.patch
@@ -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
+ }
+