[PATCH] x86_64: remove empty lines from stack traces/oopses

[PATCH] x86_64: remove empty lines from stack traces/oopses

[Alexey Dobriyan]

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

 arch/x86/kernel/traps_64.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -339,9 +339,8 @@ static void
 show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
 		unsigned long *stack, unsigned long bp, char *log_lvl)
 {
-	printk("\nCall Trace:\n");
+	printk("Call Trace:\n");
 	dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl);
-	printk("\n");
 }
 
 void show_trace(struct task_struct *task, struct pt_regs *regs,
@@ -386,6 +385,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
 		printk(" %016lx", *stack++);
 		touch_nmi_watchdog();
 	}
+	printk("\n");
 	show_trace_log_lvl(task, regs, sp, bp, log_lvl);
 }
 
@@ -443,7 +443,6 @@ void show_registers(struct pt_regs *regs)
 		printk("Stack: ");
 		show_stack_log_lvl(NULL, regs, (unsigned long *)sp,
 				regs->bp, "");
-		printk("\n");
 
 		printk(KERN_EMERG "Code: ");
 

Re: [PATCH] x86_64: remove empty lines from stack traces/oopses

[Ingo Molnar]

* Alexey Dobriyan <adobriyan@gmail.com> wrote:

>  show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
>  		unsigned long *stack, unsigned long bp, char *log_lvl)
>  {
> -	printk("\nCall Trace:\n");
> +	printk("Call Trace:\n");
>  	dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl);
> -	printk("\n");
>  }

hm, it's nice to have stack traces stand out a bit, and to not get the 
'Call Trace' embedded in the middle of a printk (which happens to crash 
or produce a stack dump).

>  void show_trace(struct task_struct *task, struct pt_regs *regs,
> @@ -386,6 +385,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
>  		printk(" %016lx", *stack++);
>  		touch_nmi_watchdog();
>  	}
> +	printk("\n");
>  	show_trace_log_lvl(task, regs, sp, bp, log_lvl);
>  }
>  
> @@ -443,7 +443,6 @@ void show_registers(struct pt_regs *regs)
>  		printk("Stack: ");
>  		show_stack_log_lvl(NULL, regs, (unsigned long *)sp,
>  				regs->bp, "");
> -		printk("\n");
>  
>  		printk(KERN_EMERG "Code: ");

just to make sure i get the gist of your change, do you have a 'before' 
and 'after' sample oops, so that we can see the difference?

	Ingo

Re: [PATCH] x86_64: remove empty lines from stack traces/oopses

[Alexey Dobriyan]

On Mon, Aug 11, 2008 at 07:02:19PM +0200, Ingo Molnar wrote:
> * Alexey Dobriyan <adobriyan@gmail.com> wrote:
> 
> >  show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
> >  		unsigned long *stack, unsigned long bp, char *log_lvl)
> >  {
> > -	printk("\nCall Trace:\n");
> > +	printk("Call Trace:\n");
> >  	dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl);
> > -	printk("\n");
> >  }
> 
> hm, it's nice to have stack traces stand out a bit, and to not get the 
> 'Call Trace' embedded in the middle of a printk (which happens to crash 
> or produce a stack dump).

Sometimes all you have is 80x25 or just screenshot from some stupid windows
monitoring program.

> >  void show_trace(struct task_struct *task, struct pt_regs *regs,
> > @@ -386,6 +385,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
> >  		printk(" %016lx", *stack++);
> >  		touch_nmi_watchdog();
> >  	}
> > +	printk("\n");
> >  	show_trace_log_lvl(task, regs, sp, bp, log_lvl);
> >  }
> >  
> > @@ -443,7 +443,6 @@ void show_registers(struct pt_regs *regs)
> >  		printk("Stack: ");
> >  		show_stack_log_lvl(NULL, regs, (unsigned long *)sp,
> >  				regs->bp, "");
> > -		printk("\n");
> >  
> >  		printk(KERN_EMERG "Code: ");
> 
> just to make sure i get the gist of your change, do you have a 'before' 
> and 'after' sample oops, so that we can see the difference?

Any recent oops with and without empty lines after Call trace: and
after calltrace.

Re: [PATCH] x86_64: remove empty lines from stack traces/oopses

[Ingo Molnar]

* Alexey Dobriyan <adobriyan@gmail.com> wrote:

> On Mon, Aug 11, 2008 at 07:02:19PM +0200, Ingo Molnar wrote:
> > * Alexey Dobriyan <adobriyan@gmail.com> wrote:
> > 
> > >  show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
> > >  		unsigned long *stack, unsigned long bp, char *log_lvl)
> > >  {
> > > -	printk("\nCall Trace:\n");
> > > +	printk("Call Trace:\n");
> > >  	dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl);
> > > -	printk("\n");
> > >  }
> > 
> > hm, it's nice to have stack traces stand out a bit, and to not get the 
> > 'Call Trace' embedded in the middle of a printk (which happens to crash 
> > or produce a stack dump).
> 
> Sometimes all you have is 80x25 or just screenshot from some stupid windows
> monitoring program.

> > just to make sure i get the gist of your change, do you have a 
> > 'before' and 'after' sample oops, so that we can see the difference?
> 
> Any recent oops with and without empty lines after Call trace: and 
> after calltrace.

ok - i've queued up your fix in tip/x86/debug.

Arjan, can the removal of empty newlines break the kerneloops.org 
parser?

	Ingo

Re: [PATCH] x86_64: remove empty lines from stack traces/oopses

[Arjan van de Ven]

On Fri, 15 Aug 2008 17:25:55 +0200
Ingo Molnar <mingo@elte.hu> wrote:

> > Any recent oops with and without empty lines after Call trace: and 
> > after calltrace.
> 
> ok - i've queued up your fix in tip/x86/debug.
> 
> Arjan, can the removal of empty newlines break the kerneloops.org 
> parser?

nope is fine; the parser isn't that fragile against empty lines
(in fact they get filtered out ;-)


-- 
If you want to reach me at my work email, use arjan@linux.intel.com
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org