]> git.karo-electronics.de Git - linux-beck.git/commitdiff
perf/x86: Fix USER/KERNEL tagging of samples
authorPeter Zijlstra <a.p.zijlstra@chello.nl>
Wed, 20 Jun 2012 09:11:38 +0000 (11:11 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 5 Jul 2012 18:59:07 +0000 (20:59 +0200)
Several perf interrupt handlers (PEBS,IBS,BTS) re-write regs->ip but
do not update the segment registers. So use an regs->ip based test
instead of an regs->cs/regs->flags based test.

Reported-and-tested-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/n/tip-xxrt0a1zronm1sm36obwc2vy@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/perf_event.c

index c4706cf9c011d8fd068d205ed0b669142c112400..6ef9d41b87f98ef374c8d2255a081d95ea9df227 100644 (file)
@@ -1863,7 +1863,7 @@ unsigned long perf_misc_flags(struct pt_regs *regs)
                else
                        misc |= PERF_RECORD_MISC_GUEST_KERNEL;
        } else {
-               if (user_mode(regs))
+               if (!kernel_ip(regs->ip))
                        misc |= PERF_RECORD_MISC_USER;
                else
                        misc |= PERF_RECORD_MISC_KERNEL;