From nobody Sun Feb 8 18:32:13 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 460B01FF612; Tue, 4 Mar 2025 08:57:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741078629; cv=none; b=dRMLwXHQexszLXBO/wXy/xdERPVynDE4flXHThI0KPa0A51ACbFs0qWLqyetQtB6Hr6tZR/+GduHmrYWaCdrA8AIMmSOk/rd55nsik1nVJuzYNDtNpEPYOTwH3KhJRUIedSkLMWUQXSRPHKCPtCXjgpt+4KSA+OfVYGpnJsoU8U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741078629; c=relaxed/simple; bh=LNMIcbcZQR2OXRIriGHiYfj4FDAJt+daTFSbSBDfNnU=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=QRp0GhiGycNizO4ksMXExU+FvGOsayTegSSG2jJo/o5m+J7L0pjWY72v2wELK0WfZ4ywfqH1cKkoog7ggh8L9pC+HCzi9WMs3HQGVslZ1mZjewXE90USehV+u0AlvpEYwgjb4Z20uJ/If47svXF+fl0HejgbvI4tGpgahPb8lHo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=RbDD9ZJh; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=BMVEgoma; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="RbDD9ZJh"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="BMVEgoma" Date: Tue, 04 Mar 2025 08:57:04 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1741078625; 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=ChC2i2N1N+s+r04aP94MURIVHIUGhRlTudz5cCoJSU4=; b=RbDD9ZJhVNCJUv1g6Tv9FtGcXHIyYWp8kRYRacl7Smx6HXfCBx0UyIVdCVIekOFOaZFfNV DEwemXo+q9NsJFyGufOEgNDAF4RwXEzMOUctgu+k2IGKAGyoopd70L3A2H4DHWRJvzFeRs BE952ID+FVFIwGaptqc5C6JFOP4zMWXk45B1A7c7GV5RAk2bi7Uf88kVGnZGOeVyiZC2xI lPEYm0fkW5NdChljeKfGZco/tB3UjPAesVnKhRzFBCFH45F444k4HHuETLVGeQ5wmVVnqO LhAYou/OCiMyDZGCAl3YglL6daS4pIenwlj/CMME8kQBaZx8KjmnAd569bWOow== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1741078625; 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=ChC2i2N1N+s+r04aP94MURIVHIUGhRlTudz5cCoJSU4=; b=BMVEgomaryzb3dOZQxx3qIuRDcT1fqXMYEYwfSw9x/oGYFk3kHe2+H+K9iRWgbhWhlgVEj adh2WxzDosFoemBg== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf/core: Simplify perf_init_event() Cc: "Peter Zijlstra (Intel)" , Ingo Molnar , Ravi Bangoria , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20241104135518.302444446@infradead.org> References: <20241104135518.302444446@infradead.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <174107862498.14745.12575934163190392365.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the perf/core branch of tip: Commit-ID: caf8b765d453198d4ca5305d9e207535934b6e3b Gitweb: https://git.kernel.org/tip/caf8b765d453198d4ca5305d9e2075359= 34b6e3b Author: Peter Zijlstra AuthorDate: Mon, 04 Nov 2024 14:39:16 +01:00 Committer: Ingo Molnar CommitterDate: Tue, 04 Mar 2025 09:42:32 +01:00 perf/core: Simplify perf_init_event() Use the guard() and scoped_guard() infrastructure to simplify the control flow. Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Reviewed-by: Ravi Bangoria Cc: Thomas Gleixner Link: https://lore.kernel.org/r/20241104135518.302444446@infradead.org --- kernel/events/core.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 215dad5..fd35236 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -12101,10 +12101,10 @@ static int perf_try_init_event(struct pmu *pmu, s= truct perf_event *event) static struct pmu *perf_init_event(struct perf_event *event) { bool extended_type =3D false; - int idx, type, ret; struct pmu *pmu; + int type, ret; =20 - idx =3D srcu_read_lock(&pmus_srcu); + guard(srcu)(&pmus_srcu); =20 /* * Save original type before calling pmu->event_init() since certain @@ -12117,7 +12117,7 @@ static struct pmu *perf_init_event(struct perf_even= t *event) pmu =3D event->parent->pmu; ret =3D perf_try_init_event(pmu, event); if (!ret) - goto unlock; + return pmu; } =20 /* @@ -12136,13 +12136,12 @@ static struct pmu *perf_init_event(struct perf_ev= ent *event) } =20 again: - rcu_read_lock(); - pmu =3D idr_find(&pmu_idr, type); - rcu_read_unlock(); + scoped_guard (rcu) + pmu =3D idr_find(&pmu_idr, type); if (pmu) { if (event->attr.type !=3D type && type !=3D PERF_TYPE_RAW && !(pmu->capabilities & PERF_PMU_CAP_EXTENDED_HW_TYPE)) - goto fail; + return ERR_PTR(-ENOENT); =20 ret =3D perf_try_init_event(pmu, event); if (ret =3D=3D -ENOENT && event->attr.type !=3D type && !extended_type) { @@ -12151,27 +12150,21 @@ again: } =20 if (ret) - pmu =3D ERR_PTR(ret); + return ERR_PTR(ret); =20 - goto unlock; + return pmu; } =20 list_for_each_entry_rcu(pmu, &pmus, entry, lockdep_is_held(&pmus_srcu)) { ret =3D perf_try_init_event(pmu, event); if (!ret) - goto unlock; + return pmu; =20 - if (ret !=3D -ENOENT) { - pmu =3D ERR_PTR(ret); - goto unlock; - } + if (ret !=3D -ENOENT) + return ERR_PTR(ret); } -fail: - pmu =3D ERR_PTR(-ENOENT); -unlock: - srcu_read_unlock(&pmus_srcu, idx); =20 - return pmu; + return ERR_PTR(-ENOENT); } =20 static void attach_sb_event(struct perf_event *event)