xtensa: improve stack dumping
Max Filippov
maintainerv3 cover xtensa: improve stack dumping
Hello,
this series cleans up code around stack_dump and makes dump size configurable.
Changes v2->v3:
- split Kconfig change into separate patch
- use symbolic names instead of hardcoded numbers
Changes v1->v2:
- use print_hex_dump.
Max Filippov (2):
xtensa: improve stack dumping
xtensa: make stack dump size configurable
arch/xtensa/Kconfig.debug | 7 +++++++ arch/xtensa/kernel/traps.c | 27 +++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-)
Signature · 1 line
2.20.1
Max Filippov
maintainerPATCH v3 1/2 xtensa: improve stack dumping
Calculate printable stack size and use print_hex_dump instead of opencoding it.
Drop extra newline output in show_trace as its output format does not depend on CONFIG_KALLSYMS.
---
Changes v2->v3:
- split Kconfig change into separate patch
- use symbolic names instead of hardcoded numbers
Changes v1->v2:
- use print_hex_dump.
arch/xtensa/kernel/traps.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)
arch/xtensa/kernel/traps.c +11 -16
@@ -491,32 +491,27 @@ void show_trace(struct task_struct *task, unsigned long *sp)pr_info ("Call Trace:\n" );walk_stackframe (sp, show_trace_cb,NULL ); -#ifndef CONFIG_KALLSYMS -pr_cont ("\n" ); -#endif } -static int kstack_depth_to_print =24 ; +#define STACK_DUMP_ENTRY_SIZE 4 +#define STACK_DUMP_LINE_SIZE 32 +static size_t kstack_depth_to_print =24 ;void show_stack (struct task_struct *task,unsigned long *sp) { -int i =0 ; -unsigned long *stack; +size_t len;if (!sp) sp =stack_pointer (task); - stack = sp; -pr_info ("Stack:\n" ); + len =min ((-(size_t )sp) & (THREAD_SIZE -STACK_DUMP_ENTRY_SIZE ), + kstack_depth_to_print *STACK_DUMP_ENTRY_SIZE ); -for (i =0 ; i < kstack_depth_to_print; i++) { -if (kstack_end (sp)) -break ; -pr_cont (" %08lx" , *sp++); -if (i %8 ==7 ) -pr_cont ("\n" ); - } -show_trace (task, stack); +pr_info ("Stack:\n" ); +print_hex_dump (KERN_INFO ," " ,DUMP_PREFIX_NONE , +STACK_DUMP_LINE_SIZE ,STACK_DUMP_ENTRY_SIZE , + sp, len, false); +show_trace (task, sp); }DEFINE_SPINLOCK (die_lock);
Signature · 1 line
2.20.1
Max Filippov
maintainerPATCH v3 2/2 xtensa: make stack dump size configurable
In reply to Max FilippovIntroduce Kconfig symbol PRINT_STACK_DEPTH and use it to initialize kstack_depth_to_print.
---
Changes v2->v3:
- split Kconfig change into separate patch
arch/xtensa/Kconfig.debug | 7 +++++++ arch/xtensa/kernel/traps.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
arch/xtensa/Kconfig.debug +7 -0
@@ -31,3 +31,10 @@ config S32C1I_SELFTEST It is easy to make wrong hardware configuration, this test should catch it early. Say 'N' on stable hardware. + +config PRINT_STACK_DEPTH + int "Stack depth to print" if DEBUG_KERNEL + default 64 + help + This option allows you to set the stack depth that the kernel + prints in stack traces.
arch/xtensa/kernel/traps.c +1 -1
@@ -495,7 +495,7 @@ void show_trace(struct task_struct *task, unsigned long *sp)#define STACK_DUMP_ENTRY_SIZE 4#define STACK_DUMP_LINE_SIZE 32 -static size_t kstack_depth_to_print =24 ; +static size_t kstack_depth_to_print =CONFIG_PRINT_STACK_DEPTH ;void show_stack (struct task_struct *task,unsigned long *sp) {
Signature · 1 line
2.20.1