Skip to contentSkip to conversation

perf_counter, x86: Fix call-chain walking

tip:perfcounters/core tip-bot for Ingo Molnar 1 participant 1 message Jun 14, 2009 x86

lore
Share & tools
lore
#0 lore raw
Commit-ID:  5a6cec3abbdb74244caab68db100825a8c4ac02d
Gitweb:     http://git.kernel.org/tip/5a6cec3abbdb74244caab68db100825a8c4ac02d
Author:     Ingo Molnar <[email protected]>
AuthorDate: Fri, 29 May 2009 11:25:09 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sun, 14 Jun 2009 22:37:15 +0200

perf_counter, x86: Fix call-chain walking

Fix the ptregs variant when we hit user-mode tasks.

Cc: Frederic Weisbecker <[email protected]>
Cc: Pekka Enberg <[email protected]>
Cc: Arjan van de Ven <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
LKML-Reference: <new-submission>

---
 arch/x86/kernel/cpu/perf_counter.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/perf_counter.c +4 -2
index 77a59a5..09d8cb6 100644
@@ -1644,7 +1644,9 @@ perf_callchain_user(struct pt_regs *regs, struct perf_callchain_entry *entry)
 	const void __user *fp;
 	int nr = entry->nr;
 
-	regs = (struct pt_regs *)current->thread.sp0 - 1;
+	if (!user_mode(regs))
+		regs = task_pt_regs(current);
+
 	fp   = (void __user *)regs->bp;
 
 	callchain_store(entry, regs->ip);
@@ -1656,7 +1658,7 @@ perf_callchain_user(struct pt_regs *regs, struct perf_callchain_entry *entry)
 		if (!copy_stack_frame(fp, &frame))
 			break;
 
-		if ((unsigned long)fp < user_stack_pointer(regs))
+		if ((unsigned long)fp < regs->sp)
 			break;
 
 		callchain_store(entry, frame.return_address);