Skip to contentSkip to conversation

perf: Fix mmap_page::offset computation

tip:perf/fast tip-bot for Peter Zijlstra 1 participant 1 message Dec 21, 2011 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  365a4038486b57bb2bd516706a80f82f250f5306
Gitweb:     http://git.kernel.org/tip/365a4038486b57bb2bd516706a80f82f250f5306
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Mon, 21 Nov 2011 20:58:59 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 21 Dec 2011 11:01:09 +0100

perf: Fix mmap_page::offset computation

There's multiple reason the counter might be unavailable, change the condition to !->index since perf_event_index() should return 0 for all those cases.

---
 kernel/events/core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/events/core.c +1 -1
index 3894309..05affc3 100644
@@ -3268,7 +3268,7 @@ void perf_event_update_userpage(struct perf_event *event)
 	barrier();
 	userpg->index = perf_event_index(event);
 	userpg->offset = perf_event_count(event);
-	if (event->state == PERF_EVENT_STATE_ACTIVE)
+	if (userpg->index)
 		userpg->offset -= local64_read(&event->hw.prev_count);
 
 	userpg->time_enabled = enabled +