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 D73DF295D91; Wed, 13 Aug 2025 17:01:52 +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=1755104514; cv=none; b=oqtaZsRJrpFZCYxQJeux/7yKywP7rUlschiUxPZ7lxh66rvAJk6J+BUd8rHnhv8v8XtXLY3ZegTlrjdjcu9eSucWyzvixoNM7CK8OHZw4/jrEbW/3DzhTFXSojwI7HEBL5DWFRt7u0RLNreMdzJ5fqqS/TpewxI+FhEh45L91Fc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755104514; c=relaxed/simple; bh=uo848j2DZMuYEFuAQ16GeCSN3LjjQmRdst0t3ttkAVc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EoaoIYB7gml2jBFWpafRFD3vvIf7wh+9lQ5ZzgHx//2F4udwdFVB9GxH6EHwN8Th5gCY3l/+Gd2oOiJem1m4eIQPFI6fnnilBTrPs+TMAvFFHHNctiYmJ04urn0P/b/PL0xHz4TNtl5Gv45p2qNbm2I9Y5wvEKpcLyV+yM9wg74= 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 29D641C01; Wed, 13 Aug 2025 10:01:44 -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 074E03F738; Wed, 13 Aug 2025 10:01:47 -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 06/19] ARM: l2x0: Fix group validation Date: Wed, 13 Aug 2025 18:00:58 +0100 Message-Id: <925c34a4b7f0defc3582a9fcccb6af1c21279a86.1755096883.git.robin.murphy@arm.com> X-Mailer: git-send-email 2.39.2.101.g768bb238c484.dirty In-Reply-To: References: Precedence: bulk X-Mailing-List: sparclinux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The group validation here is almost right, but fails to count the new event itself. While we fix that, also adopt the standard pattern to avoid racy access the sibling list and drop checks that are redundant with core code. Signed-off-by: Robin Murphy --- arch/arm/mm/cache-l2x0-pmu.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm/mm/cache-l2x0-pmu.c b/arch/arm/mm/cache-l2x0-pmu.c index 93ef0502b7ff..6fc1171031a8 100644 --- a/arch/arm/mm/cache-l2x0-pmu.c +++ b/arch/arm/mm/cache-l2x0-pmu.c @@ -274,18 +274,17 @@ static bool l2x0_pmu_group_is_valid(struct perf_event *event) struct pmu *pmu = event->pmu; struct perf_event *leader = event->group_leader; struct perf_event *sibling; - int num_hw = 0; + int num_hw = 1; + + if (leader == event) + return true; if (leader->pmu == pmu) num_hw++; - else if (!is_software_event(leader)) - return false; for_each_sibling_event(sibling, leader) { if (sibling->pmu == pmu) num_hw++; - else if (!is_software_event(sibling)) - return false; } return num_hw <= PMU_NR_COUNTERS; -- 2.39.2.101.g768bb238c484.dirty