x86/stacktrace: Make stack walking tunable
Subsystems (4)
PATCH 1/2 x86/stacktrace: Make stack walking tunable
(Tested in x86-64 only)
The current print_context_stack helper that does the stack walking job is good for usual stacktraces as it walks through all the stack and reports even addresses that look unreliable, which is nice when we don't have frame pointers for example.
But we have users like perf that only require reliable stacktraces, and those may want a more adapted stack walker, so lets make this function a callback in stacktrace_ops that users can tune for their needs.
--- arch/x86/include/asm/stacktrace.h | 18 ++++++++++++++++++ arch/x86/kernel/cpu/perf_event.c | 1 + arch/x86/kernel/dumpstack.c | 9 +++++---- arch/x86/kernel/dumpstack.h | 6 ------ arch/x86/kernel/dumpstack_32.c | 2 +- arch/x86/kernel/dumpstack_64.c | 4 ++-- arch/x86/kernel/stacktrace.c | 18 ++++++++++-------- arch/x86/oprofile/backtrace.c | 9 +++++---- kernel/trace/trace_sysprof.c | 1 + 9 files changed, 43 insertions(+), 25 deletions(-)
arch/x86/include/asm/stacktrace.h +18 -0
@@ -5,6 +5,23 @@ extern int kstack_depth_to_print;int x86_is_stack_id (int id,char *name); +struct thread_info ; +struct stacktrace_ops ; + +typedef unsigned long (*walk_stack_t )(struct thread_info *tinfo, +unsigned long *stack, +unsigned long bp, +const struct stacktrace_ops *ops, +void *data, +unsigned long *end, +int *graph); + +extern unsigned long +print_context_stack (struct thread_info *tinfo, +unsigned long *stack,unsigned long bp, +const struct stacktrace_ops *ops,void *data, +unsigned long *end,int *graph); +/* Generic stack tracer with callbacks */ struct stacktrace_ops {
@@ -14,6 +31,7 @@ struct stacktrace_ops {void (*address)(void *data,unsigned long address,int reliable);/* On negative return stop dumping */ int (*stack)(void *data,char *name); +walk_stack_t walk_stack; }; void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
arch/x86/kernel/cpu/perf_event.c +1 -0
@@ -2336,6 +2336,7 @@ static const struct stacktrace_ops backtrace_ops = { .warning_symbol = backtrace_warning_symbol, .stack = backtrace_stack, .address = backtrace_address, + .walk_stack = print_context_stack, };#include "../dumpstack.h"
arch/x86/kernel/dumpstack.c +5 -4
@@ -141,10 +141,11 @@ static void print_trace_address(void *data, unsigned long addr, int reliable) }static const struct stacktrace_ops print_trace_ops = { - .warning = print_trace_warning, - .warning_symbol = print_trace_warning_symbol, - .stack = print_trace_stack, - .address = print_trace_address, + .warning = print_trace_warning, + .warning_symbol = print_trace_warning_symbol, + .stack = print_trace_stack, + .address = print_trace_address, + .walk_stack = print_context_stack, };void
arch/x86/kernel/dumpstack.h +0 -6
@@ -14,12 +14,6 @@#define get_bp (bp) asm("movq %%rbp, %0" : "=r" (bp) :)#endif -extern unsigned long -print_context_stack (struct thread_info *tinfo, -unsigned long *stack,unsigned long bp, -const struct stacktrace_ops *ops,void *data, -unsigned long *end,int *graph); -extern void show_trace_log_lvl (struct task_struct *task,struct pt_regs *regs,unsigned long *stack,unsigned long bp,char *log_lvl);
arch/x86/kernel/dumpstack_32.c +1 -1
@@ -58,7 +58,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, context = (struct thread_info *) ((unsigned long )stack & (~(THREAD_SIZE -1 ))); - bp =print_context_stack (context, stack, bp, ops, data,NULL , &graph); + bp = ops->walk_stack (context, stack, bp, ops, data,NULL , &graph); stack = (unsigned long *)context->previous_esp;if (!stack)
arch/x86/kernel/dumpstack_64.c +2 -2
@@ -188,8 +188,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,if (ops->stack (data, id) <0 )break ; - bp =print_context_stack (tinfo, stack, bp, ops, - data, estack_end, &graph); + bp = ops->walk_stack (tinfo, stack, bp, ops, + data, estack_end, &graph); ops->stack (data,"<EOE>" );/* * We link to the next stack via the
arch/x86/kernel/stacktrace.c +10 -8
@@ -53,17 +53,19 @@ save_stack_address_nosched(void *data, unsigned long addr, int reliable) }static const struct stacktrace_ops save_stack_ops = { - .warning = save_stack_warning, - .warning_symbol = save_stack_warning_symbol, - .stack = save_stack_stack, - .address = save_stack_address, + .warning = save_stack_warning, + .warning_symbol = save_stack_warning_symbol, + .stack = save_stack_stack, + .address = save_stack_address, + .walk_stack = print_context_stack, };static const struct stacktrace_ops save_stack_ops_nosched = { - .warning = save_stack_warning, - .warning_symbol = save_stack_warning_symbol, - .stack = save_stack_stack, - .address = save_stack_address_nosched, + .warning = save_stack_warning, + .warning_symbol = save_stack_warning_symbol, + .stack = save_stack_stack, + .address = save_stack_address_nosched, + .walk_stack = print_context_stack, };/*
arch/x86/oprofile/backtrace.c +5 -4
@@ -41,10 +41,11 @@ static void backtrace_address(void *data, unsigned long addr, int reliable) }static struct stacktrace_ops backtrace_ops = { - .warning = backtrace_warning, - .warning_symbol = backtrace_warning_symbol, - .stack = backtrace_stack, - .address = backtrace_address, + .warning = backtrace_warning, + .warning_symbol = backtrace_warning_symbol, + .stack = backtrace_stack, + .address = backtrace_address, + .walk_stack = print_context_stack, };struct frame_head {
kernel/trace/trace_sysprof.c +1 -0
@@ -93,6 +93,7 @@ static const struct stacktrace_ops backtrace_ops = { .warning_symbol = backtrace_warning_symbol, .stack = backtrace_stack, .address = backtrace_address, + .walk_stack = print_context_stack, }; static int
Signature · 1 line
1.6.2.3
PATCH 2/2 x86/stacktrace: Provide a special frame pointer-only stack walker
(Tested in x86-64 only)
It's just wasteful for stacktrace users like perf to walk through every entries on the stack whereas these only accept reliable ones,
ie: that the frame pointer validates.
Since perf requires pure reliable stacktraces, it needs a stack walker based on frame pointers-only to optimize the stacktrace processing.
--- arch/x86/include/asm/stacktrace.h | 6 ++++++ arch/x86/kernel/cpu/perf_event.c | 2 +- arch/x86/kernel/dumpstack.c | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletions(-)
arch/x86/include/asm/stacktrace.h +6 -0
@@ -22,6 +22,12 @@ print_context_stack(struct thread_info *tinfo, const struct stacktrace_ops *ops, void *data, unsigned long *end, int *graph); +extern unsigned long +print_context_stack_bp (struct thread_info *tinfo, +unsigned long *stack,unsigned long bp, +const struct stacktrace_ops *ops,void *data, +unsigned long *end,int *graph); +/* Generic stack tracer with callbacks */ struct stacktrace_ops {
arch/x86/kernel/cpu/perf_event.c +1 -1
@@ -2336,7 +2336,7 @@ static const struct stacktrace_ops backtrace_ops = { .warning_symbol = backtrace_warning_symbol, .stack = backtrace_stack, .address = backtrace_address, - .walk_stack = print_context_stack, + .walk_stack = print_context_stack_bp, };#include "../dumpstack.h"
arch/x86/kernel/dumpstack.c +22 -0
@@ -110,6 +110,28 @@ print_context_stack(struct thread_info *tinfo,return bp; } +unsigned long +print_context_stack_bp (struct thread_info *tinfo, +unsigned long *stack,unsigned long bp, +const struct stacktrace_ops *ops,void *data, +unsigned long *end,int *graph) +{ +struct stack_frame *frame = (struct stack_frame *)bp; +unsigned long *ret_addr = &frame->return_address; + +while (valid_stack_ptr (tinfo, ret_addr,sizeof (*ret_addr), end)) { +unsigned long addr = *ret_addr; + +if (__kernel_text_address (addr)) { + ops->address (data, addr,1 ); + frame = frame->next_frame; + ret_addr = &frame->return_address; +print_ftrace_graph_addr (addr, data, ops, tinfo, graph); + } + } +return (unsigned long )frame; +} +static void print_trace_warning_symbol (void *data,char *msg,unsigned long symbol)
Signature · 1 line
1.6.2.3
[tip:perf/urgent] perf events, x86/stacktrace: Fix performance/softlockup by providing a special frame pointer-only stack walker
Commit-ID: 06d65bda75341485d32f33da474b0664819ad497 Gitweb: http://git.kernel.org/tip/06d65bda75341485d32f33da474b0664819ad497 Author: Frederic Weisbecker <[email protected]> AuthorDate: Thu, 17 Dec 2009 05:40:34 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 17 Dec 2009 10:42:52 +0100
perf events, x86/stacktrace: Fix performance/softlockup by providing a special frame pointer-only stack walker
It's just wasteful for stacktrace users like perf to walk through every entries on the stack whereas these only accept reliable ones, ie: that the frame pointer validates.
Since perf requires pure reliable stacktraces, it needs a stack walker based on frame pointers-only to optimize the stacktrace processing.
This might solve some near-lockup scenarios that can be triggered by call-graph tracing timer events.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/stacktrace.h | 6 ++++++ arch/x86/kernel/cpu/perf_event.c | 2 +- arch/x86/kernel/dumpstack.c | 28 ++++++++++++++++++++++++++-- 3 files changed, 33 insertions(+), 3 deletions(-)
arch/x86/include/asm/stacktrace.h +6 -0
@@ -22,6 +22,12 @@ print_context_stack(struct thread_info *tinfo, const struct stacktrace_ops *ops, void *data, unsigned long *end, int *graph); +extern unsigned long +print_context_stack_bp (struct thread_info *tinfo, +unsigned long *stack,unsigned long bp, +const struct stacktrace_ops *ops,void *data, +unsigned long *end,int *graph); +/* Generic stack tracer with callbacks */ struct stacktrace_ops {
arch/x86/kernel/cpu/perf_event.c +1 -1
@@ -2336,7 +2336,7 @@ static const struct stacktrace_ops backtrace_ops = { .warning_symbol = backtrace_warning_symbol, .stack = backtrace_stack, .address = backtrace_address, - .walk_stack = print_context_stack, + .walk_stack = print_context_stack_bp, };#include "../dumpstack.h"
arch/x86/kernel/dumpstack.c +26 -2
@@ -109,6 +109,30 @@ print_context_stack(struct thread_info *tinfo, }return bp; } +EXPORT_SYMBOL_GPL (print_context_stack); + +unsigned long +print_context_stack_bp (struct thread_info *tinfo, +unsigned long *stack,unsigned long bp, +const struct stacktrace_ops *ops,void *data, +unsigned long *end,int *graph) +{ +struct stack_frame *frame = (struct stack_frame *)bp; +unsigned long *ret_addr = &frame->return_address; + +while (valid_stack_ptr (tinfo, ret_addr,sizeof (*ret_addr), end)) { +unsigned long addr = *ret_addr; + +if (__kernel_text_address (addr)) { + ops->address (data, addr,1 ); + frame = frame->next_frame; + ret_addr = &frame->return_address; +print_ftrace_graph_addr (addr, data, ops, tinfo, graph); + } + } +return (unsigned long )frame; +} +EXPORT_SYMBOL_GPL (print_context_stack_bp); static void
@@ -143,8 +167,8 @@ static void print_trace_address(void *data, unsigned long addr, int reliable)static const struct stacktrace_ops print_trace_ops = { .warning = print_trace_warning, .warning_symbol = print_trace_warning_symbol, - .stack = print_trace_stack, - .address = print_trace_address, + .stack = print_trace_stack, + .address = print_trace_address, .walk_stack = print_context_stack, };
[tip:perf/urgent] perf events, x86/stacktrace: Make stack walking optional
In reply to Frederic WeisbeckerCommit-ID: 61c1917f47f73c968e92d04d15370b1dc3ec4592 Gitweb: http://git.kernel.org/tip/61c1917f47f73c968e92d04d15370b1dc3ec4592 Author: Frederic Weisbecker <[email protected]> AuthorDate: Thu, 17 Dec 2009 05:40:33 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 17 Dec 2009 09:56:19 +0100
perf events, x86/stacktrace: Make stack walking optional
The current print_context_stack helper that does the stack walking job is good for usual stacktraces as it walks through all the stack and reports even addresses that look unreliable, which is nice when we don't have frame pointers for example.
But we have users like perf that only require reliable stacktraces, and those may want a more adapted stack walker, so lets make this function a callback in stacktrace_ops that users can tune for their needs.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/stacktrace.h | 18 ++++++++++++++++++ arch/x86/kernel/cpu/perf_event.c | 1 + arch/x86/kernel/dumpstack.c | 9 +++++---- arch/x86/kernel/dumpstack.h | 6 ------ arch/x86/kernel/dumpstack_32.c | 2 +- arch/x86/kernel/dumpstack_64.c | 4 ++-- arch/x86/kernel/stacktrace.c | 18 ++++++++++-------- arch/x86/oprofile/backtrace.c | 9 +++++---- kernel/trace/trace_sysprof.c | 1 + 9 files changed, 43 insertions(+), 25 deletions(-)
arch/x86/include/asm/stacktrace.h +18 -0
@@ -5,6 +5,23 @@ extern int kstack_depth_to_print;int x86_is_stack_id (int id,char *name); +struct thread_info ; +struct stacktrace_ops ; + +typedef unsigned long (*walk_stack_t )(struct thread_info *tinfo, +unsigned long *stack, +unsigned long bp, +const struct stacktrace_ops *ops, +void *data, +unsigned long *end, +int *graph); + +extern unsigned long +print_context_stack (struct thread_info *tinfo, +unsigned long *stack,unsigned long bp, +const struct stacktrace_ops *ops,void *data, +unsigned long *end,int *graph); +/* Generic stack tracer with callbacks */ struct stacktrace_ops {
@@ -14,6 +31,7 @@ struct stacktrace_ops {void (*address)(void *data,unsigned long address,int reliable);/* On negative return stop dumping */ int (*stack)(void *data,char *name); +walk_stack_t walk_stack; }; void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
arch/x86/kernel/cpu/perf_event.c +1 -0
@@ -2336,6 +2336,7 @@ static const struct stacktrace_ops backtrace_ops = { .warning_symbol = backtrace_warning_symbol, .stack = backtrace_stack, .address = backtrace_address, + .walk_stack = print_context_stack, };#include "../dumpstack.h"
arch/x86/kernel/dumpstack.c +5 -4
@@ -141,10 +141,11 @@ static void print_trace_address(void *data, unsigned long addr, int reliable) }static const struct stacktrace_ops print_trace_ops = { - .warning = print_trace_warning, - .warning_symbol = print_trace_warning_symbol, - .stack = print_trace_stack, - .address = print_trace_address, + .warning = print_trace_warning, + .warning_symbol = print_trace_warning_symbol, + .stack = print_trace_stack, + .address = print_trace_address, + .walk_stack = print_context_stack, };void
arch/x86/kernel/dumpstack.h +0 -6
@@ -14,12 +14,6 @@#define get_bp (bp) asm("movq %%rbp, %0" : "=r" (bp) :)#endif -extern unsigned long -print_context_stack (struct thread_info *tinfo, -unsigned long *stack,unsigned long bp, -const struct stacktrace_ops *ops,void *data, -unsigned long *end,int *graph); -extern void show_trace_log_lvl (struct task_struct *task,struct pt_regs *regs,unsigned long *stack,unsigned long bp,char *log_lvl);
arch/x86/kernel/dumpstack_32.c +1 -1
@@ -58,7 +58,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, context = (struct thread_info *) ((unsigned long )stack & (~(THREAD_SIZE -1 ))); - bp =print_context_stack (context, stack, bp, ops, data,NULL , &graph); + bp = ops->walk_stack (context, stack, bp, ops, data,NULL , &graph); stack = (unsigned long *)context->previous_esp;if (!stack)
arch/x86/kernel/dumpstack_64.c +2 -2
@@ -188,8 +188,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,if (ops->stack (data, id) <0 )break ; - bp =print_context_stack (tinfo, stack, bp, ops, - data, estack_end, &graph); + bp = ops->walk_stack (tinfo, stack, bp, ops, + data, estack_end, &graph); ops->stack (data,"<EOE>" );/* * We link to the next stack via the
arch/x86/kernel/stacktrace.c +10 -8
@@ -53,17 +53,19 @@ save_stack_address_nosched(void *data, unsigned long addr, int reliable) }static const struct stacktrace_ops save_stack_ops = { - .warning = save_stack_warning, - .warning_symbol = save_stack_warning_symbol, - .stack = save_stack_stack, - .address = save_stack_address, + .warning = save_stack_warning, + .warning_symbol = save_stack_warning_symbol, + .stack = save_stack_stack, + .address = save_stack_address, + .walk_stack = print_context_stack, };static const struct stacktrace_ops save_stack_ops_nosched = { - .warning = save_stack_warning, - .warning_symbol = save_stack_warning_symbol, - .stack = save_stack_stack, - .address = save_stack_address_nosched, + .warning = save_stack_warning, + .warning_symbol = save_stack_warning_symbol, + .stack = save_stack_stack, + .address = save_stack_address_nosched, + .walk_stack = print_context_stack, };/*
arch/x86/oprofile/backtrace.c +5 -4
@@ -41,10 +41,11 @@ static void backtrace_address(void *data, unsigned long addr, int reliable) }static struct stacktrace_ops backtrace_ops = { - .warning = backtrace_warning, - .warning_symbol = backtrace_warning_symbol, - .stack = backtrace_stack, - .address = backtrace_address, + .warning = backtrace_warning, + .warning_symbol = backtrace_warning_symbol, + .stack = backtrace_stack, + .address = backtrace_address, + .walk_stack = print_context_stack, };struct frame_head {
kernel/trace/trace_sysprof.c +1 -0
@@ -93,6 +93,7 @@ static const struct stacktrace_ops backtrace_ops = { .warning_symbol = backtrace_warning_symbol, .stack = backtrace_stack, .address = backtrace_address, + .walk_stack = print_context_stack, }; static int