From nobody Sun Apr 12 12:53:19 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C35C4C6FD1D for ; Wed, 15 Mar 2023 21:03:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232538AbjCOVDH (ORCPT ); Wed, 15 Mar 2023 17:03:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231971AbjCOVDE (ORCPT ); Wed, 15 Mar 2023 17:03:04 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29666A2193; Wed, 15 Mar 2023 14:02:35 -0700 (PDT) Date: Wed, 15 Mar 2023 21:01:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1678914086; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rQDe+aTeE4qENndIwz1O+WFE52XvI5+P/zTU+CioWGI=; b=3tmcIHL9ZgTfFFqhjE6SYTd6+fF6JZsHb0OjbEOwgxVlKac159KtqjoIKTvvkNuLjopUOj IoCsy0t7jVy638x1LW4fjWzM/KiNbDKNU8mJe5G/8V3ZZAJ5qFRGwut2mqIboW7RSaU/HS L+0G4ArNziCU9KHYJetNwTlmGWYJcND8XJFZuN9GEF1cWUvJi8Xruag6kSF7BNGyj2S4iR AH9x/gOl0+AberMiTRdXmq0QYZfMZTWxL7DxWg8HHlijAcSvVTrP25INMKtSKaDGyB9Z16 pixa5moefti9ynWTlIB6503ZEsC6074uVGDupdDuQG2rNXYv5kcCB8Mvy/lKvQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1678914086; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rQDe+aTeE4qENndIwz1O+WFE52XvI5+P/zTU+CioWGI=; b=oaO34zHgrXlq27uIrPDl2B4fNXAHj/KEA03NTcDMPBFo27ul9nd8Ub+HLgfruzL4FhhB4U FhGAYuDsql9I9WCA== From: "tip-bot2 for Budimir Markovic" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/urgent] perf: Fix check before add_event_to_groups() in perf_group_detach() Cc: Budimir Markovic , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <167891408482.5837.1916820071250811928.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the perf/urgent branch of tip: Commit-ID: fd0815f632c24878e325821943edccc7fde947a2 Gitweb: https://git.kernel.org/tip/fd0815f632c24878e325821943edccc7f= de947a2 Author: Budimir Markovic AuthorDate: Wed, 15 Mar 2023 00:29:01 -07:00 Committer: Peter Zijlstra CommitterDate: Wed, 15 Mar 2023 21:49:47 +01:00 perf: Fix check before add_event_to_groups() in perf_group_detach() Events should only be added to a groups rb tree if they have not been removed from their context by list_del_event(). Since remove_on_exec made it possible to call list_del_event() on individual events before they are detached from their group, perf_group_detach() should check each sibling's attach_state before calling add_event_to_groups() on it. Fixes: 2e498d0a74e5 ("perf: Add support for event removal on exec") Signed-off-by: Budimir Markovic Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/ZBFzvQV9tEqoHEtH@gentoo --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 52b4aa0..fb3e436 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2163,7 +2163,7 @@ static void perf_group_detach(struct perf_event *even= t) /* Inherit group flags from the previous leader */ sibling->group_caps =3D event->group_caps; =20 - if (!RB_EMPTY_NODE(&event->group_node)) { + if (sibling->attach_state & PERF_ATTACH_CONTEXT) { add_event_to_groups(sibling, event->ctx); =20 if (sibling->state =3D=3D PERF_EVENT_STATE_ACTIVE)