lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf_counter: update mmap() counter read, take 2

Browse Source 
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: Peter 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: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra
2009-04-06 11:44:59 +02:00
committed by Ingo Molnar
parent 92f22a3865
commit a2e87d06dd
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/perf_counter.h
View File

@@ -170,13 +170,10 @@ 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;
* }
* *
* barrier()
* if (pc->index) { * if (pc->index) {
* count = pmc_read(pc->index - 1); * count = pmc_read(pc->index - 1);
* count += pc->offset; * count += pc->offset;
@@ -184,8 +181,7 @@ struct perf_counter_mmap_page {
* goto regular_read; * 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.