diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2025-04-16 11:36:24 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2025-04-17 14:21:15 +0200 |
| commit | b02b41c827de9f4b785f57e82d76d0826cc8398b (patch) | |
| tree | cc2a12d34bf3547ee562799dacf9273132bb24d9 | |
| parent | perf/core: Fix event->parent life-time issue (diff) | |
| download | wireguard-linux-b02b41c827de9f4b785f57e82d76d0826cc8398b.tar.xz wireguard-linux-b02b41c827de9f4b785f57e82d76d0826cc8398b.zip | |
perf/core: Fix event timekeeping merge
Due to an oversight in merging:
da916e96e2de ("perf: Make perf_pmu_unregister() useable")
on top of:
a3c3c66670ce ("perf/core: Fix child_total_time_enabled accounting bug at task exit")
the timekeeping fix from this latter patch got undone.
Redo it.
Fixes: da916e96e2de ("perf: Make perf_pmu_unregister() useable")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lkml.kernel.org/r/20250417080815.GI38216@noisy.programming.kicks-ass.net
| -rw-r--r-- | kernel/events/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 43d87de3d4f2..07414cb1279b 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2500,14 +2500,14 @@ __perf_remove_from_context(struct perf_event *event, state = PERF_EVENT_STATE_DEAD; } event_sched_out(event, ctx); + perf_event_set_state(event, min(event->state, state)); + if (flags & DETACH_GROUP) perf_group_detach(event); if (flags & DETACH_CHILD) perf_child_detach(event); list_del_event(event, ctx); - event->state = min(event->state, state); - if (!pmu_ctx->nr_events) { pmu_ctx->rotate_necessary = 0; |