Commit 9c0729dc authored by Soeren Sandmann Pedersen's avatar Soeren Sandmann Pedersen Committed by Frederic Weisbecker

x86: Eliminate bp argument from the stack tracing routines

The various stack tracing routines take a 'bp' argument in which the
caller is supposed to provide the base pointer to use, or 0 if doesn't
have one. Since bp is garbage whenever CONFIG_FRAME_POINTER is not
defined, this means all callers in principle should either always pass
0, or be conditional on CONFIG_FRAME_POINTER.

However, there are only really three use cases for stack tracing:

(a) Trace the current task, including IRQ stack if any
(b) Trace the current task, but skip IRQ stack
(c) Trace some other task

In all cases, if CONFIG_FRAME_POINTER is not defined, bp should just
be 0.  If it _is_ defined, then

- in case (a) bp should be gotten directly from the CPU's register, so
  the caller should pass NULL for regs,

- in case (b) the caller should should pass the IRQ registers to
  dump_trace(),

- in case (c) bp should be gotten from the top of the task's stack, so
  the caller should pass NULL for regs.

Hence, the bp argument is not necessary because the combination of
task and regs is sufficient to determine an appropriate value for bp.

This patch introduces a new inline function stack_frame(task, regs)
that computes the desired bp. This function is then called from the
two versions of dump_stack().
Signed-off-by: default avatarSoren Sandmann <ssp@redhat.com>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arjan van de Ven <arjan@infradead.org>,
Cc: Frederic Weisbecker <fweisbec@gmail.com>,
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>,
LKML-Reference: <m3oc9rop28.fsf@dhcp-100-3-82.bos.redhat.com>>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
parent 3985c7ce
...@@ -28,7 +28,7 @@ extern void die(const char *, struct pt_regs *,long); ...@@ -28,7 +28,7 @@ extern void die(const char *, struct pt_regs *,long);
extern int __must_check __die(const char *, struct pt_regs *, long); extern int __must_check __die(const char *, struct pt_regs *, long);
extern void show_registers(struct pt_regs *regs); extern void show_registers(struct pt_regs *regs);
extern void show_trace(struct task_struct *t, struct pt_regs *regs, extern void show_trace(struct task_struct *t, struct pt_regs *regs,
unsigned long *sp, unsigned long bp); unsigned long *sp);
extern void __show_regs(struct pt_regs *regs, int all); extern void __show_regs(struct pt_regs *regs, int all);
extern void show_regs(struct pt_regs *regs); extern void show_regs(struct pt_regs *regs);
extern unsigned long oops_begin(void); extern unsigned long oops_begin(void);
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#define _ASM_X86_STACKTRACE_H #define _ASM_X86_STACKTRACE_H
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/ptrace.h>
extern int kstack_depth_to_print; extern int kstack_depth_to_print;
...@@ -46,7 +47,7 @@ struct stacktrace_ops { ...@@ -46,7 +47,7 @@ struct stacktrace_ops {
}; };
void dump_trace(struct task_struct *tsk, struct pt_regs *regs, void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
unsigned long *stack, unsigned long bp, unsigned long *stack,
const struct stacktrace_ops *ops, void *data); const struct stacktrace_ops *ops, void *data);
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
...@@ -57,13 +58,39 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs, ...@@ -57,13 +58,39 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
#define get_bp(bp) asm("movq %%rbp, %0" : "=r" (bp) :) #define get_bp(bp) asm("movq %%rbp, %0" : "=r" (bp) :)
#endif #endif
#ifdef CONFIG_FRAME_POINTER
static inline unsigned long
stack_frame(struct task_struct *task, struct pt_regs *regs)
{
unsigned long bp;
if (regs)
return regs->bp;
if (task == current) {
/* Grab bp right from our regs */
get_bp(bp);
return bp;
}
/* bp is the last reg pushed by switch_to */
return *(unsigned long *)task->thread.sp;
}
#else
static inline unsigned long
stack_frame(struct task_struct *task, struct pt_regs *regs)
{
return 0;
}
#endif
extern void extern void
show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
unsigned long *stack, unsigned long bp, char *log_lvl); unsigned long *stack, char *log_lvl);
extern void extern void
show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
unsigned long *sp, unsigned long bp, char *log_lvl); unsigned long *sp, char *log_lvl);
extern unsigned int code_bytes; extern unsigned int code_bytes;
......
...@@ -1666,7 +1666,7 @@ perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs) ...@@ -1666,7 +1666,7 @@ perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)
perf_callchain_store(entry, regs->ip); perf_callchain_store(entry, regs->ip);
dump_trace(NULL, regs, NULL, regs->bp, &backtrace_ops, entry); dump_trace(NULL, regs, NULL, &backtrace_ops, entry);
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
......
...@@ -175,21 +175,21 @@ static const struct stacktrace_ops print_trace_ops = { ...@@ -175,21 +175,21 @@ static const struct stacktrace_ops print_trace_ops = {
void void
show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
unsigned long *stack, unsigned long bp, char *log_lvl) unsigned long *stack, char *log_lvl)
{ {
printk("%sCall Trace:\n", log_lvl); printk("%sCall Trace:\n", log_lvl);
dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl); dump_trace(task, regs, stack, &print_trace_ops, log_lvl);
} }
void show_trace(struct task_struct *task, struct pt_regs *regs, void show_trace(struct task_struct *task, struct pt_regs *regs,
unsigned long *stack, unsigned long bp) unsigned long *stack)
{ {
show_trace_log_lvl(task, regs, stack, bp, ""); show_trace_log_lvl(task, regs, stack, "");
} }
void show_stack(struct task_struct *task, unsigned long *sp) void show_stack(struct task_struct *task, unsigned long *sp)
{ {
show_stack_log_lvl(task, NULL, sp, 0, ""); show_stack_log_lvl(task, NULL, sp, "");
} }
/* /*
...@@ -210,7 +210,7 @@ void dump_stack(void) ...@@ -210,7 +210,7 @@ void dump_stack(void)
init_utsname()->release, init_utsname()->release,
(int)strcspn(init_utsname()->version, " "), (int)strcspn(init_utsname()->version, " "),
init_utsname()->version); init_utsname()->version);
show_trace(NULL, NULL, &stack, bp); show_trace(NULL, NULL, &stack);
} }
EXPORT_SYMBOL(dump_stack); EXPORT_SYMBOL(dump_stack);
......
...@@ -17,11 +17,12 @@ ...@@ -17,11 +17,12 @@
#include <asm/stacktrace.h> #include <asm/stacktrace.h>
void dump_trace(struct task_struct *task, struct pt_regs *regs, void dump_trace(struct task_struct *task,
unsigned long *stack, unsigned long bp, struct pt_regs *regs, unsigned long *stack,
const struct stacktrace_ops *ops, void *data) const struct stacktrace_ops *ops, void *data)
{ {
int graph = 0; int graph = 0;
unsigned long bp;
if (!task) if (!task)
task = current; task = current;
...@@ -34,18 +35,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, ...@@ -34,18 +35,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
stack = (unsigned long *)task->thread.sp; stack = (unsigned long *)task->thread.sp;
} }
#ifdef CONFIG_FRAME_POINTER bp = stack_frame(task, regs);
if (!bp) {
if (task == current) {
/* Grab bp right from our regs */
get_bp(bp);
} else {
/* bp is the last reg pushed by switch_to */
bp = *(unsigned long *) task->thread.sp;
}
}
#endif
for (;;) { for (;;) {
struct thread_info *context; struct thread_info *context;
...@@ -65,7 +55,7 @@ EXPORT_SYMBOL(dump_trace); ...@@ -65,7 +55,7 @@ EXPORT_SYMBOL(dump_trace);
void void
show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
unsigned long *sp, unsigned long bp, char *log_lvl) unsigned long *sp, char *log_lvl)
{ {
unsigned long *stack; unsigned long *stack;
int i; int i;
...@@ -87,7 +77,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, ...@@ -87,7 +77,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
touch_nmi_watchdog(); touch_nmi_watchdog();
} }
printk(KERN_CONT "\n"); printk(KERN_CONT "\n");
show_trace_log_lvl(task, regs, sp, bp, log_lvl); show_trace_log_lvl(task, regs, sp, log_lvl);
} }
...@@ -112,8 +102,7 @@ void show_registers(struct pt_regs *regs) ...@@ -112,8 +102,7 @@ void show_registers(struct pt_regs *regs)
u8 *ip; u8 *ip;
printk(KERN_EMERG "Stack:\n"); printk(KERN_EMERG "Stack:\n");
show_stack_log_lvl(NULL, regs, &regs->sp, show_stack_log_lvl(NULL, regs, &regs->sp, KERN_EMERG);
0, KERN_EMERG);
printk(KERN_EMERG "Code: "); printk(KERN_EMERG "Code: ");
......
...@@ -139,8 +139,8 @@ fixup_bp_irq_link(unsigned long bp, unsigned long *stack, ...@@ -139,8 +139,8 @@ fixup_bp_irq_link(unsigned long bp, unsigned long *stack,
* severe exception (double fault, nmi, stack fault, debug, mce) hardware stack * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
*/ */
void dump_trace(struct task_struct *task, struct pt_regs *regs, void dump_trace(struct task_struct *task,
unsigned long *stack, unsigned long bp, struct pt_regs *regs, unsigned long *stack,
const struct stacktrace_ops *ops, void *data) const struct stacktrace_ops *ops, void *data)
{ {
const unsigned cpu = get_cpu(); const unsigned cpu = get_cpu();
...@@ -149,6 +149,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, ...@@ -149,6 +149,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
unsigned used = 0; unsigned used = 0;
struct thread_info *tinfo; struct thread_info *tinfo;
int graph = 0; int graph = 0;
unsigned long bp;
if (!task) if (!task)
task = current; task = current;
...@@ -160,18 +161,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, ...@@ -160,18 +161,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
stack = (unsigned long *)task->thread.sp; stack = (unsigned long *)task->thread.sp;
} }
#ifdef CONFIG_FRAME_POINTER bp = stack_frame(task, regs);
if (!bp) {
if (task == current) {
/* Grab bp right from our regs */
get_bp(bp);
} else {
/* bp is the last reg pushed by switch_to */
bp = *(unsigned long *) task->thread.sp;
}
}
#endif
/* /*
* Print function call entries in all stacks, starting at the * Print function call entries in all stacks, starting at the
* current stack address. If the stacks consist of nested * current stack address. If the stacks consist of nested
...@@ -235,7 +225,7 @@ EXPORT_SYMBOL(dump_trace); ...@@ -235,7 +225,7 @@ EXPORT_SYMBOL(dump_trace);
void void
show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
unsigned long *sp, unsigned long bp, char *log_lvl) unsigned long *sp, char *log_lvl)
{ {
unsigned long *irq_stack_end; unsigned long *irq_stack_end;
unsigned long *irq_stack; unsigned long *irq_stack;
...@@ -279,7 +269,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, ...@@ -279,7 +269,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
preempt_enable(); preempt_enable();
printk(KERN_CONT "\n"); printk(KERN_CONT "\n");
show_trace_log_lvl(task, regs, sp, bp, log_lvl); show_trace_log_lvl(task, regs, sp, log_lvl);
} }
void show_registers(struct pt_regs *regs) void show_registers(struct pt_regs *regs)
...@@ -308,7 +298,7 @@ void show_registers(struct pt_regs *regs) ...@@ -308,7 +298,7 @@ void show_registers(struct pt_regs *regs)
printk(KERN_EMERG "Stack:\n"); printk(KERN_EMERG "Stack:\n");
show_stack_log_lvl(NULL, regs, (unsigned long *)sp, show_stack_log_lvl(NULL, regs, (unsigned long *)sp,
regs->bp, KERN_EMERG); KERN_EMERG);
printk(KERN_EMERG "Code: "); printk(KERN_EMERG "Code: ");
......
...@@ -91,8 +91,7 @@ void exit_thread(void) ...@@ -91,8 +91,7 @@ void exit_thread(void)
void show_regs(struct pt_regs *regs) void show_regs(struct pt_regs *regs)
{ {
show_registers(regs); show_registers(regs);
show_trace(NULL, regs, (unsigned long *)kernel_stack_pointer(regs), show_trace(NULL, regs, (unsigned long *)kernel_stack_pointer(regs));
regs->bp);
} }
void show_regs_common(void) void show_regs_common(void)
......
...@@ -73,22 +73,22 @@ static const struct stacktrace_ops save_stack_ops_nosched = { ...@@ -73,22 +73,22 @@ static const struct stacktrace_ops save_stack_ops_nosched = {
*/ */
void save_stack_trace(struct stack_trace *trace) void save_stack_trace(struct stack_trace *trace)
{ {
dump_trace(current, NULL, NULL, 0, &save_stack_ops, trace); dump_trace(current, NULL, NULL, &save_stack_ops, trace);
if (trace->nr_entries < trace->max_entries) if (trace->nr_entries < trace->max_entries)
trace->entries[trace->nr_entries++] = ULONG_MAX; trace->entries[trace->nr_entries++] = ULONG_MAX;
} }
EXPORT_SYMBOL_GPL(save_stack_trace); EXPORT_SYMBOL_GPL(save_stack_trace);
void save_stack_trace_bp(struct stack_trace *trace, unsigned long bp) void save_stack_trace_regs(struct stack_trace *trace, struct pt_regs *regs)
{ {
dump_trace(current, NULL, NULL, bp, &save_stack_ops, trace); dump_trace(current, regs, NULL, &save_stack_ops, trace);
if (trace->nr_entries < trace->max_entries) if (trace->nr_entries < trace->max_entries)
trace->entries[trace->nr_entries++] = ULONG_MAX; trace->entries[trace->nr_entries++] = ULONG_MAX;
} }
void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)
{ {
dump_trace(tsk, NULL, NULL, 0, &save_stack_ops_nosched, trace); dump_trace(tsk, NULL, NULL, &save_stack_ops_nosched, trace);
if (trace->nr_entries < trace->max_entries) if (trace->nr_entries < trace->max_entries)
trace->entries[trace->nr_entries++] = ULONG_MAX; trace->entries[trace->nr_entries++] = ULONG_MAX;
} }
......
...@@ -185,7 +185,7 @@ void kmemcheck_error_save(enum kmemcheck_shadow state, ...@@ -185,7 +185,7 @@ void kmemcheck_error_save(enum kmemcheck_shadow state,
e->trace.entries = e->trace_entries; e->trace.entries = e->trace_entries;
e->trace.max_entries = ARRAY_SIZE(e->trace_entries); e->trace.max_entries = ARRAY_SIZE(e->trace_entries);
e->trace.skip = 0; e->trace.skip = 0;
save_stack_trace_bp(&e->trace, regs->bp); save_stack_trace_regs(&e->trace, regs);
/* Round address down to nearest 16 bytes */ /* Round address down to nearest 16 bytes */
shadow_copy = kmemcheck_shadow_lookup(address shadow_copy = kmemcheck_shadow_lookup(address
......
...@@ -126,7 +126,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth) ...@@ -126,7 +126,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
if (!user_mode_vm(regs)) { if (!user_mode_vm(regs)) {
unsigned long stack = kernel_stack_pointer(regs); unsigned long stack = kernel_stack_pointer(regs);
if (depth) if (depth)
dump_trace(NULL, regs, (unsigned long *)stack, 0, dump_trace(NULL, regs, (unsigned long *)stack,
&backtrace_ops, &depth); &backtrace_ops, &depth);
return; return;
} }
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define __LINUX_STACKTRACE_H #define __LINUX_STACKTRACE_H
struct task_struct; struct task_struct;
struct pt_regs;
#ifdef CONFIG_STACKTRACE #ifdef CONFIG_STACKTRACE
struct task_struct; struct task_struct;
...@@ -13,7 +14,8 @@ struct stack_trace { ...@@ -13,7 +14,8 @@ struct stack_trace {
}; };
extern void save_stack_trace(struct stack_trace *trace); extern void save_stack_trace(struct stack_trace *trace);
extern void save_stack_trace_bp(struct stack_trace *trace, unsigned long bp); extern void save_stack_trace_regs(struct stack_trace *trace,
struct pt_regs *regs);
extern void save_stack_trace_tsk(struct task_struct *tsk, extern void save_stack_trace_tsk(struct task_struct *tsk,
struct stack_trace *trace); struct stack_trace *trace);
......
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