aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-05-18 04:33:24 -0400
committerIngo Molnar <mingo@elte.hu>2010-05-18 12:35:48 -0400
commitc7920614cebbf269a7c8397ff959a8dcf727465c (patch)
treed1ca38ee77cb4160660efb97b8bdc2e5c44967c1
parenta19d35c11fd559dd7dfd5a2078df7c9af74a5d88 (diff)
perf: Disallow mmap() on per-task inherited events
Since we now have working per-task-per-cpu events for a while, disallow mmap() on per-task inherited events. Those things were a performance problem anyway, and doing away with it allows us to optimize the buffer somewhat by assuming there is only a single writer. Signed-off-by: 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> Cc: Frederic Weisbecker <fweisbec@gmail.com> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/perf_event.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 6ae62186dd0c..ff5d430d45a7 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -2593,6 +2593,14 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)
2593 long user_extra, extra; 2593 long user_extra, extra;
2594 int ret = 0; 2594 int ret = 0;
2595 2595
2596 /*
2597 * Don't allow mmap() of inherited per-task counters. This would
2598 * create a performance issue due to all children writing to the
2599 * same buffer.
2600 */
2601 if (event->cpu == -1 && event->attr.inherit)
2602 return -EINVAL;
2603
2596 if (!(vma->vm_flags & VM_SHARED)) 2604 if (!(vma->vm_flags & VM_SHARED))
2597 return -EINVAL; 2605 return -EINVAL;
2598 2606