aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-05-29 05:25:09 -0400
committerIngo Molnar <mingo@elte.hu>2009-06-14 16:37:15 -0400
commit5a6cec3abbdb74244caab68db100825a8c4ac02d (patch)
tree9384519dc432104ba75cc14565866fa1a6deb051 /arch
parent3efa1cc99ec51bc7a7ae0011a16619fd20dbe6ea (diff)
perf_counter, x86: Fix call-chain walking
Fix the ptregs variant when we hit user-mode tasks. Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Arjan van de Ven <arjan@infradead.org> 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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/perf_counter.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index 77a59a5566a8..09d8cb69c3f3 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -1644,7 +1644,9 @@ perf_callchain_user(struct pt_regs *regs, struct perf_callchain_entry *entry)
1644 const void __user *fp; 1644 const void __user *fp;
1645 int nr = entry->nr; 1645 int nr = entry->nr;
1646 1646
1647 regs = (struct pt_regs *)current->thread.sp0 - 1; 1647 if (!user_mode(regs))
1648 regs = task_pt_regs(current);
1649
1648 fp = (void __user *)regs->bp; 1650 fp = (void __user *)regs->bp;
1649 1651
1650 callchain_store(entry, regs->ip); 1652 callchain_store(entry, regs->ip);
@@ -1656,7 +1658,7 @@ perf_callchain_user(struct pt_regs *regs, struct perf_callchain_entry *entry)
1656 if (!copy_stack_frame(fp, &frame)) 1658 if (!copy_stack_frame(fp, &frame))
1657 break; 1659 break;
1658 1660
1659 if ((unsigned long)fp < user_stack_pointer(regs)) 1661 if ((unsigned long)fp < regs->sp)
1660 break; 1662 break;
1661 1663
1662 callchain_store(entry, frame.return_address); 1664 callchain_store(entry, frame.return_address);