tile: improve stack backtrace
PATCH 1/1 tile: improve stack backtrace
This commit fixes a number of issues with the tile backtrace code.
- Don't try to identify userspace shared object or executable paths if we are doing a backtrace from an interrupt; it's not legal, and also unlikely to be interesting. Likewise, don't try to do it for other address spaces, since d_path() assumes it is being called in "current" context.
- Move "in_backtrace" from thread_struct to thread_info. This way we can access it even if our stack thread_info has been clobbered, which makes backtracing more robust.
- Avoid using "current" directly when testing for is_sigreturn(). Since "current" may be corrupt, we're better off using kbt->task explicitly to look up the vdso_base for the current task. Conveniently, this simplifies the internal APIs (we only need one is_sigreturn() function now).
- Avoid bogus "Odd fault" warning when pc/sp/ex1 are all zero, as is true for kernel threads above the last frame.
- Hook into Tejun Heo's dump_stack() framework in lib/dump_stack.c.
- Write last entry in save_stack_trace() as ULONG_MAX, not zero, since ftrace (at least) relies on finding that marker.
- Implement save_stack_trace_regs() and save_strack_trace_user(), and set CONFIG_USER_STACKTRACE_SUPPORT.
--- arch/tile/Kconfig | 1 + arch/tile/include/asm/processor.h | 2 - arch/tile/include/asm/stack.h | 13 ++-- arch/tile/include/asm/thread_info.h | 1 + arch/tile/kernel/entry.S | 7 -- arch/tile/kernel/process.c | 36 +++++++---- arch/tile/kernel/stack.c | 125 +++++++++++++++++++++--------------- arch/tile/kernel/traps.c | 3 + arch/tile/lib/exports.c | 1 - 9 files changed, 107 insertions(+), 82 deletions(-)
arch/tile/Kconfig +1 -0
@@ -24,6 +24,7 @@ config TILE select MODULES_USE_ELF_RELA select HAVE_ARCH_TRACEHOOK select HAVE_SYSCALL_TRACEPOINTS + select USER_STACKTRACE_SUPPORT select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select HAVE_DEBUG_STACKOVERFLOW select ARCH_WANT_FRAME_POINTERS
arch/tile/include/asm/processor.h +0 -2
@@ -111,8 +111,6 @@ struct thread_struct {unsigned long long interrupt_mask;/* User interrupt-control 0 state */ unsigned long intctrl_0; -/* Is this task currently doing a backtrace? */ -bool in_backtrace;/* Any other miscellaneous processor state bits */ unsigned long proc_status;#if !CHIP_HAS_FIXED_INTVEC_BASE ()
arch/tile/include/asm/stack.h +5 -8
@@ -58,17 +58,14 @@ extern int KBacktraceIterator_end(struct KBacktraceIterator *kbt);/* Advance to the next frame. */ extern void KBacktraceIterator_next (struct KBacktraceIterator *kbt); +/* Dump just the contents of the pt_regs structure. */ +extern void tile_show_regs (struct pt_regs *); +/* * Dump stack given complete register info. Use only from the * architecture-specific code; show_stack() -* and dump_stack() (in entry.S) are architecture-independent entry points. +* and dump_stack() are architecture-independent entry points. */ -extern void tile_show_stack (struct KBacktraceIterator *,int headers); - -/* Dump stack of current process, with registers to seed the backtrace. */ -extern void dump_stack_regs (struct pt_regs *); - -/* Helper method for assembly dump_stack(). */ -extern void _dump_stack (int dummy,ulong pc,ulong lr,ulong sp,ulong r52); +extern void tile_show_stack (struct KBacktraceIterator *);#endif /* _ASM_TILE_STACK_H */
arch/tile/include/asm/thread_info.h +1 -0
@@ -42,6 +42,7 @@ struct thread_info {unsigned long unalign_jit_tmp[4 ];/* temp r0..r3 storage */ void __user *unalign_jit_base;/* unalign fixup JIT base */ #endif +bool in_backtrace;/* currently doing backtrace? */ };/*
arch/tile/kernel/entry.S +0 -7
@@ -27,13 +27,6 @@ STD_ENTRY(current_text_addr) { move r0, lr; jrp lr } STD_ENDPROC(current_text_addr) -STD_ENTRY(dump_stack) - { move r2, lr; lnk r1 } - { move r4, r52; addli r1, r1, dump_stack - . } - { move r3, sp; j _dump_stack } - jrp lr /* keep backtracer happy */ - STD_ENDPROC(dump_stack) - STD_ENTRY(KBacktraceIterator_init_current) { move r2, lr; lnk r1 } { move r4, r52; addli r1, r1, KBacktraceIterator_init_current - . }
arch/tile/kernel/process.c +23 -13
@@ -546,33 +546,43 @@ void exit_thread(void)#endif } -void show_regs (struct pt_regs *regs) +void tile_show_regs (struct pt_regs *regs) { -struct task_struct *tsk =validate_current ();int i; - -if (tsk != &corrupt_current) -show_regs_print_info (KERN_ERR );#ifdef __tilegx__for (i =0 ; i <17 ; i++) -pr_err (" r%-2d: " REGFMT " r%-2d: " REGFMT " r%-2d: " REGFMT "\n" , +pr_err (" r%-2d: " REGFMT " r%-2d: " REGFMT " r%-2d: " REGFMT "\n" , i, regs->regs[i], i+18 , regs->regs[i+18 ], i+36 , regs->regs[i+36 ]); -pr_err (" r17: " REGFMT " r35: " REGFMT " tp : " REGFMT "\n" , +pr_err (" r17: " REGFMT " r35: " REGFMT " tp : " REGFMT "\n" , regs->regs[17 ], regs->regs[35 ], regs->tp); -pr_err (" sp : " REGFMT " lr : " REGFMT "\n" , regs->sp, regs->lr); +pr_err (" sp : " REGFMT " lr : " REGFMT "\n" , regs->sp, regs->lr);#else for (i =0 ; i <13 ; i++) -pr_err (" r%-2d: " REGFMT " r%-2d: " REGFMT " r%-2d: " REGFMT " r%-2d: " REGFMT "\n" , +pr_err (" r%-2d: " REGFMT " r%-2d: " REGFMT +" r%-2d: " REGFMT " r%-2d: " REGFMT "\n" , i, regs->regs[i], i+14 , regs->regs[i+14 ], i+27 , regs->regs[i+27 ], i+40 , regs->regs[i+40 ]); -pr_err (" r13: " REGFMT " tp : " REGFMT " sp : " REGFMT " lr : " REGFMT "\n" , +pr_err (" r13: " REGFMT " tp : " REGFMT " sp : " REGFMT " lr : " REGFMT "\n" , regs->regs[13 ], regs->tp, regs->sp, regs->lr);#endif -pr_err (" pc : " REGFMT " ex1: %ld faultnum: %ld\n" , - regs->pc, regs->ex1, regs->faultnum); +pr_err (" pc : " REGFMT " ex1: %ld faultnum: %ld flags:%s%s%s%s\n" , + regs->pc, regs->ex1, regs->faultnum, +is_compat_task () ?" compat" :"" , + (regs->flags &PT_FLAGS_DISABLE_IRQ ) ?" noirq" :"" , + !(regs->flags &PT_FLAGS_CALLER_SAVES ) ?" nocallersave" :"" , + (regs->flags &PT_FLAGS_RESTORE_REGS ) ?" restoreregs" :"" ); +} + +void show_regs (struct pt_regs *regs) +{ +struct KBacktraceIterator kbt; + +show_regs_print_info (KERN_DEFAULT ); +tile_show_regs (regs); -dump_stack_regs (regs); +KBacktraceIterator_init (&kbt,NULL , regs); +tile_show_stack (&kbt); }/* To ensure stack dump on tiles occurs one by one. */
arch/tile/kernel/stack.c +74 -51
261 lines not on this page · raw message
arch/tile/kernel/traps.c +3 -0
@@ -407,6 +407,9 @@ void do_nmi(struct pt_regs *regs, int fault_num, unsigned long reason) } } +/* Deprecated function currently only used here. */ +extern void _dump_stack (int dummy,ulong pc,ulong lr,ulong sp,ulong r52); +void kernel_double_fault (int dummy,ulong pc,ulong lr,ulong sp,ulong r52) {_dump_stack (dummy, pc, lr, sp, r52);
arch/tile/lib/exports.c +0 -1
@@ -26,7 +26,6 @@ EXPORT_SYMBOL(finv_user_asm);#include <linux/kernel.h> #include <asm/processor.h> EXPORT_SYMBOL (current_text_addr); -EXPORT_SYMBOL (dump_stack);/* arch/tile/kernel/head.S */ EXPORT_SYMBOL (empty_zero_page);
Signature · 1 line
2.1.2