From: tip-bot for Peter Zijlstra <a.p.zijlstra@chello.nl>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, eranian@google.com, hpa@zytor.com,
mingo@kernel.org, torvalds@linux-foundation.org,
a.p.zijlstra@chello.nl, fweisbec@gmail.com,
akpm@linux-foundation.org, tglx@linutronix.de
Subject: [tip:perf/core] perf/x86: Fix USER/KERNEL tagging of samples
Date: Thu, 5 Jul 2012 23:20:39 -0700 [thread overview]
Message-ID: <tip-xxrt0a1zronm1sm36obwc2vy@git.kernel.org> (raw)
Commit-ID: ce5c1fe9a9e059b5c58f0a7e2a3e687d0efac815
Gitweb: http://git.kernel.org/tip/ce5c1fe9a9e059b5c58f0a7e2a3e687d0efac815
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
AuthorDate: Wed, 20 Jun 2012 11:11:38 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 5 Jul 2012 20:59:07 +0200
perf/x86: Fix USER/KERNEL tagging of samples
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 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index c4706cf..6ef9d41 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -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;
next reply other threads:[~2012-07-06 6:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-06 6:20 tip-bot for Peter Zijlstra [this message]
2012-07-06 16:29 ` [tip:perf/core] perf/x86: Fix USER/KERNEL tagging of samples Linus Torvalds
2012-07-06 18:12 ` Peter Zijlstra
2012-07-06 18:16 ` Linus Torvalds
2012-07-06 18:34 ` Linus Torvalds
2012-07-06 20:48 ` Peter Zijlstra
2012-07-06 20:59 ` Linus Torvalds
2012-07-09 11:23 ` Peter Zijlstra
2012-07-09 17:55 ` Linus Torvalds
2012-07-10 9:02 ` Peter Zijlstra
2012-07-10 9:48 ` Ingo Molnar
2012-07-10 9:50 ` Peter Zijlstra
2012-07-10 9:52 ` Peter Zijlstra
2012-07-10 9:55 ` Ingo Molnar
2012-07-31 17:57 ` [tip:perf/urgent] perf/x86: Fix USER/ KERNEL tagging of samples properly tip-bot for Peter Zijlstra
2012-07-09 18:41 ` [tip:perf/core] perf/x86: Fix USER/KERNEL tagging of samples Ingo Molnar
2012-07-10 7:54 ` Peter Zijlstra
2012-07-10 8:02 ` Ingo Molnar
2012-07-10 8:21 ` Ingo Molnar
2012-07-10 8:52 ` Peter Zijlstra
2012-07-10 9:48 ` Ingo Molnar
2012-07-31 18:11 ` H. Peter Anvin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-xxrt0a1zronm1sm36obwc2vy@git.kernel.org \
--to=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).