Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1895C3BF66B for ; Fri, 21 Aug 2026 11:33:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787311997; cv=none; b=BtR9eH1AcG6XXBFMn5K/MruYibsr2gQ2eiX7c6KXmCqrcL4djU78u7hI+H4GVRBCus7R5rTngIn/upyU75lVYKse6FYb0bHIM2yW2fD+zSGb+6UTqFmvE6NdedRpe0LClAKassMUXUFQBhHwoXGwZxOuat7m6DOP2302/ATeSkk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787311997; c=relaxed/simple; bh=rgvQZBfpWaOfnE3uz/47jT/zuN+CgD70rt83EV5t4Hs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PdQhqkXaDjqeh/bgSbGeOswM6UQAJp0x4MudqBkf7nZe3FS4odE504fAw4BLG4Yvj1Xycp6syHIM47aIrx6rGtJTHRBTVVmRPRj/7bqXclCK9GDzrRP1q1Z8KbNZODfvC8/mkoLLjZigw5M8v1wbZXxZCi7m7mwuTKebgiTgVlw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GJvWWeTG; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GJvWWeTG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33B0C1F000E9; Fri, 21 Aug 2026 11:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787311995; bh=N/BcEjuym6YhSurCgbZX3xAFrXgoZP9aIu8XyJy2Os0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GJvWWeTGBXP4xuWRYQklfG5sAecF7CkrRIn9NUu4u4prkQopNxUJXUdNUg1x33x49 Al2jMJrAObGnFa+7QWxagyeX6vYpWSLAU/mhmqUr7UEGZ102d42P4bd04b6gUCgDN1 9GaEh2OLmwhvenwqXxJCcq24yNFek8BimiwAtlmF06fl82mZ3SIKWNa6fSmy94ZSvU d85hUlokw25ovCl+LsCtJNlrMC2UPXcHu7WlB+aMUl2z/kBJVAnQSJgA93xpP+vXBP UopDu8hLBK8EVn5nOHhTOwBty33xiCYBcBpSaO1NUfa0Eaa7nqEULxVsTJuhTFhLWB mevVg2ttLmbLQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Peter Zijlstra , Leo Yan , Sasha Levin Subject: [PATCH 5.10.y 1/3] perf: Fix cgroup state vs ERROR Date: Fri, 21 Aug 2026 07:33:07 -0400 Message-ID: <20260821113309.2981106-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026081732-unmixed-crudely-500c@gregkh> References: <2026081732-unmixed-crudely-500c@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Peter Zijlstra [ Upstream commit 61988e36dc5457cdff7ae7927e8d9ad1419ee998 ] While chasing down a missing perf_cgroup_event_disable() elsewhere, Leo Yan found that both perf_put_aux_event() and perf_remove_sibling_event() were also missing one. Specifically, the rule is that events that switch to OFF,ERROR need to call perf_cgroup_event_disable(). Unify the disable paths to ensure this. Fixes: ab43762ef010 ("perf: Allow normal events to output AUX data") Fixes: 9f0c4fa111dc ("perf/core: Add a new PERF_EV_CAP_SIBLING event capability") Reported-by: Leo Yan Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20250605123343.GD35970@noisy.programming.kicks-ass.net Stable-dep-of: 42c5ca1f0a28 ("perf/core: Fix group leader use-after-free after sibling detach") Signed-off-by: Sasha Levin --- kernel/events/core.c | 56 ++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index c9cd1f622a1fc..756152374a3b9 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2145,14 +2145,13 @@ perf_aux_output_match(struct perf_event *event, struct perf_event *aux_event) } static void put_event(struct perf_event *event); -static void event_sched_out(struct perf_event *event, - struct perf_cpu_context *cpuctx, - struct perf_event_context *ctx); +static void __event_disable(struct perf_event *event, + struct perf_event_context *ctx, + enum perf_event_state state); static void perf_put_aux_event(struct perf_event *event) { struct perf_event_context *ctx = event->ctx; - struct perf_cpu_context *cpuctx = __get_cpu_context(ctx); struct perf_event *iter; /* @@ -2181,8 +2180,7 @@ static void perf_put_aux_event(struct perf_event *event) * state so that we don't try to schedule it again. Note * that perf_event_enable() will clear the ERROR status. */ - event_sched_out(iter, cpuctx, ctx); - perf_event_set_state(event, PERF_EVENT_STATE_ERROR); + __event_disable(iter, ctx, PERF_EVENT_STATE_ERROR); } } @@ -2236,21 +2234,6 @@ static inline struct list_head *get_event_list(struct perf_event *event) return event->attr.pinned ? &ctx->pinned_active : &ctx->flexible_active; } -/* - * Events that have PERF_EV_CAP_SIBLING require being part of a group and - * cannot exist on their own, schedule them out and move them into the ERROR - * state. Also see _perf_event_enable(), it will not be able to recover - * this ERROR state. - */ -static inline void perf_remove_sibling_event(struct perf_event *event) -{ - struct perf_event_context *ctx = event->ctx; - struct perf_cpu_context *cpuctx = __get_cpu_context(ctx); - - event_sched_out(event, cpuctx, ctx); - perf_event_set_state(event, PERF_EVENT_STATE_ERROR); -} - static void perf_group_detach(struct perf_event *event) { struct perf_event *leader = event->group_leader; @@ -2286,8 +2269,15 @@ static void perf_group_detach(struct perf_event *event) */ list_for_each_entry_safe(sibling, tmp, &event->sibling_list, sibling_list) { + /* + * Events that have PERF_EV_CAP_SIBLING require being part of + * a group and cannot exist on their own, schedule them out + * and move them into the ERROR state. Also see + * _perf_event_enable(), it will not be able to recover this + * ERROR state. + */ if (sibling->event_caps & PERF_EV_CAP_SIBLING) - perf_remove_sibling_event(sibling); + __event_disable(sibling, ctx, PERF_EVENT_STATE_ERROR); sibling->group_leader = sibling; list_del_init(&sibling->sibling_list); @@ -2494,6 +2484,15 @@ static void perf_remove_from_context(struct perf_event *event, unsigned long fla } } +static void __event_disable(struct perf_event *event, + struct perf_event_context *ctx, + enum perf_event_state state) +{ + event_sched_out(event, __get_cpu_context(ctx), ctx); + perf_cgroup_event_disable(event, ctx); + perf_event_set_state(event, state); +} + /* * Cross CPU call to disable a performance event */ @@ -2510,13 +2509,18 @@ static void __perf_event_disable(struct perf_event *event, update_cgrp_time_from_event(event); } + /* + * When disabling a group leader, the whole group becomes ineligible + * to run, so schedule out the full group. + */ if (event == event->group_leader) group_sched_out(event, cpuctx, ctx); - else - event_sched_out(event, cpuctx, ctx); - perf_event_set_state(event, PERF_EVENT_STATE_OFF); - perf_cgroup_event_disable(event, ctx); + /* + * But only mark the leader OFF; the siblings will remain + * INACTIVE. + */ + __event_disable(event, ctx, PERF_EVENT_STATE_OFF); } /* -- 2.53.0