Since __perf_remove_from_context updates event->state before list_del_event,
this prevents list_del_event from calling perf_cgroup_event_disable,
resulting in will not update nr_cgroups and cpuctx->cgrp.

To resolve this issue:
 1. First update the event time to ensure perf_child_detach uses
    accurate event time.
 2. Then update event->state after list_del_event completes.

Fixes: a3c3c66670ce ("perf/core: Fix child_total_time_enabled accounting bug at task exit")
Signed-off-by: Luo Gengkun <luogengkun@huaweicloud.com>
---
 kernel/events/core.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 95e703891b24..ecb4d852a006 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -2482,12 +2482,17 @@ __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));
+	perf_event_update_time(event);
 	if (flags & DETACH_GROUP)
 		perf_group_detach(event);
 	if (flags & DETACH_CHILD)
 		perf_child_detach(event);
 	list_del_event(event, ctx);
+	/*
+	 * Update the event->state after list_del_event.
+	 */
+	if (flags & (DETACH_DEAD | DETACH_EXIT))
+		event->state = state;
 
 	if (!pmu_ctx->nr_events) {
 		pmu_ctx->rotate_necessary = 0;
-- 
2.34.1