From nobody Wed Feb 11 09:20:42 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 41DE8C7EE22 for ; Wed, 10 May 2023 13:33:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237143AbjEJNdv (ORCPT ); Wed, 10 May 2023 09:33:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237038AbjEJNdo (ORCPT ); Wed, 10 May 2023 09:33:44 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 014AF98; Wed, 10 May 2023 06:33:42 -0700 (PDT) Date: Wed, 10 May 2023 13:33:41 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1683725621; 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=qADTTeN46tJznf0RtUMYpgdOlRKAf0uSFMM7i3CA1bM=; b=vTRknf9ohHDkFAi3ChtsEE7D+hLUQZGui6yb6fPwVigf0noDOKY+X7OjKc8kPotBKqe/LT FTgGEm3YTMK6s91UoFd8jvLwuL+det+39dkKDZQEXOXrjDMRCtSUHjobmkUcAa4ObiYGO3 juQIqgpYKysdpuXWE7/T/kRxpDhboyNlLp9f6V93pjiQWZJgsG2S3bekr06aN/f3NsZxDT enVfhaCsIu/4WA3oIsUZnQ2H/DV3SHNjM0NPm4y2KT56catUR/O75HTlZF3kxfM/UJXeQM tgk+HdMX+en43j5lfA2Ai/4NoQlsg7ZL7sNywJXyGfBoMJ2APN1n3VrTb7pB3Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1683725621; 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=qADTTeN46tJznf0RtUMYpgdOlRKAf0uSFMM7i3CA1bM=; b=GgFvvgJeOV9+aCLW+SlAQ1sp0yzyaJuBy+B/Zm390LLOHKhSIAc+182MSfKASIvF49LHjU 8Ckkf8h/yJlzBLBQ== From: "tip-bot2 for Ravi Bangoria" 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: Remove pmu linear searching code Cc: Ravi Bangoria , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230504110003.2548-4-ravi.bangoria@amd.com> References: <20230504110003.2548-4-ravi.bangoria@amd.com> MIME-Version: 1.0 Message-ID: <168372562124.404.3938002441520901647.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/core branch of tip: Commit-ID: 9551fbb64d094cc105964716224adeb7765df8fd Gitweb: https://git.kernel.org/tip/9551fbb64d094cc105964716224adeb77= 65df8fd Author: Ravi Bangoria AuthorDate: Thu, 04 May 2023 16:30:02 +05:30 Committer: Peter Zijlstra CommitterDate: Mon, 08 May 2023 10:58:31 +02:00 perf/core: Remove pmu linear searching code Searching for the right pmu by iterating over all pmus is no longer required since all pmus now *must* be present in the 'pmu_idr' list. So, remove linear searching code. Signed-off-by: Ravi Bangoria Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20230504110003.2548-4-ravi.bangoria@amd.com --- kernel/events/core.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index c01bbe9..231b187 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -11630,38 +11630,27 @@ static struct pmu *perf_init_event(struct perf_ev= ent *event) } =20 again: + ret =3D -ENOENT; rcu_read_lock(); pmu =3D idr_find(&pmu_idr, type); rcu_read_unlock(); - if (pmu) { - if (event->attr.type !=3D type && type !=3D PERF_TYPE_RAW && - !(pmu->capabilities & PERF_PMU_CAP_EXTENDED_HW_TYPE)) - goto fail; - - ret =3D perf_try_init_event(pmu, event); - if (ret =3D=3D -ENOENT && event->attr.type !=3D type && !extended_type) { - type =3D event->attr.type; - goto again; - } + if (!pmu) + goto fail; =20 - if (ret) - pmu =3D ERR_PTR(ret); + if (event->attr.type !=3D type && type !=3D PERF_TYPE_RAW && + !(pmu->capabilities & PERF_PMU_CAP_EXTENDED_HW_TYPE)) + goto fail; =20 - goto unlock; + ret =3D perf_try_init_event(pmu, event); + if (ret =3D=3D -ENOENT && event->attr.type !=3D type && !extended_type) { + type =3D event->attr.type; + goto again; } =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; - - if (ret !=3D -ENOENT) { - pmu =3D ERR_PTR(ret); - goto unlock; - } - } fail: - pmu =3D ERR_PTR(-ENOENT); + if (ret) + pmu =3D ERR_PTR(ret); + unlock: srcu_read_unlock(&pmus_srcu, idx);