diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2023-11-22 11:07:56 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-05 20:13:00 +0000 |
| commit | 071d98d5ee1542c62dbfda5321b11fb30da83c8e (patch) | |
| tree | 895c2aed5ed2bf773646e9eddc77e1f1f3429c7d /kernel/events | |
| parent | 8eea7e1d69e255f98a94e17b07cfb9a6d68128af (diff) | |
| download | linux-071d98d5ee1542c62dbfda5321b11fb30da83c8e.tar.gz linux-071d98d5ee1542c62dbfda5321b11fb30da83c8e.tar.bz2 linux-071d98d5ee1542c62dbfda5321b11fb30da83c8e.zip | |
perf: Fix the nr_addr_filters fix
[ Upstream commit 388a1fb7da6aaa1970c7e2a7d7fcd983a87a8484 ]
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@linux.ibm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Thomas Richter <tmricht@linux.ibm.com>
Link: https://lkml.kernel.org/r/20231122100756.GP8262@noisy.programming.kicks-ass.net
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel/events')
| -rw-r--r-- | kernel/events/core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 1e4841ebc22e..872d149b1959 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -11232,12 +11232,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 = { |