Skip to content

Commit f792565

Browse files
liu-song-6Peter Zijlstra
authored andcommitted
perf/core: fix userpage->time_enabled of inactive events
Users of rdpmc rely on the mmapped user page to calculate accurate time_enabled. Currently, userpage->time_enabled is only updated when the event is added to the pmu. As a result, inactive event (due to counter multiplexing) does not have accurate userpage->time_enabled. This can be reproduced with something like: /* open 20 task perf_event "cycles", to create multiplexing */ fd = perf_event_open(); /* open task perf_event "cycles" */ userpage = mmap(fd); /* use mmap and rdmpc */ while (true) { time_enabled_mmap = xxx; /* use logic in perf_event_mmap_page */ time_enabled_read = read(fd).time_enabled; if (time_enabled_mmap > time_enabled_read) BUG(); } Fix this by updating userpage for inactive events in merge_sched_in. Suggested-by: Peter Zijlstra (Intel) <[email protected]> Reported-and-tested-by: Lucian Grijincu <[email protected]> Signed-off-by: Song Liu <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent ecc2123 commit f792565

File tree

2 files changed

+33
-5
lines changed

2 files changed

+33
-5
lines changed

include/linux/perf_event.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,9 @@ struct perf_event {
683683
/*
684684
* timestamp shadows the actual context timing but it can
685685
* be safely used in NMI interrupt context. It reflects the
686-
* context time as it was when the event was last scheduled in.
686+
* context time as it was when the event was last scheduled in,
687+
* or when ctx_sched_in failed to schedule the event because we
688+
* run out of PMC.
687689
*
688690
* ctx_time already accounts for ctx->timestamp. Therefore to
689691
* compute ctx_time for a sample, simply add perf_clock().

kernel/events/core.c

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3707,6 +3707,29 @@ static noinline int visit_groups_merge(struct perf_cpu_context *cpuctx,
37073707
return 0;
37083708
}
37093709

3710+
static inline bool event_update_userpage(struct perf_event *event)
3711+
{
3712+
if (likely(!atomic_read(&event->mmap_count)))
3713+
return false;
3714+
3715+
perf_event_update_time(event);
3716+
perf_set_shadow_time(event, event->ctx);
3717+
perf_event_update_userpage(event);
3718+
3719+
return true;
3720+
}
3721+
3722+
static inline void group_update_userpage(struct perf_event *group_event)
3723+
{
3724+
struct perf_event *event;
3725+
3726+
if (!event_update_userpage(group_event))
3727+
return;
3728+
3729+
for_each_sibling_event(event, group_event)
3730+
event_update_userpage(event);
3731+
}
3732+
37103733
static int merge_sched_in(struct perf_event *event, void *data)
37113734
{
37123735
struct perf_event_context *ctx = event->ctx;
@@ -3725,14 +3748,15 @@ static int merge_sched_in(struct perf_event *event, void *data)
37253748
}
37263749

37273750
if (event->state == PERF_EVENT_STATE_INACTIVE) {
3751+
*can_add_hw = 0;
37283752
if (event->attr.pinned) {
37293753
perf_cgroup_event_disable(event, ctx);
37303754
perf_event_set_state(event, PERF_EVENT_STATE_ERROR);
3755+
} else {
3756+
ctx->rotate_necessary = 1;
3757+
perf_mux_hrtimer_restart(cpuctx);
3758+
group_update_userpage(event);
37313759
}
3732-
3733-
*can_add_hw = 0;
3734-
ctx->rotate_necessary = 1;
3735-
perf_mux_hrtimer_restart(cpuctx);
37363760
}
37373761

37383762
return 0;
@@ -6324,6 +6348,8 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)
63246348

63256349
ring_buffer_attach(event, rb);
63266350

6351+
perf_event_update_time(event);
6352+
perf_set_shadow_time(event, event->ctx);
63276353
perf_event_init_userpage(event);
63286354
perf_event_update_userpage(event);
63296355
} else {

0 commit comments

Comments
 (0)