ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-12 07:53:07 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

kernel: fix regression in backtrace module info change (#19631)

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

SVN-Revision: 45665
This commit is contained in:
Felix Fietkau 2015-05-10 13:16:40 +00:00
parent 64661de100
commit 9ebb99cb98
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
target/linux/generic/patches-3.18/205-backtrace_module_info.patch
View File

@ -1,38 +1,36 @@
--- a/lib/vsprintf.c --- a/lib/vsprintf.c
+++ b/lib/vsprintf.c +++ b/lib/vsprintf.c
@@ -613,10 +613,12 @@ static noinline_for_stack @@ -614,8 +614,10 @@ char *symbol_string(char *buf, char *end
char *symbol_string(char *buf, char *end, void *ptr,
struct printf_spec spec, const char *fmt) struct printf_spec spec, const char *fmt)
{ {
+#ifndef CONFIG_KALLSYMS
+ struct module *mod;
+#endif
unsigned long value; unsigned long value;
-#ifdef CONFIG_KALLSYMS -#ifdef CONFIG_KALLSYMS
char sym[KSYM_SYMBOL_LEN]; char sym[KSYM_SYMBOL_LEN];
-#endif +#ifndef CONFIG_KALLSYMS
+ struct module *mod;
+ int len; + int len;
#endif
if (fmt[1] == 'R') if (fmt[1] == 'R')
ptr = __builtin_extract_return_addr(ptr); @@ -629,15 +631,15 @@ char *symbol_string(char *buf, char *end
@@ -630,13 +632,15 @@ char *symbol_string(char *buf, char *end sprint_symbol(sym, value);
else else
sprint_symbol_no_offset(sym, value); sprint_symbol_no_offset(sym, value);
-
- return string(buf, end, sym, spec); - return string(buf, end, sym, spec);
#else #else
- spec.field_width = 2 * sizeof(void *); - spec.field_width = 2 * sizeof(void *);
- spec.flags |= SPECIAL | SMALL | ZEROPAD; - spec.flags |= SPECIAL | SMALL | ZEROPAD;
- spec.base = 16; - spec.base = 16;
+ len = snprintf(sym, sizeof(sym), "0x%lx", value); + len = snprintf(sym, sizeof(sym), "0x%lx", value);
+
- return number(buf, end, value, spec);
+ mod = __module_address(value); + mod = __module_address(value);
+ if (mod) + if (mod)
+ snprintf(sym + len, sizeof(sym) - len, " [%s@%p+0x%x]", + snprintf(sym + len, sizeof(sym) - len, " [%s@%p+0x%x]",
+ mod->name, mod->module_core, mod->core_size); + mod->name, mod->module_core, mod->core_size);
- return number(buf, end, value, spec);
+ return string(buf, end, sym, spec);
#endif #endif
+ return string(buf, end, sym, spec);
} }
static noinline_for_stack

24
target/linux/generic/patches-4.0/205-backtrace_module_info.patch
View File

@ -1,38 +1,36 @@
--- a/lib/vsprintf.c --- a/lib/vsprintf.c
+++ b/lib/vsprintf.c +++ b/lib/vsprintf.c
@@ -614,10 +614,12 @@ static noinline_for_stack @@ -615,8 +615,10 @@ char *symbol_string(char *buf, char *end
char *symbol_string(char *buf, char *end, void *ptr,
struct printf_spec spec, const char *fmt) struct printf_spec spec, const char *fmt)
{ {
+#ifndef CONFIG_KALLSYMS
+ struct module *mod;
+#endif
unsigned long value; unsigned long value;
-#ifdef CONFIG_KALLSYMS -#ifdef CONFIG_KALLSYMS
char sym[KSYM_SYMBOL_LEN]; char sym[KSYM_SYMBOL_LEN];
-#endif +#ifndef CONFIG_KALLSYMS
+ struct module *mod;
+ int len; + int len;
#endif
if (fmt[1] == 'R') if (fmt[1] == 'R')
ptr = __builtin_extract_return_addr(ptr); @@ -630,15 +632,15 @@ char *symbol_string(char *buf, char *end
@@ -631,13 +633,15 @@ char *symbol_string(char *buf, char *end sprint_symbol(sym, value);
else else
sprint_symbol_no_offset(sym, value); sprint_symbol_no_offset(sym, value);
-
- return string(buf, end, sym, spec); - return string(buf, end, sym, spec);
#else #else
- spec.field_width = 2 * sizeof(void *); - spec.field_width = 2 * sizeof(void *);
- spec.flags |= SPECIAL | SMALL | ZEROPAD; - spec.flags |= SPECIAL | SMALL | ZEROPAD;
- spec.base = 16; - spec.base = 16;
+ len = snprintf(sym, sizeof(sym), "0x%lx", value); + len = snprintf(sym, sizeof(sym), "0x%lx", value);
+
- return number(buf, end, value, spec);
+ mod = __module_address(value); + mod = __module_address(value);
+ if (mod) + if (mod)
+ snprintf(sym + len, sizeof(sym) - len, " [%s@%p+0x%x]", + snprintf(sym + len, sizeof(sym) - len, " [%s@%p+0x%x]",
+ mod->name, mod->module_core, mod->core_size); + mod->name, mod->module_core, mod->core_size);
- return number(buf, end, value, spec);
+ return string(buf, end, sym, spec);
#endif #endif
+ return string(buf, end, sym, spec);
} }
static noinline_for_stack