lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dumptrace: x86: consistently include loglevel, print stack switch

Browse Source 
- i386 and x86_64: always printk the 'data' parameter
 - i386: announce stack switch (irq -> normal)
 - i386: check if there is a stack switch before announcing it

There is a warning that 'context' might come out corrupt in early
boot. If this is true it should be fixed, not worked around.

Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Alexander van Heukelum
2008-10-04 23:12:43 +02:00
committed by Ingo Molnar
parent 3a18512db0
commit 2ac53721f3
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86/kernel/dumpstack_32.c
View File

@@ -104,16 +104,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
context = (struct thread_info *) context = (struct thread_info *)
((unsigned long)stack & (~(THREAD_SIZE - 1))); ((unsigned long)stack & (~(THREAD_SIZE - 1)));
bp = print_context_stack(context, stack, bp, ops, data, NULL); bp = print_context_stack(context, stack, bp, ops, data, NULL);
/*
* Should be after the line below, but somewhere
* in early boot context comes out corrupted and we
* can't reference it:
*/
if (ops->stack(data, "IRQ") < 0)
break;
stack = (unsigned long *)context->previous_esp; stack = (unsigned long *)context->previous_esp;
if (!stack) if (!stack)
break; break;
if (ops->stack(data, "IRQ") < 0)
break;
touch_nmi_watchdog(); touch_nmi_watchdog();
} }
} }
@@ -134,6 +130,7 @@ static void print_trace_warning(void *data, char *msg)
static int print_trace_stack(void *data, char *name) static int print_trace_stack(void *data, char *name)
{ {
printk("%s <%s> ", (char *)data, name);
return 0; return 0;
} }
@@ -142,11 +139,9 @@ static int print_trace_stack(void *data, char *name)
*/ */
static void print_trace_address(void *data, unsigned long addr, int reliable) static void print_trace_address(void *data, unsigned long addr, int reliable)
{ {
printk("%s [<%08lx>] ", (char *)data, addr);
if (!reliable)
printk("? ");
print_symbol("%s\n", addr);
touch_nmi_watchdog(); touch_nmi_watchdog();
printk(data);
printk_address(addr, reliable);
} }
static const struct stacktrace_ops print_trace_ops = { static const struct stacktrace_ops print_trace_ops = {

9
arch/x86/kernel/dumpstack_64.c
View File

@@ -247,24 +247,29 @@ EXPORT_SYMBOL(dump_trace);
static void static void
print_trace_warning_symbol(void *data, char *msg, unsigned long symbol) print_trace_warning_symbol(void *data, char *msg, unsigned long symbol)
{ {
printk(data);
print_symbol(msg, symbol); print_symbol(msg, symbol);
printk("\n"); printk("\n");
} }
static void print_trace_warning(void *data, char *msg) static void print_trace_warning(void *data, char *msg)
{ {
printk("%s\n", msg); printk("%s%s\n", (char *)data, msg);
} }
static int print_trace_stack(void *data, char *name) static int print_trace_stack(void *data, char *name)
{ {
printk(" <%s> ", name); printk("%s <%s> ", (char *)data, name);
return 0; return 0;
} }
/*
* Print one address/symbol entries per line.
*/
static void print_trace_address(void *data, unsigned long addr, int reliable) static void print_trace_address(void *data, unsigned long addr, int reliable)
{ {
touch_nmi_watchdog(); touch_nmi_watchdog();
printk(data);
printk_address(addr, reliable); printk_address(addr, reliable);
} }