From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6869D1B818; Tue, 16 Jan 2024 00:09:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="O0UUkEk3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8A1EC433F1; Tue, 16 Jan 2024 00:09:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705363777; bh=h0rxs079xtoHbxNsm8TwYm88ki/bg40NAsnOOK7DFso=; h=From:To:Cc:Subject:Date:From; b=O0UUkEk3fGEWOr8HbdQ+FKDktPBa9iggbJkF8ZX3nbEmw84OFBHlVq8lswoQSHeXc a7CWmf+yW7Z9s3a1y8hJEDA1G5pekILuLpwYH/raja+FE8mFTXu+0swJpn4roPT8bU DaOBK7QkwFT9ACIHENYY98K2CW6NxhbScBXdWer7eDjRzZ6MerbopIPrauW9+uBngX 4ucVScUxyT47qweWNEmph4p1p3zwIVzLM7xHQ8G3FGykMoXkHZMatom92S+w2Vaeea C6rdpzcSm8m6U16uqTNi+pLtqSgTMei6MBXFBtk6kHJkA2ygoudZK8TVTkP3IRrejg 3U7h3NVTjzADA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg KH , Peter Zijlstra , Sasha Levin , mingo@redhat.com, acme@kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 1/2] perf/core: Fix narrow startup race when creating the perf nr_addr_filters sysfs file Date: Mon, 15 Jan 2024 19:09:33 -0500 Message-ID: <20240116000934.212732-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.147 Content-Transfer-Encoding: 8bit From: Greg KH [ Upstream commit 652ffc2104ec1f69dd4a46313888c33527145ccf ] Signed-off-by: Greg Kroah-Hartman Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/2023061204-decal-flyable-6090@gregkh Signed-off-by: Sasha Levin --- kernel/events/core.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index ada7ef0eb639..0e03afd82348 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -11220,9 +11220,32 @@ static DEVICE_ATTR_RW(perf_event_mux_interval_ms); static struct attribute *pmu_dev_attrs[] = { &dev_attr_type.attr, &dev_attr_perf_event_mux_interval_ms.attr, + &dev_attr_nr_addr_filters.attr, + NULL, +}; + +static umode_t pmu_dev_is_visible(struct kobject *kobj, struct attribute *a, int n) +{ + struct device *dev = kobj_to_dev(kobj); + struct pmu *pmu = dev_get_drvdata(dev); + + if (!pmu->nr_addr_filters) + return 0; + + return a->mode; + + return 0; +} + +static struct attribute_group pmu_dev_attr_group = { + .is_visible = pmu_dev_is_visible, + .attrs = pmu_dev_attrs, +}; + +static const struct attribute_group *pmu_dev_groups[] = { + &pmu_dev_attr_group, NULL, }; -ATTRIBUTE_GROUPS(pmu_dev); static int pmu_bus_running; static struct bus_type pmu_bus = { @@ -11258,18 +11281,11 @@ static int pmu_dev_alloc(struct pmu *pmu) if (ret) goto free_dev; - /* For PMUs with address filters, throw in an extra attribute: */ - if (pmu->nr_addr_filters) - ret = device_create_file(pmu->dev, &dev_attr_nr_addr_filters); - - if (ret) - goto del_dev; - - if (pmu->attr_update) + if (pmu->attr_update) { ret = sysfs_update_groups(&pmu->dev->kobj, pmu->attr_update); - - if (ret) - goto del_dev; + if (ret) + goto del_dev; + } out: return ret; -- 2.43.0