From: Borislav Petkov <bp@alien8.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@kernel.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Borislav Petkov <bp@alien8.de>, Robert Richter <rric@kernel.org>,
Borislav Petkov <bp@suse.de>
Subject: [RFC PATCH 1/3] perf: Add persistent events
Date: Fri, 15 Mar 2013 14:06:27 +0100 [thread overview]
Message-ID: <1363352789-17991-2-git-send-email-bp@alien8.de> (raw)
In-Reply-To: <1363352789-17991-1-git-send-email-bp@alien8.de>
Add the needed pieces for persistent events which makes them
process-agnostic. Also, make their buffers read-only when mmaping them
from userspace.
Signed-off-by: Borislav Petkov <bp@suse.de>
---
include/uapi/linux/perf_event.h | 3 ++-
kernel/events/core.c | 8 +++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 9fa9c622a7f4..4a4ae56195e1 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -270,8 +270,9 @@ struct perf_event_attr {
exclude_callchain_kernel : 1, /* exclude kernel callchains */
exclude_callchain_user : 1, /* exclude user callchains */
+ persistent : 1, /* always-on event */
- __reserved_1 : 41;
+ __reserved_1 : 40;
union {
__u32 wakeup_events; /* wakeup every n events */
diff --git a/kernel/events/core.c b/kernel/events/core.c
index b0cd86501c30..7c712b0c3b9a 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3560,6 +3560,9 @@ static void perf_mmap_close(struct vm_area_struct *vma)
{
struct perf_event *event = vma->vm_file->private_data;
+ if (event->attr.persistent)
+ return atomic_dec(&event->mmap_count);
+
if (atomic_dec_and_mutex_lock(&event->mmap_count, &event->mmap_mutex)) {
unsigned long size = perf_data_size(event->rb);
struct user_struct *user = event->mmap_user;
@@ -3603,7 +3606,10 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)
if (event->cpu == -1 && event->attr.inherit)
return -EINVAL;
- if (!(vma->vm_flags & VM_SHARED))
+ if (!(vma->vm_flags & VM_SHARED) && !event->attr.persistent)
+ return -EINVAL;
+
+ if (event->attr.persistent && (vma->vm_flags & VM_WRITE))
return -EINVAL;
vma_size = vma->vm_end - vma->vm_start;
--
1.8.1.3.535.ga923c31
next prev parent reply other threads:[~2013-03-15 13:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-15 13:06 [RFC PATCH 0/3] Perf persistent events Borislav Petkov
2013-03-15 13:06 ` Borislav Petkov [this message]
2013-04-06 15:53 ` [RFC PATCH 1/3] perf: Add " Robert Richter
2013-04-07 10:31 ` Borislav Petkov
2013-03-15 13:06 ` [RFC PATCH 2/3] perf: Add persistent event facilities Borislav Petkov
2013-03-18 9:13 ` Namhyung Kim
2013-03-18 12:11 ` Borislav Petkov
2013-03-28 18:15 ` Robert Richter
2013-04-03 17:27 ` Borislav Petkov
2013-04-06 16:29 ` Robert Richter
2013-03-15 13:06 ` [RFC PATCH 3/3] MCE: Enable persistent event Borislav Petkov
2013-03-18 8:38 ` [RFC PATCH 0/3] Perf persistent events Namhyung Kim
2013-03-18 8:46 ` Ingo Molnar
2013-03-28 15:52 ` Robert Richter
2013-03-29 14:25 ` Borislav Petkov
2013-03-18 8:40 ` Ingo Molnar
2013-03-18 15:16 ` Borislav Petkov
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=1363352789-17991-2-git-send-email-bp@alien8.de \
--to=bp@alien8.de \
--cc=a.p.zijlstra@chello.nl \
--cc=bp@suse.de \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rric@kernel.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