It may have been different long ago, but today it seems wrong for these
drivers to skip counting disabled sibling events in group validation,
given that perf_event_enable() could make them schedulable again, and
thus increase the effective size of the group later. Conversely, if a
sibling event is truly dead then it stands to reason that the whole
group is dead, so it's not worth going to any special effort to try to
squeeze in a new event that's never going to run anyway. Thus, we can
simply remove all these checks.
Signed-off-by: Robin Murphy <robin.mur...@arm.com>
---
arch/alpha/kernel/perf_event.c | 2 +-
arch/powerpc/perf/core-book3s.c | 3 +--
arch/powerpc/perf/core-fsl-emb.c | 3 +--
arch/sparc/kernel/perf_event.c | 3 +--
arch/x86/events/core.c | 2 +-
arch/x86/events/intel/uncore.c | 3 +--
drivers/dma/idxd/perfmon.c | 3 +--
drivers/perf/arm_pmu.c | 6 ------
8 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/arch/alpha/kernel/perf_event.c b/arch/alpha/kernel/perf_event.c
index a3eaab094ece..8557165e64c0 100644
--- a/arch/alpha/kernel/perf_event.c
+++ b/arch/alpha/kernel/perf_event.c
@@ -352,7 +352,7 @@ static int collect_events(struct perf_event *group, int
max_count,
current_idx[n++] = PMC_NO_INDEX;
}
for_each_sibling_event(pe, group) {
- if (!is_software_event(pe) && pe->state !=
PERF_EVENT_STATE_OFF) {
+ if (!is_software_event(pe)) {
if (n >= max_count)
return -1;
event[n] = pe;
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index 8b0081441f85..d67f7d511f13 100644
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -1602,8 +1602,7 @@ static int collect_events(struct perf_event *group, int
max_count,
events[n++] = group->hw.config;
}
for_each_sibling_event(event, group) {
- if (event->pmu->task_ctx_nr == perf_hw_context &&
- event->state != PERF_EVENT_STATE_OFF) {
+ if (event->pmu->task_ctx_nr == perf_hw_context) {
if (n >= max_count)
return -1;
ctrs[n] = event;
diff --git a/arch/powerpc/perf/core-fsl-emb.c b/arch/powerpc/perf/core-fsl-emb.c
index 7120ab20cbfe..509932b91b75 100644
--- a/arch/powerpc/perf/core-fsl-emb.c
+++ b/arch/powerpc/perf/core-fsl-emb.c
@@ -261,8 +261,7 @@ static int collect_events(struct perf_event *group, int
max_count,
n++;
}
for_each_sibling_event(event, group) {
- if (!is_software_event(event) &&
- event->state != PERF_EVENT_STATE_OFF) {
+ if (!is_software_event(event)) {
if (n >= max_count)
return -1;
ctrs[n] = event;
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c
index cae4d33002a5..706127749c66 100644
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
@@ -1357,8 +1357,7 @@ static int collect_events(struct perf_event *group, int
max_count,
current_idx[n++] = PIC_NO_INDEX;
}
for_each_sibling_event(event, group) {
- if (!is_software_event(event) &&
- event->state != PERF_EVENT_STATE_OFF) {
+ if (!is_software_event(event)) {
if (n >= max_count)
return -1;
evts[n] = event;
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 7610f26dfbd9..eca5bb49aa85 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -1211,7 +1211,7 @@ static int collect_events(struct cpu_hw_events *cpuc,
struct perf_event *leader,
return n;
for_each_sibling_event(event, leader) {
- if (!is_x86_event(event) || event->state <=
PERF_EVENT_STATE_OFF)
+ if (!is_x86_event(event))
continue;
if (collect_event(cpuc, event, max_count, n))
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index a762f7f5b161..297ff5adb667 100644
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -406,8 +406,7 @@ uncore_collect_events(struct intel_uncore_box *box, struct
perf_event *leader,
return n;
for_each_sibling_event(event, leader) {
- if (!is_box_event(box, event) ||
- event->state <= PERF_EVENT_STATE_OFF)
+ if (!is_box_event(box, event))
continue;
if (n >= max_count)
diff --git a/drivers/dma/idxd/perfmon.c b/drivers/dma/idxd/perfmon.c
index 4b6af2f15d8a..8c539e1f11da 100644
--- a/drivers/dma/idxd/perfmon.c
+++ b/drivers/dma/idxd/perfmon.c
@@ -75,8 +75,7 @@ static int perfmon_collect_events(struct idxd_pmu *idxd_pmu,
return n;
for_each_sibling_event(event, leader) {
- if (!is_idxd_event(idxd_pmu, event) ||
- event->state <= PERF_EVENT_STATE_OFF)
+ if (!is_idxd_event(idxd_pmu, event))
continue;
if (n >= max_count)
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index 5c310e803dd7..e8a3c8e99da0 100644
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -386,12 +386,6 @@ validate_event(struct pmu *pmu, struct pmu_hw_events
*hw_events,
if (event->pmu != pmu)
return 0;
- if (event->state < PERF_EVENT_STATE_OFF)
- return 1;
-
- if (event->state == PERF_EVENT_STATE_OFF && !event->attr.enable_on_exec)
- return 1;
-
armpmu = to_arm_pmu(event->pmu);
return armpmu->get_event_idx(hw_events, event) >= 0;
}
--
2.39.2.101.g768bb238c484.dirty
