The following commit has been merged into the perf/core branch of tip:
Commit-ID: 388a1fb7da6aaa1970c7e2a7d7fcd983a87a8484
Gitweb: https://git.kernel.org/tip/388a1fb7da6aaa1970c7e2a7d7fcd983a87a8484
Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
AuthorDate: Wed, 22 Nov 2023 11:07:56 +01:00
Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
CommitterDate: Thu, 23 Nov 2023 16:08:31 +01:00
perf: Fix the nr_addr_filters fix
Thomas reported that commit 652ffc2104ec ("perf/core: Fix narrow
startup race when creating the perf nr_addr_filters sysfs file") made
the entire attribute group vanish, instead of only the nr_addr_filters
attribute.
Additionally a stray return.
Insufficient coffee was involved with both writing and merging the
patch.
Fixes: 652ffc2104ec ("perf/core: Fix narrow startup race when creating the perf nr_addr_filters sysfs file")
Reported-by: Thomas Richter <tmricht@xxxxxxxxxxxxx>
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Tested-by: Thomas Richter <tmricht@xxxxxxxxxxxxx>
Link: https://lkml.kernel.org/r/20231122100756.GP8262@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
---
kernel/events/core.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 4f0c45a..59b332c 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -11417,12 +11417,10 @@ static umode_t pmu_dev_is_visible(struct kobject *kobj, struct attribute *a, int
struct device *dev = kobj_to_dev(kobj);
struct pmu *pmu = dev_get_drvdata(dev);
- if (!pmu->nr_addr_filters)
+ if (n == 2 && !pmu->nr_addr_filters)
return 0;
return a->mode;
-
- return 0;
}
static struct attribute_group pmu_dev_attr_group = {
|