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 75CC828D8FB; Wed, 13 Aug 2025 17:01:39 +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=1755104501; cv=none; b=AZx3skclHk2BdMP0SaPMKh1oYbC+KAW6UyU7gpYff3pW9UU/AJPT9N3jtPDW7rSUnUG3NCCouKya1PMku+wKjDjuw75bB8m0kgBINks5t4kKfAyCt13CLVu8oQukC43DzPNLPvB2fEBUr4gFqiMoSyiV3xNAdPiuYWvJBlBwTJM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755104501; c=relaxed/simple; bh=Yxo8fR9zuH8qiDRz3yj+dgc/ztJ9AMTU5oV+Xlaqlro=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WxyluK0vWcB++xmdQ8tRH8JEbzPCmRxmfHce8phLBguAiy3TIgeipmABnapEMZXsiQv8McjV5FyBu+H27FHiHsAoLTGPhs7mIrn1LiImg3P1GsS+DGxmTSOrDlI7kfYAhIO9HM97NH1a54Hu515xe1C3Pchfzwgt01vDo0Vcg+A= 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 901F71BD0; Wed, 13 Aug 2025 10:01:30 -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 776713F738; Wed, 13 Aug 2025 10:01:34 -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 03/19] perf/imx8_ddr: Fix group validation Date: Wed, 13 Aug 2025 18:00:55 +0100 Message-Id: X-Mailer: git-send-email 2.39.2.101.g768bb238c484.dirty In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-fpga@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The group validation here is erroneously inspecting software events, as well as other hardware siblings, which are only checked for *after* they've already been misinterpreted. Once again, just ignore events which don't belong to our PMU, and don't duplicate what perf_event_open() will already check for us. Signed-off-by: Robin Murphy --- drivers/perf/fsl_imx8_ddr_perf.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/perf/fsl_imx8_ddr_perf.c b/drivers/perf/fsl_imx8_ddr_perf.c index b989ffa95d69..56fe281974d2 100644 --- a/drivers/perf/fsl_imx8_ddr_perf.c +++ b/drivers/perf/fsl_imx8_ddr_perf.c @@ -331,6 +331,9 @@ static u32 ddr_perf_filter_val(struct perf_event *event) static bool ddr_perf_filters_compatible(struct perf_event *a, struct perf_event *b) { + /* Ignore grouped events that aren't ours */ + if (a->pmu != b->pmu) + return true; if (!ddr_perf_is_filtered(a)) return true; if (!ddr_perf_is_filtered(b)) @@ -409,16 +412,8 @@ static int ddr_perf_event_init(struct perf_event *event) return -EOPNOTSUPP; } - /* - * We must NOT create groups containing mixed PMUs, although software - * events are acceptable (for example to create a CCN group - * periodically read when a hrtimer aka cpu-clock leader triggers). - */ - if (event->group_leader->pmu != event->pmu && - !is_software_event(event->group_leader)) - return -EINVAL; - - if (pmu->devtype_data->quirks & DDR_CAP_AXI_ID_FILTER) { + if (event != event->group_leader && + pmu->devtype_data->quirks & DDR_CAP_AXI_ID_FILTER) { if (!ddr_perf_filters_compatible(event, event->group_leader)) return -EINVAL; for_each_sibling_event(sibling, event->group_leader) { @@ -427,12 +422,6 @@ static int ddr_perf_event_init(struct perf_event *event) } } - for_each_sibling_event(sibling, event->group_leader) { - if (sibling->pmu != event->pmu && - !is_software_event(sibling)) - return -EINVAL; - } - event->cpu = pmu->cpu; hwc->idx = -1; -- 2.39.2.101.g768bb238c484.dirty