[PATCH] perf_counter: allow and require one-page mmap on counting counters

Paul Mackerras
2009-03-25T08:15:53Z

Impact: bug fix

Currently the mmap code requires that the length of the mmap be at least
two pages. That is fine for sampling counters, but for counting
counters the second and subsequent pages are just wasted, since counting
counters don't generate events.

This changes the code to require that the mmap be one page in length
for counting counters, and applies the existing check to sampling
counters.

Signed-off-by: Paul Mackerras <paulus@samba.org>
---
Ingo, please pull this from the master branch of my perfcounters.git
repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perfcounters.git master

kernel/perf_counter.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index affe227..0412c7c 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -1362,8 +1362,13 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)
vma_size = vma->vm_end - vma->vm_start;
nr_pages = (vma_size / PAGE_SIZE) - 1;

- if (nr_pages == 0 || !is_power_of_2(nr_pages))
- return -EINVAL;
+ if (counter->hw_event.record_type == PERF_RECORD_SIMPLE) {
+ if (nr_pages)
+ return -EINVAL;
+ } else {
+ if (nr_pages == 0 || !is_power_of_2(nr_pages))
+ return -EINVAL;
+ }

if (vma_size != PAGE_SIZE * (1 + nr_pages))
return -EINVAL;
--
1.5.6.3