lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf_counter: add more context information

Browse Source 
Put in counts to tell which ips belong to what context.

  -----
   | |  hv
   | --
nr | |  kernel
   | --
   | |  user
  -----

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Orig-LKML-Reference: <20090402091319.493101305@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra
2009-04-02 11:12:03 +02:00
committed by Ingo Molnar
parent 3df70fd623
commit 5872bdb88a
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1088,6 +1088,7 @@ perf_callchain_kernel(struct pt_regs *regs, struct perf_callchain_entry *entry)
{ {
unsigned long bp; unsigned long bp;
char *stack; char *stack;
int nr = entry->nr;
callchain_store(entry, instruction_pointer(regs)); callchain_store(entry, instruction_pointer(regs));
@@ -1099,6 +1100,8 @@ perf_callchain_kernel(struct pt_regs *regs, struct perf_callchain_entry *entry)
#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;
} }
@@ -1128,6 +1131,7 @@ perf_callchain_user(struct pt_regs *regs, struct perf_callchain_entry *entry)
{ {
struct stack_frame frame; struct stack_frame frame;
const void __user *fp; const void __user *fp;
int nr = entry->nr;
regs = (struct pt_regs *)current->thread.sp0 - 1; regs = (struct pt_regs *)current->thread.sp0 - 1;
fp = (void __user *)regs->bp; fp = (void __user *)regs->bp;
@@ -1147,6 +1151,8 @@ perf_callchain_user(struct pt_regs *regs, struct perf_callchain_entry *entry)
callchain_store(entry, frame.return_address); callchain_store(entry, frame.return_address);
fp = frame.next_fp; fp = frame.next_fp;
} }
entry->user = entry->nr - nr;
} }
static void static void
@@ -1182,6 +1188,9 @@ struct perf_callchain_entry *perf_callchain(struct pt_regs *regs)
entry = &__get_cpu_var(irq_entry); entry = &__get_cpu_var(irq_entry);
entry->nr = 0; entry->nr = 0;
entry->hv = 0;
entry->kernel = 0;
entry->user = 0;
perf_do_callchain(regs, entry); perf_do_callchain(regs, entry);

4
include/linux/perf_counter.h
View File

@@ -513,10 +513,10 @@ extern void perf_counter_mmap(unsigned long addr, unsigned long len,
extern void perf_counter_munmap(unsigned long addr, unsigned long len, extern void perf_counter_munmap(unsigned long addr, unsigned long len,
unsigned long pgoff, struct file *file); unsigned long pgoff, struct file *file);
#define MAX_STACK_DEPTH 255 #define MAX_STACK_DEPTH 254
struct perf_callchain_entry { struct perf_callchain_entry {
u64 nr; u32 nr, hv, kernel, user;
u64 ip[MAX_STACK_DEPTH]; u64 ip[MAX_STACK_DEPTH];
}; };

2
kernel/perf_counter.c
View File

@@ -1819,7 +1819,7 @@ void perf_counter_output(struct perf_counter *counter,
callchain = perf_callchain(regs); callchain = perf_callchain(regs);
if (callchain) { if (callchain) {
callchain_size = (1 + callchain->nr) * sizeof(u64); callchain_size = (2 + callchain->nr) * sizeof(u64);
header.type |= __PERF_EVENT_CALLCHAIN; header.type |= __PERF_EVENT_CALLCHAIN;
header.size += callchain_size; header.size += callchain_size;