UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf_counter, x86: Fix kernel-space call-chains 

Kernel-space call-chains were trimmed at the first entry because
we never processed anything beyond the first stack context.

Allow the backtrace to jump from NMI to IRQ stack then to task stack
and finally user-space stack.

Also calculate the stack and bp variables correctly so that the
stack walker does not exit early.

We can get deep traces as a result, visible in perf report -D output:

0x32af0 [0xe0]: PERF_EVENT (IP, 5): 15134: 0xffffffff815225fd period: 1
... chain: u:2, k:22, nr:24
.....  0: 0xffffffff815225fd
.....  1: 0xffffffff810ac51c
.....  2: 0xffffffff81018e29
.....  3: 0xffffffff81523939
.....  4: 0xffffffff81524b8f
.....  5: 0xffffffff81524bd9
.....  6: 0xffffffff8105e498
.....  7: 0xffffffff8152315a
.....  8: 0xffffffff81522c3a
.....  9: 0xffffffff810d9b74
..... 10: 0xffffffff810dbeec
..... 11: 0xffffffff810dc3fb

This is a 22-entries kernel-space chain.

(We still only record reliable stack entries.)

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-06-15 09:57:59 +02:00
parent 5a6cec3abb
commit 038e836e97
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/x86/kernel/cpu/perf_counter.c
View File

@ -1575,8 +1575,8 @@ static void backtrace_warning(void *data, char *msg)
static int backtrace_stack(void *data, char *name) static int backtrace_stack(void *data, char *name)
{ {
/* Don't bother with IRQ stacks for now */ /* Process all stacks: */
return -1; return 0;
} }
static void backtrace_address(void *data, unsigned long addr, int reliable) static void backtrace_address(void *data, unsigned long addr, int reliable)
@ -1594,6 +1594,8 @@ static const struct stacktrace_ops backtrace_ops = {
.address = backtrace_address, .address = backtrace_address,
}; };
#include "../dumpstack.h"
static void static void
perf_callchain_kernel(struct pt_regs *regs, struct perf_callchain_entry *entry) perf_callchain_kernel(struct pt_regs *regs, struct perf_callchain_entry *entry)
{ {
@ -1601,26 +1603,20 @@ perf_callchain_kernel(struct pt_regs *regs, struct perf_callchain_entry *entry)
char *stack; char *stack;
int nr = entry->nr; int nr = entry->nr;
callchain_store(entry, instruction_pointer(regs)); callchain_store(entry, regs->ip);
stack = ((char *)regs + sizeof(struct pt_regs)); stack = ((char *)regs + sizeof(struct pt_regs));
#ifdef CONFIG_FRAME_POINTER #ifdef CONFIG_FRAME_POINTER
bp = frame_pointer(regs); get_bp(bp);
#else #else
bp = 0; bp = 0;
#endif #endif
dump_trace(NULL, regs, (void *)stack, bp, &backtrace_ops, entry); dump_trace(NULL, regs, (void *)&stack, bp, &backtrace_ops, entry);
entry->kernel = entry->nr - nr; entry->kernel = entry->nr - nr;
} }
struct stack_frame {
const void __user *next_fp;
unsigned long return_address;
};
static int copy_stack_frame(const void __user *fp, struct stack_frame *frame) static int copy_stack_frame(const void __user *fp, struct stack_frame *frame)
{ {
int ret; int ret;
@ -1652,7 +1648,7 @@ perf_callchain_user(struct pt_regs *regs, struct perf_callchain_entry *entry)
callchain_store(entry, regs->ip); callchain_store(entry, regs->ip);
while (entry->nr < MAX_STACK_DEPTH) { while (entry->nr < MAX_STACK_DEPTH) {
frame.next_fp = NULL; frame.next_frame = NULL;
frame.return_address = 0; frame.return_address = 0;
if (!copy_stack_frame(fp, &frame)) if (!copy_stack_frame(fp, &frame))
@ -1662,7 +1658,7 @@ perf_callchain_user(struct pt_regs *regs, struct perf_callchain_entry *entry)
break; break;
callchain_store(entry, frame.return_address); callchain_store(entry, frame.return_address);
fp = frame.next_fp; fp = frame.next_frame;
} }
entry->user = entry->nr - nr; entry->user = entry->nr - nr;