From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 19C8129A9D3; Wed, 13 Aug 2025 17:02:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755104542; cv=none; b=AUG5uDXX8i8e/BSo6vvPoQ5pQFYjDDKbC7NolFnajLpF1KraXg29W4GmPB3UQM0PDjl4FcXu2MgQ8sabeSnFYA9lB2RfBCVuvNorRiA2olHyAbAWemaRiyjLD8/QVgnEbdd7FQyRFCfR6xyycQb70BPdry8rQo8Ci6A7JQisnCI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755104542; c=relaxed/simple; bh=zR1/3Qwl9aQxK8T4b040jIQmNgpb5Hg7/uS53glwY50=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=liVTaSnYN4+9Ad0tG+Lm1uTDl3u77tYcH/OCaWXvrqSDtsES5EUiuFwz412jYx99544ERBBFh6AOsIZjjOSJ3j6+gvtLvAhNmjXe18/HttAf3i357Zs6IZdEBEIvRsQZ253LqoMRK1CqrC2a1ZsMdnfHXIZFEUwNtgkUWuIidc0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3C8671D15; Wed, 13 Aug 2025 10:02:11 -0700 (PDT) Received: from e121345-lin.cambridge.arm.com (e121345-lin.cambridge.arm.com [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 25A5E3F738; Wed, 13 Aug 2025 10:02:15 -0700 (PDT) From: Robin Murphy To: peterz@infradead.org, mingo@redhat.com, will@kernel.org, mark.rutland@arm.com, acme@kernel.org, namhyung@kernel.org, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, kan.liang@linux.intel.com Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, linux-csky@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-pm@vger.kernel.org, linux-rockchip@lists.infradead.org, dmaengine@vger.kernel.org, linux-fpga@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, coresight@lists.linaro.org, iommu@lists.linux.dev, linux-amlogic@lists.infradead.org, linux-cxl@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 12/19] perf: Ignore event state for group validation Date: Wed, 13 Aug 2025 18:01:04 +0100 Message-Id: X-Mailer: git-send-email 2.39.2.101.g768bb238c484.dirty In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- 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