205-backtrace_module_info.patch 974 B

1234567891011121314151617181920212223242526272829303132333435363738
  1. --- a/lib/vsprintf.c
  2. +++ b/lib/vsprintf.c
  3. @@ -613,10 +613,12 @@ static noinline_for_stack
  4. char *symbol_string(char *buf, char *end, void *ptr,
  5. struct printf_spec spec, const char *fmt)
  6. {
  7. +#ifndef CONFIG_KALLSYMS
  8. + struct module *mod;
  9. +#endif
  10. unsigned long value;
  11. -#ifdef CONFIG_KALLSYMS
  12. char sym[KSYM_SYMBOL_LEN];
  13. -#endif
  14. + int len;
  15. if (fmt[1] == 'R')
  16. ptr = __builtin_extract_return_addr(ptr);
  17. @@ -630,13 +632,15 @@ char *symbol_string(char *buf, char *end
  18. else
  19. sprint_symbol_no_offset(sym, value);
  20. - return string(buf, end, sym, spec);
  21. #else
  22. - spec.field_width = 2 * sizeof(void *);
  23. - spec.flags |= SPECIAL | SMALL | ZEROPAD;
  24. - spec.base = 16;
  25. + len = snprintf(sym, sizeof(sym), "0x%lx", value);
  26. +
  27. + mod = __module_address(value);
  28. + if (mod)
  29. + snprintf(sym + len, sizeof(sym) - len, " [%s@%p+0x%x]",
  30. + mod->name, mod->module_core, mod->core_size);
  31. - return number(buf, end, value, spec);
  32. + return string(buf, end, sym, spec);
  33. #endif
  34. }