Commit a2e87d06 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar

perf_counter: update mmap() counter read, take 2

Update the userspace read method.

Paul noted that:
 - userspace cannot observe ->lock & 1 on the same cpu.
 - we need a barrier() between reading ->lock and ->index
   to ensure we read them in that prticular order.
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
LKML-Reference: <20090406094517.368446033@chello.nl>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 92f22a38
...@@ -170,22 +170,18 @@ struct perf_counter_mmap_page { ...@@ -170,22 +170,18 @@ struct perf_counter_mmap_page {
* u32 seq; * u32 seq;
* s64 count; * s64 count;
* *
* again: * do {
* seq = pc->lock; * seq = pc->lock;
* if (unlikely(seq & 1)) {
* cpu_relax();
* goto again;
* }
* *
* if (pc->index) { * barrier()
* count = pmc_read(pc->index - 1); * if (pc->index) {
* count += pc->offset; * count = pmc_read(pc->index - 1);
* } else * count += pc->offset;
* goto regular_read; * } else
* goto regular_read;
* *
* barrier(); * barrier();
* if (pc->lock != seq) * } while (pc->lock != seq);
* goto again;
* *
* NOTE: for obvious reason this only works on self-monitoring * NOTE: for obvious reason this only works on self-monitoring
* processes. * processes.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment