Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
From:   Ilkka Koskinen <ilkka@os.amperecomputing.com>
To:     Besar Wicaksono <bwicaksono@nvidia.com>,
        Suzuki K Poulose <suzuki.poulose@arm.com>,
        Robin Murphy <robin.murphy@arm.com>,
        Will Deacon <will@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>,
        Raag Jadav <raag.jadav@intel.com>,
        Ilkka Koskinen <ilkka@os.amperecomputing.com>
Cc:     linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH] perf: arm_cspmu: Reject events meant for other PMUs
Date:   Thu,  2 Nov 2023 17:16:54 -0700
Message-Id: <20231103001654.35565-1-ilkka@os.amperecomputing.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Y0RaV71QYrTF7bXjBEVJjnTnZwEzefkDkfp1RKpRzcj13J3bI7CymU4kB73q?=
 =?us-ascii?Q?w6smKVv1TPFC+eM5iuF2qHR/20oOSvx+GPWfLlshWVdK3TTXb9Df04B4Pfo9?=
 =?us-ascii?Q?GAfuH/lXPdBQnJrAmdG3qcWuM/P+7XRtDdEvpfMIGNPbpA7kRg9YVeZLkBdY?=
 =?us-ascii?Q?C1Afg/VJZFVPefWX6W7XCeKNGvwPwbX1Tb0gbTSPGBzShcaRjtwaHJcM+uRS?=
 =?us-ascii?Q?e+t2HIe0kPi4+x8Oc6gNuT9NwChcRx3JBc9jT1WkT0zODKebmoyzIxWFn+Pc?=
 =?us-ascii?Q?h3Lamb8wZkWeb/+jgiSeoTCiE0Cq3mXXlHEgcck/CVIxEKLsDjK6vxHmm1cK?=
 =?us-ascii?Q?tIuoCZVazTz23eQ9659jOOvwL5n01o65D5DleYSstfM2aIP6gT36RufEJ+ld?=
 =?us-ascii?Q?FU3SfO5beVeJHLE3FFGNoVOx2DNaqu4tN3dRUmL7E7+mmAwLus6hUd5Fg7QL?=
 =?us-ascii?Q?ev5DBdN2Cytgk7RHt3chwGU/XmbSwynVER1+DC3BWilX1Xz8rgAFM/EYWM9h?=
 =?us-ascii?Q?Gxc2Tnm2+NBlgzAynakijzOYKP4o0vhI2tgnArFnBYiL2OsPgH8TMERFmwCC?=
 =?us-ascii?Q?epBZVDWrK9MrvUiPkd0tAIG9CKLWhD7x9SuBtwy9dgKGduOVcY+y2Y2QmFre?=
 =?us-ascii?Q?X/D9iu90/hKfgyE4WZH9CMWXLbLyGJHf41Bp/0JYK9DOGEJJyb9OeVJ6yqDX?=
 =?us-ascii?Q?dJ2wjSgP2/fHPMDF1Zw7++SdJTfL2nmcZblOiKl9lIWKsBPdhTv5s2aVaOYy?=
 =?us-ascii?Q?Fc6fWvwpBViuw5F2raKHlFc+vuWAnp/ULAtksX6DPDcMLV7PWapacF84rMDT?=
 =?us-ascii?Q?Pt91TOTH2GEkZGd8cHQKMiUTZTQU7YFokQLuTUyw2Ez/rhej4Of1t37SY2O2?=
 =?us-ascii?Q?nB7vCSOkEBkbd11YnXGCeiE/hmdoBhwpPYfEC8KsJdUxcexFtiF4W9Nrf4D2?=
 =?us-ascii?Q?OAKVPmJ+au7R1MMA1duJQkGhMpzETBlNpFM+rqY22siwMoo13wZ9ayGNAjVB?=
 =?us-ascii?Q?PvlLyScxo2QWjwoSmmTmcr5CAmH6wYXEttG+Zcv95RDzXK9ajQh36aJQGXtz?=
 =?us-ascii?Q?5WmUHrpGz3LOdKKrjVu7DbolL5IOFEf+0GxFOfjacy810l8y1i6gBbYRYdA6?=
 =?us-ascii?Q?XKg6M9oKic+wFaRy+ptxso/217m7kyYbayH5y9jJIJXAUiDhVX8BBE+krBSY?=
 =?us-ascii?Q?eDGk0W144alD9C2LcasspHf8G8uTTIvtTah0sijgrYL7bV07i8mv2M9M7CfK?=
 =?us-ascii?Q?Yf881FK9ugBa9y+s/Yj6c8pftvur/PMp4XuInKRlg6eLy9yfa+lB1NmgawWZ?=
 =?us-ascii?Q?TdrixyPTbGRzX33CzZKcVYTNU7314jH+IgPezpHQH1r56xXpnEtMbdINYM85?=
 =?us-ascii?Q?UwuHbZGQ59rsW6owLyd8h6i/H7aWzQ04LWjB8rhEI/znLwE/DzbVk6WbxYsZ?=
 =?us-ascii?Q?QH1d/arfiD0pg34ZBOuIjpJ6LEidgkGKLofsLjEk6h73e9g6foVxtdpp+jxO?=
 =?us-ascii?Q?JlFksW+DdWyaK4FCLSaNmF51OuMWThKiD1dKQEJ/jrMAIwVZs3CEnzmy5AuK?=
 =?us-ascii?Q?oDl1cBSzdjnfQzzq7JlbCa6oLwP11H/gYbudsclV2qqgwPRfwKcMpeg3LYPR?=
 =?us-ascii?Q?EK/v3JDtk4PGT+VkCVSK3lg=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8dd68dfc-19c3-4da4-d1b8-08dbdc023a36
X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2023 00:17:13.3763
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 5cAlY/byVRFSVs6Pay3vWFR53uX7cXB20GjvS9r7w/q8Bp/mA897Cq5/9pshsi1gS14H9NoAt/K1qovniAQUj47yUGhaneiM81+IoSGe3qL18PkomIZfpR/gtV2zUEck
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR01MB6808
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 02 Nov 2023 17:17:40 -0700 (PDT)

Coresight PMU driver didn't reject events meant for other PMUs.
This caused some of the Core PMU events disappearing from
the output of "perf list". In addition, trying to run e.g.

     $ perf stat -e r2 sleep 1

made Coresight PMU driver to handle the event instead of letting
Core PMU driver to deal with it.

Cc: stable@vger.kernel.org
Fixes: e37dfd65731d ("perf: arm_cspmu: Add support for ARM CoreSight PMU driver")
Signed-off-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
---
 drivers/perf/arm_cspmu/arm_cspmu.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c
index 42b72042f6b3..2cc35dded007 100644
--- a/drivers/perf/arm_cspmu/arm_cspmu.c
+++ b/drivers/perf/arm_cspmu/arm_cspmu.c
@@ -676,6 +676,9 @@ static int arm_cspmu_event_init(struct perf_event *event)
 
 	cspmu = to_arm_cspmu(event->pmu);
 
+	if (event->attr.type != event->pmu->type)
+		return -ENOENT;
+
 	/*
 	 * Following other "uncore" PMUs, we do not support sampling mode or
 	 * attach to a task (per-process mode).
-- 
2.40.1