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 3DB7D352C5B for ; Fri, 21 Aug 2026 03:59:44 +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=1787284786; cv=none; b=trO76ka3jvQ2MHNNLWyYSea3W0HKcfmJy3s80LAkTk8yM1ybfkFvEgYYVS/iALXBHXUcaYnpayaPPTo+tF03LwbkeGgBCMOQvg2EFGQeb7TbhVU7VTs7Bct6FNMfL+jZNpYixQyx1TbkJp5iokdtXmVHAhzdE85XOSqedTGMAGc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787284786; c=relaxed/simple; bh=eh6O7bhoBsqMDi5K0v2L0H6NYvefYpR4uz3PQPYXaPY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qt41HD66UqL+HsA8T6moC5MJNMc5JisrYwQZNgeZQP5hdgj4nnL7OQwPkRQVtgicQMNT92qZHNh/uKpap228Sf2bpJ2IBsiskbDcgaSb7KDwQRGiBCuP062jWGLhvrV0XKd+RcoWjdWTpxQToN6fMgeWI7Hh1JeOOES1pNdLDpM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZDe2ElAa; 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="ZDe2ElAa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59D021F00A3A; Fri, 21 Aug 2026 03:59:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787284784; bh=gBwJ2D4mAo33CNUhTEha3SvmWvoEgtLuiTRIAuxea34=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZDe2ElAa81COgv5wyboLfw7H8HIlruBGy/TxEak7kYw3Jq39cJyxd+BskOKPIsnOd VjmrjFLVQ+eUDOeFI1mPfdEaX0/CvDIwR/mUw0TEpOJpMomI1J/b5ipR2onJaMiWdu G7b8mI1S3GyKEKAm3nk57IQTrvxe/Qurtyvf4cIQTeB+ILX7QCszuuRQYcc0zKJIZN h3rApHxA6+HvtT0aD7txniV8neBeRqfHvIKHJtkdBh78Tsp/h/ZYtQf+5mnpHiyxbB pKBE19qf2phoZi6vC5Mlmslpo0Ez5VPoHZT11P9cBitlm0d+4ziUqi374xO3JKFHOO 3HZd8nvN4wiqA== From: Sasha Levin To: stable@vger.kernel.org Cc: Peter Zijlstra , Leo Yan , Sasha Levin Subject: [PATCH 6.1.y 2/4] perf: Fix cgroup state vs ERROR Date: Thu, 20 Aug 2026 23:59:38 -0400 Message-ID: <20260821035940.2526518-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260821035940.2526518-1-sashal@kernel.org> References: <2026081730-distance-sherry-000f@gregkh> <20260821035940.2526518-1-sashal@kernel.org> 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 79a40c287f6b8..cdbcc5a29b063 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2059,14 +2059,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; /* @@ -2095,8 +2094,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); } } @@ -2150,21 +2148,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; @@ -2200,8 +2183,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); @@ -2463,6 +2453,15 @@ static void perf_remove_from_context(struct perf_event *event, unsigned long fla event_function_call(event, __perf_remove_from_context, (void *)flags); } +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 */ @@ -2479,13 +2478,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