x86/debug changes for v4.1
Subsystems (2)
Linus,
Please pull the latest x86-debug-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-debug-for-linus
# HEAD: 6d4d1984df1ca6347414b9d8fa4783f548ee4cc8 Merge tag 'tip_x86_kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/debug
Stack printing fixlets.
Thanks,
Ingo
------------------>
Adrien Schildknecht (2):
x86/kernel: Fix output of show_stack_log_lvl() x86/kernel: Use kstack_end() in dumpstack_64.c
arch/x86/kernel/dumpstack.c | 11 ++++++----- arch/x86/kernel/dumpstack_32.c | 9 ++++++--- arch/x86/kernel/dumpstack_64.c | 11 +++++++---- 3 files changed, 19 insertions(+), 12 deletions(-)
arch/x86/kernel/dumpstack.c +6 -5
@@ -25,10 +25,12 @@ unsigned int code_bytes = 64;int kstack_depth_to_print =3 *STACKSLOTS_PER_LINE ;static int die_counter; -static void printk_stack_address (unsigned long address,int reliable) +static void printk_stack_address (unsigned long address,int reliable, +void *data) { -pr_cont (" [<%p>] %s%pB\n" , - (void *)address, reliable ?"" :"? " , (void *)address); +printk ("%s [<%p>] %s%pB\n" , + (char *)data, (void *)address, reliable ?"" :"? " , + (void *)address); }void printk_address (unsigned long address)
@@ -155,8 +157,7 @@ static int print_trace_stack(void *data, char *name)static void print_trace_address (void *data,unsigned long addr,int reliable) {touch_nmi_watchdog (); -printk (data); -printk_stack_address (addr, reliable); +printk_stack_address (addr, reliable, data); }static const struct stacktrace_ops print_trace_ops = {
arch/x86/kernel/dumpstack_32.c +6 -3
@@ -108,9 +108,12 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,for (i =0 ; i < kstack_depth_to_print; i++) {if (kstack_end (stack))break ; -if (i && ((i %STACKSLOTS_PER_LINE ) ==0 )) -pr_cont ("\n" ); -pr_cont (" %08lx" , *stack++); +if ((i %STACKSLOTS_PER_LINE ) ==0 ) { +if (i !=0 ) +pr_cont ("\n" ); +printk ("%s %08lx" , log_lvl, *stack++); + }else +pr_cont (" %08lx" , *stack++);touch_nmi_watchdog (); }pr_cont ("\n" );
arch/x86/kernel/dumpstack_64.c +7 -4
@@ -280,12 +280,15 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,pr_cont (" <EOI> " ); } }else { -if (((long ) stack & (THREAD_SIZE -1 )) ==0 ) +if (kstack_end (stack))break ; } -if (i && ((i %STACKSLOTS_PER_LINE ) ==0 )) -pr_cont ("\n" ); -pr_cont (" %016lx" , *stack++); +if ((i %STACKSLOTS_PER_LINE ) ==0 ) { +if (i !=0 ) +pr_cont ("\n" ); +printk ("%s %016lx" , log_lvl, *stack++); + }else +pr_cont (" %016lx" , *stack++);touch_nmi_watchdog (); }preempt_enable ();