perf: Fix dangling cgroup pointer in cpuctx

Commit a3c3c6667("perf/core: Fix child_total_time_enabled accounting
bug at task exit") moves the event->state update to before
list_del_event(). This makes the event->state test in list_del_event()
always false; never calling perf_cgroup_event_disable().

As a result, cpuctx->cgrp won't be cleared properly; causing havoc.

Fixes: a3c3c6667("perf/core: Fix child_total_time_enabled accounting bug at task exit")
Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: David Wang <00107082@163.com>
Link: https://lore.kernel.org/all/aD2TspKH%2F7yvfYoO@e129823.arm.com/

authored by Yeoreum Yun and committed by Peter Zijlstra 3b7a34ae 61988e36

+6 -15
+6 -15
kernel/events/core.c
··· 2120 if (event->group_leader == event) 2121 del_event_from_groups(event, ctx); 2122 2123 - /* 2124 - * If event was in error state, then keep it 2125 - * that way, otherwise bogus counts will be 2126 - * returned on read(). The only way to get out 2127 - * of error state is by explicit re-enabling 2128 - * of the event 2129 - */ 2130 - if (event->state > PERF_EVENT_STATE_OFF) { 2131 - perf_cgroup_event_disable(event, ctx); 2132 - perf_event_set_state(event, PERF_EVENT_STATE_OFF); 2133 - } 2134 - 2135 ctx->generation++; 2136 event->pmu_ctx->nr_events--; 2137 } ··· 2476 state = PERF_EVENT_STATE_EXIT; 2477 if (flags & DETACH_REVOKE) 2478 state = PERF_EVENT_STATE_REVOKED; 2479 - if (flags & DETACH_DEAD) { 2480 - event->pending_disable = 1; 2481 state = PERF_EVENT_STATE_DEAD; 2482 - } 2483 event_sched_out(event, ctx); 2484 perf_event_set_state(event, min(event->state, state)); 2485 2486 if (flags & DETACH_GROUP)
··· 2120 if (event->group_leader == event) 2121 del_event_from_groups(event, ctx); 2122 2123 ctx->generation++; 2124 event->pmu_ctx->nr_events--; 2125 } ··· 2488 state = PERF_EVENT_STATE_EXIT; 2489 if (flags & DETACH_REVOKE) 2490 state = PERF_EVENT_STATE_REVOKED; 2491 + if (flags & DETACH_DEAD) 2492 state = PERF_EVENT_STATE_DEAD; 2493 + 2494 event_sched_out(event, ctx); 2495 + 2496 + if (event->state > PERF_EVENT_STATE_OFF) 2497 + perf_cgroup_event_disable(event, ctx); 2498 + 2499 perf_event_set_state(event, min(event->state, state)); 2500 2501 if (flags & DETACH_GROUP)