perf/core: Fix narrow startup race when creating the perf nr_addr_filters sysfs file
Sasha Levin
maintainerPATCH 1/1 perf/core: Fix narrow startup race when creating the perf nr_addr_filters sysfs file
From: Greg KH <[email protected]>
[ Upstream commit 652ffc2104ec1f69dd4a46313888c33527145ccf ]
Signed-off-by Greg Kroah-Hartman <[email protected]>
Signed-off-by Peter Zijlstra (Intel) <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
--- kernel/events/core.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-)
kernel/events/core.c +28 -12
@@ -10080,9 +10080,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 = {
@@ -10118,18 +10141,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;
Signature · 1 line
2.43.0