Commit 8b5e99f0 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Thomas Gleixner

x86/unwind: Dump stack data on warnings

The unwinder warnings are good at finding unexpected unwinder issues,
but they often don't give enough data to be able to fully diagnose them.
Print a one-time stack dump when a warning is detected.
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/15607370e3ddb1732b6a73d5c65937864df16ac8.1481904011.git.jpoimboe@redhat.comSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 8023e0e2
...@@ -12,7 +12,7 @@ struct unwind_state { ...@@ -12,7 +12,7 @@ struct unwind_state {
struct task_struct *task; struct task_struct *task;
int graph_idx; int graph_idx;
#ifdef CONFIG_FRAME_POINTER #ifdef CONFIG_FRAME_POINTER
unsigned long *bp; unsigned long *bp, *orig_sp;
struct pt_regs *regs; struct pt_regs *regs;
#else #else
unsigned long *sp; unsigned long *sp;
......
...@@ -6,6 +6,37 @@ ...@@ -6,6 +6,37 @@
#define FRAME_HEADER_SIZE (sizeof(long) * 2) #define FRAME_HEADER_SIZE (sizeof(long) * 2)
static void unwind_dump(struct unwind_state *state, unsigned long *sp)
{
static bool dumped_before = false;
bool prev_zero, zero = false;
unsigned long word;
if (dumped_before)
return;
dumped_before = true;
printk_deferred("unwind stack type:%d next_sp:%p mask:%lx graph_idx:%d\n",
state->stack_info.type, state->stack_info.next_sp,
state->stack_mask, state->graph_idx);
for (sp = state->orig_sp; sp < state->stack_info.end; sp++) {
word = READ_ONCE_NOCHECK(*sp);
prev_zero = zero;
zero = word == 0;
if (zero) {
if (!prev_zero)
printk_deferred("%p: %016x ...\n", sp, 0);
continue;
}
printk_deferred("%p: %016lx (%pB)\n", sp, word, (void *)word);
}
}
unsigned long unwind_get_return_address(struct unwind_state *state) unsigned long unwind_get_return_address(struct unwind_state *state)
{ {
unsigned long addr; unsigned long addr;
...@@ -25,6 +56,7 @@ unsigned long unwind_get_return_address(struct unwind_state *state) ...@@ -25,6 +56,7 @@ unsigned long unwind_get_return_address(struct unwind_state *state)
"WARNING: unrecognized kernel stack return address %p at %p in %s:%d\n", "WARNING: unrecognized kernel stack return address %p at %p in %s:%d\n",
(void *)addr, addr_p, state->task->comm, (void *)addr, addr_p, state->task->comm,
state->task->pid); state->task->pid);
unwind_dump(state, addr_p);
return 0; return 0;
} }
...@@ -74,6 +106,7 @@ static bool update_stack_state(struct unwind_state *state, void *addr, ...@@ -74,6 +106,7 @@ static bool update_stack_state(struct unwind_state *state, void *addr,
size_t len) size_t len)
{ {
struct stack_info *info = &state->stack_info; struct stack_info *info = &state->stack_info;
enum stack_type orig_type = info->type;
/* /*
* If addr isn't on the current stack, switch to the next one. * If addr isn't on the current stack, switch to the next one.
...@@ -87,6 +120,9 @@ static bool update_stack_state(struct unwind_state *state, void *addr, ...@@ -87,6 +120,9 @@ static bool update_stack_state(struct unwind_state *state, void *addr,
&state->stack_mask)) &state->stack_mask))
return false; return false;
if (!state->orig_sp || info->type != orig_type)
state->orig_sp = addr;
return true; return true;
} }
...@@ -185,11 +221,13 @@ bool unwind_next_frame(struct unwind_state *state) ...@@ -185,11 +221,13 @@ bool unwind_next_frame(struct unwind_state *state)
"WARNING: kernel stack regs at %p in %s:%d has bad 'bp' value %p\n", "WARNING: kernel stack regs at %p in %s:%d has bad 'bp' value %p\n",
state->regs, state->task->comm, state->regs, state->task->comm,
state->task->pid, next_frame); state->task->pid, next_frame);
unwind_dump(state, (unsigned long *)state->regs);
} else { } else {
printk_deferred_once(KERN_WARNING printk_deferred_once(KERN_WARNING
"WARNING: kernel stack frame pointer at %p in %s:%d has bad value %p\n", "WARNING: kernel stack frame pointer at %p in %s:%d has bad value %p\n",
state->bp, state->task->comm, state->bp, state->task->comm,
state->task->pid, next_frame); state->task->pid, next_frame);
unwind_dump(state, state->bp);
} }
the_end: the_end:
state->stack_info.type = STACK_TYPE_UNKNOWN; state->stack_info.type = STACK_TYPE_UNKNOWN;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment