perf: Pass appropriate frame pointer to dump_trace()
Subsystems (2)
PATCH 1/2 perf: Pass appropriate frame pointer to dump_trace()
Pass the frame pointer from the regs of the interrupted path to dump_trace() while processing the stack trace.
Currently, dump_trace() takes the current bp and starts the callchain from dump_trace() itself. This is wasteful because we need to walk through the entire NMI/DEBUG stack before retrieving the interrupted point.
We can fix that by just using the frame pointer from the captured regs. It points exactly where we want to start.
--- arch/x86/kernel/cpu/perf_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/perf_event.c +1 -1
@@ -2347,7 +2347,7 @@ perf_callchain_kernel(struct pt_regs *regs, struct perf_callchain_entry *entry)callchain_store (entry,PERF_CONTEXT_KERNEL );callchain_store (entry, regs->ip); -dump_trace (NULL , regs,NULL ,0 , &backtrace_ops, entry); +dump_trace (NULL , regs,NULL , regs->bp, &backtrace_ops, entry); }/*
Signature · 1 line
1.6.2.3
PATCH 2/2 perf: Drop useless check for ignored frame
The check that ignores the debug and nmi stack frames is useless now that we have a frame pointer that makes us start at the right place. We don't anymore have to deal with these.
--- arch/x86/include/asm/stacktrace.h | 2 -- arch/x86/kernel/cpu/perf_event.c | 8 -------- arch/x86/kernel/dumpstack_32.c | 5 ----- arch/x86/kernel/dumpstack_64.c | 5 ----- 4 files changed, 0 insertions(+), 20 deletions(-)
arch/x86/include/asm/stacktrace.h +0 -2
@@ -3,8 +3,6 @@extern int kstack_depth_to_print; -int x86_is_stack_id (int id,char *name); -struct thread_info ;struct stacktrace_ops ;
arch/x86/kernel/cpu/perf_event.c +0 -8
@@ -2297,7 +2297,6 @@ void callchain_store(struct perf_callchain_entry *entry, u64 ip) static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_irq_entry); static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_nmi_entry); -static DEFINE_PER_CPU(int, in_ignored_frame); static void
@@ -2313,10 +2312,6 @@ static void backtrace_warning(void *data, char *msg)static int backtrace_stack (void *data,char *name) { -per_cpu (in_ignored_frame,smp_processor_id ()) = -x86_is_stack_id (NMI_STACK , name) || -x86_is_stack_id (DEBUG_STACK , name); -return 0 ; }
@@ -2324,9 +2319,6 @@ static void backtrace_address(void *data, unsigned long addr, int reliable) {struct perf_callchain_entry *entry = data; -if (per_cpu (in_ignored_frame,smp_processor_id ())) -return ; -if (reliable)callchain_store (entry, addr); }
arch/x86/kernel/dumpstack_32.c +0 -5
@@ -18,11 +18,6 @@#include "dumpstack.h" -/* Just a stub for now */ -int x86_is_stack_id (int id,char *name) -{ -return 0 ; -} void dump_trace(struct task_struct *task, struct pt_regs *regs, unsigned long *stack, unsigned long bp,
arch/x86/kernel/dumpstack_64.c +0 -5
@@ -33,11 +33,6 @@ static char x86_stack_ids[][8] = {#endif }; -int x86_is_stack_id (int id,char *name) -{ -return x86_stack_ids[id -1 ] == name; -} -static unsigned long *in_exception_stack (unsigned cpu,unsigned long stack,unsigned *usedp,char **idp) {
Signature · 1 line
1.6.2.3
[tip:perf/core] perf: Drop useless check for ignored frame
Commit-ID: 0fb8ee48d9dfff6a0913ceb0be2068d8be203763 Gitweb: http://git.kernel.org/tip/0fb8ee48d9dfff6a0913ceb0be2068d8be203763 Author: Frederic Weisbecker <[email protected]> AuthorDate: Thu, 31 Dec 2009 05:53:03 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 13 Jan 2010 10:09:08 +0100
perf: Drop useless check for ignored frame
The check that ignores the debug and nmi stack frames is useless now that we have a frame pointer that makes us start at the right place. We don't anymore have to deal with these.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/stacktrace.h | 2 -- arch/x86/kernel/cpu/perf_event.c | 8 -------- arch/x86/kernel/dumpstack_32.c | 5 ----- arch/x86/kernel/dumpstack_64.c | 5 ----- 4 files changed, 0 insertions(+), 20 deletions(-)
arch/x86/include/asm/stacktrace.h +0 -2
@@ -3,8 +3,6 @@extern int kstack_depth_to_print; -int x86_is_stack_id (int id,char *name); -struct thread_info ;struct stacktrace_ops ;
arch/x86/kernel/cpu/perf_event.c +0 -8
@@ -2297,7 +2297,6 @@ void callchain_store(struct perf_callchain_entry *entry, u64 ip) static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_irq_entry); static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_nmi_entry); -static DEFINE_PER_CPU(int, in_ignored_frame); static void
@@ -2313,10 +2312,6 @@ static void backtrace_warning(void *data, char *msg)static int backtrace_stack (void *data,char *name) { -per_cpu (in_ignored_frame,smp_processor_id ()) = -x86_is_stack_id (NMI_STACK , name) || -x86_is_stack_id (DEBUG_STACK , name); -return 0 ; }
@@ -2324,9 +2319,6 @@ static void backtrace_address(void *data, unsigned long addr, int reliable) {struct perf_callchain_entry *entry = data; -if (per_cpu (in_ignored_frame,smp_processor_id ())) -return ; -if (reliable)callchain_store (entry, addr); }
arch/x86/kernel/dumpstack_32.c +0 -5
@@ -18,11 +18,6 @@#include "dumpstack.h" -/* Just a stub for now */ -int x86_is_stack_id (int id,char *name) -{ -return 0 ; -} void dump_trace(struct task_struct *task, struct pt_regs *regs, unsigned long *stack, unsigned long bp,
arch/x86/kernel/dumpstack_64.c +0 -5
@@ -33,11 +33,6 @@ static char x86_stack_ids[][8] = {#endif }; -int x86_is_stack_id (int id,char *name) -{ -return x86_stack_ids[id -1 ] == name; -} -static unsigned long *in_exception_stack (unsigned cpu,unsigned long stack,unsigned *usedp,char **idp) {
Quoted 10 lines · Frederic Weisbecker
Pass the frame pointer from the regs of the interrupted path to
dump_trace()while processing the stack trace.Currently,
dump_trace()takes the current bp and starts the callchain fromdump_trace()itself. This is wasteful because we need to walk through the entire NMI/DEBUG stack before retrieving the interrupted point.We can fix that by just using the frame pointer from the captured regs. It points exactly where we want to start.
BTW, another effect of this patch: we didn't have the nmi/debug stack frame filtering in x86-32. So the callchains were polluted by the perf_callchain path, do_debug and so on...
After this patch we don't need this filtering anymore as the nmi/debug frames are zapped. It becomes clean like in x86-64.
Commit-ID: 48b5ba9cc98d676712da29d9931f1c88e5185ff2 Gitweb: http://git.kernel.org/tip/48b5ba9cc98d676712da29d9931f1c88e5185ff2 Author: Frederic Weisbecker <[email protected]> AuthorDate: Thu, 31 Dec 2009 05:53:02 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 31 Dec 2009 13:11:31 +0100
perf: Pass appropriate frame pointer to dump_trace()
Pass the frame pointer from the regs of the interrupted path to dump_trace() while processing the stack trace.
Currently, dump_trace() takes the current bp and starts the callchain from dump_trace() itself. This is wasteful because we need to walk through the entire NMI/DEBUG stack before retrieving the interrupted point.
We can fix that by just using the frame pointer from the captured regs. It points exactly where we want to start.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/cpu/perf_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/perf_event.c +1 -1
@@ -2347,7 +2347,7 @@ perf_callchain_kernel(struct pt_regs *regs, struct perf_callchain_entry *entry)callchain_store (entry,PERF_CONTEXT_KERNEL );callchain_store (entry, regs->ip); -dump_trace (NULL , regs,NULL ,0 , &backtrace_ops, entry); +dump_trace (NULL , regs,NULL , regs->bp, &backtrace_ops, entry); }/*