From nobody Wed Dec 31 15:00:58 2025 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 EAB13C4332F for ; Thu, 2 Nov 2023 15:33:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376598AbjKBPdO (ORCPT ); Thu, 2 Nov 2023 11:33:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347522AbjKBPdD (ORCPT ); Thu, 2 Nov 2023 11:33:03 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3D34186 for ; Thu, 2 Nov 2023 08:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-Id:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=QznUQ9ZVMRK7rQRlb8+/azdh4eJUviFCrGGLgMbGcIA=; b=H8B1Hayd6YjoE5cZpaxqk3O9Dx V5cwjBsVF24xhVkqtJUzR/sYhFil7mq+Ql9ISiJndEi6dSXOkgCs8B4iyQqy97swCY+zC5mNALUkO kB+YQaW+7ntHlf1zw7HwmSLBncjx9y3a9WvFm6XorUgojk2Hk3yaX2vMsX/VUHoTPOsmO9Q4S/yp2 XSkj3+p/xhADYgUrvDymiZ86u1BQwHAtmzT6Z8z6pSeRAIdf446yxbfgxm6T3BIjDD26tTLpnc+AF rVrFnv6lP0D7jQQONZSDddmurPnGxKIs+goi1F7n+ip8pETUiDyh/XyQHus+ERcBYF/CkBxlGi+5g gXx0DEkA==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1qyZgU-0005PC-TU; Thu, 02 Nov 2023 15:32:39 +0000 Received: by noisy.programming.kicks-ass.net (Postfix, from userid 0) id 3FD81300940; Thu, 2 Nov 2023 16:32:39 +0100 (CET) Message-Id: <20231102152017.957609849@infradead.org> User-Agent: quilt/0.65 Date: Thu, 02 Nov 2023 16:09:21 +0100 From: Peter Zijlstra To: mingo@kernel.org Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, acme@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, namhyung@kernel.org, irogers@google.com, adrian.hunter@intel.com Subject: [PATCH 02/13] perf: Simplify perf_pmu_register() error path References: <20231102150919.719936610@infradead.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The error path of perf_pmu_register() is of course very similar to a subset of perf_pmu_unregister(). Extract this common part in perf_pmu_free() and simplify things. Signed-off-by: Peter Zijlstra (Intel) --- kernel/events/core.c | 51 ++++++++++++++++++++++++----------------------= ----- 1 file changed, 24 insertions(+), 27 deletions(-) --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -11426,20 +11426,35 @@ static int pmu_dev_alloc(struct pmu *pmu static struct lock_class_key cpuctx_mutex; static struct lock_class_key cpuctx_lock; =20 +static void perf_pmu_free(struct pmu *pmu) +{ + free_percpu(pmu->pmu_disable_count); + if (pmu->type >=3D 0) + idr_remove(&pmu_idr, pmu->type); + if (pmu_bus_running && pmu->dev && pmu->dev !=3D PMU_NULL_DEV) { + if (pmu->nr_addr_filters) + device_remove_file(pmu->dev, &dev_attr_nr_addr_filters); + device_del(pmu->dev); + put_device(pmu->dev); + } + free_pmu_context(pmu); +} + int perf_pmu_register(struct pmu *pmu, const char *name, int type) { int cpu, ret, max =3D PERF_TYPE_MAX; =20 + pmu->type =3D -1; + mutex_lock(&pmus_lock); ret =3D -ENOMEM; pmu->pmu_disable_count =3D alloc_percpu(int); if (!pmu->pmu_disable_count) goto unlock; =20 - pmu->type =3D -1; if (WARN_ONCE(!name, "Can not register anonymous pmu.\n")) { ret =3D -EINVAL; - goto free_pdc; + goto free; } =20 pmu->name =3D name; @@ -11449,23 +11464,22 @@ int perf_pmu_register(struct pmu *pmu, c =20 ret =3D idr_alloc(&pmu_idr, pmu, max, 0, GFP_KERNEL); if (ret < 0) - goto free_pdc; + goto free; =20 WARN_ON(type >=3D 0 && ret !=3D type); =20 - type =3D ret; - pmu->type =3D type; + pmu->type =3D ret; =20 if (pmu_bus_running && !pmu->dev) { ret =3D pmu_dev_alloc(pmu); if (ret) - goto free_idr; + goto free; } =20 ret =3D -ENOMEM; pmu->cpu_pmu_context =3D alloc_percpu(struct perf_cpu_pmu_context); if (!pmu->cpu_pmu_context) - goto free_dev; + goto free; =20 for_each_possible_cpu(cpu) { struct perf_cpu_pmu_context *cpc; @@ -11511,17 +11525,8 @@ int perf_pmu_register(struct pmu *pmu, c =20 return ret; =20 -free_dev: - if (pmu->dev && pmu->dev !=3D PMU_NULL_DEV) { - device_del(pmu->dev); - put_device(pmu->dev); - } - -free_idr: - idr_remove(&pmu_idr, pmu->type); - -free_pdc: - free_percpu(pmu->pmu_disable_count); +free: + perf_pmu_free(pmu); goto unlock; } EXPORT_SYMBOL_GPL(perf_pmu_register); @@ -11538,15 +11543,7 @@ void perf_pmu_unregister(struct pmu *pmu synchronize_srcu(&pmus_srcu); synchronize_rcu(); =20 - free_percpu(pmu->pmu_disable_count); - idr_remove(&pmu_idr, pmu->type); - if (pmu_bus_running && pmu->dev && pmu->dev !=3D PMU_NULL_DEV) { - if (pmu->nr_addr_filters) - device_remove_file(pmu->dev, &dev_attr_nr_addr_filters); - device_del(pmu->dev); - put_device(pmu->dev); - } - free_pmu_context(pmu); + perf_pmu_free(pmu); mutex_unlock(&pmus_lock); } EXPORT_SYMBOL_GPL(perf_pmu_unregister);