From nobody Tue Dec 16 17:55:58 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B1B1217E004; Fri, 23 Aug 2024 11:33:37 +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=1724412819; cv=none; b=cokWsNEhmn0ZAEooyGwZjz6GqJ6YBqSjVDerdKxpwj3+5aPN0ke4GaodKVmWPY4LP0Oe046Pu2H9mhYwbH2wkIMASJ2uF4y6FKF1zUStee39igzPVbHYGySj6JIu7JsOZsjFVsMe3QXasaCeuqlUMt5dkPVWmF9/5kgpeKKRZwM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724412819; c=relaxed/simple; bh=5rbaWl90Uj47ndUy3ZaQmzwKLrGiylTs/LIKcyJIsas=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EZzaGE7Npxc0ME/0/yx0OQ6fYwjOoyPyWCXcixhknUCIf7RTxA4vQuHT7aeECxM+MZz6ZggveObwl/RCFyCoWC0n+CQcrzRnsoDrNj0DKklLaAGXb9lbPcY9JU+yZ87yZFAN0pMZAAqgQgwbi6kiwcGZKvvTDYryI8gOd1fEjlw= 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 31B8BFEC; Fri, 23 Aug 2024 04:33:57 -0700 (PDT) Received: from e132581.cambridge.arm.com (e132581.arm.com [10.2.76.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BC91E3F58B; Fri, 23 Aug 2024 04:33:28 -0700 (PDT) From: Leo Yan To: Peter Zijlstra , Adrian Hunter , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Jiri Olsa , Ian Rogers , "Liang, Kan" , Suzuki K Poulose , Mike Leach , James Clark , John Garry , Will Deacon , Yicong Yang , Jonathan Cameron , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Cc: Leo Yan Subject: [PATCH v6 1/8] perf/core: Allow multiple AUX PMU events with the same module Date: Fri, 23 Aug 2024 12:32:59 +0100 Message-Id: <20240823113306.2310957-2-leo.yan@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823113306.2310957-1-leo.yan@arm.com> References: <20240823113306.2310957-1-leo.yan@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This commit changes the condition from checking the same PMU instance to checking the same .setup_aux() callback pointer. If PMU events have the same callback pointer, it means they share the same PMU driver module. This allows support for multiple PMU events with the same driver module. As a result, more than one AUX event (e.g. arm_spe_0 and arm_spe_1) can record trace into the AUX ring buffer. Signed-off-by: Leo Yan --- kernel/events/core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index c973e3c11e03..883c457911a3 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -12345,9 +12345,16 @@ perf_event_set_output(struct perf_event *event, st= ruct perf_event *output_event) =20 /* * If both events generate aux data, they must be on the same PMU + * module but can be with different PMU instances. + * + * For a built-in PMU module, the 'pmu->module' pointer is NULL, + * thus it is not feasible to compare the module pointers when + * AUX PMU drivers are built into the kernel image. Instead, + * comparing the .setup_aux() callback pointer can determine if + * the two PMU events come from the same PMU driver. */ if (has_aux(event) && has_aux(output_event) && - event->pmu !=3D output_event->pmu) + event->pmu->setup_aux !=3D output_event->pmu->setup_aux) goto out; =20 /* --=20 2.34.1 From nobody Tue Dec 16 17:55:58 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5FE80187FEB; Fri, 23 Aug 2024 11:33: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=1724412820; cv=none; b=Crfu8yf65O9l1YPtmVy+rUwVlMPvYcWNdU5jsfmTjMLGcETPJsmYmXpa2FkTnSEzqJtO5BAFpSZ+RIxBMZUz27j5GNFTpExBhBbK3zud/x1YlLJ0eso+G4+ozo1d5LWefXAg1q0Vp6PxgzMXkuBxMmvbIoRxySV5rfnI/Y8hODg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724412820; c=relaxed/simple; bh=qC9uy8eM5i7tGdIPdUHWZAxuBI3GpsqejXPmdbCToUw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=i4+XEdsYzqOFwtgzI+G9b9jj+7+hxGZw0EjanDnkmD5MMCdphokulx+dmi5wRwvNfETS7UIf3i+Tp/bx3wkAH7A8uCpAE4ZXxXX6JxNAIO1c2/tJcK6MW3YlGILgzRVPyFmN8W2hlaFjLoWv0y69LykvB7X1+151wpleMDejdzM= 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 C31FE1688; Fri, 23 Aug 2024 04:33:59 -0700 (PDT) Received: from e132581.cambridge.arm.com (e132581.arm.com [10.2.76.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 509D43F58B; Fri, 23 Aug 2024 04:33:31 -0700 (PDT) From: Leo Yan To: Peter Zijlstra , Adrian Hunter , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Jiri Olsa , Ian Rogers , "Liang, Kan" , Suzuki K Poulose , Mike Leach , James Clark , John Garry , Will Deacon , Yicong Yang , Jonathan Cameron , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Cc: Leo Yan Subject: [PATCH v6 2/8] perf auxtrace: Use evsel__is_aux_event() for checking AUX event Date: Fri, 23 Aug 2024 12:33:00 +0100 Message-Id: <20240823113306.2310957-3-leo.yan@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823113306.2310957-1-leo.yan@arm.com> References: <20240823113306.2310957-1-leo.yan@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use evsel__is_aux_event() to decide if an event is a AUX event, this is a refactoring to replace comparing the PMU type. Signed-off-by: Leo Yan Reviewed-by: Adrian Hunter --- tools/perf/util/auxtrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index cbb773ed6f1a..ca8682966fae 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -671,11 +671,11 @@ int auxtrace_record__read_finish(struct auxtrace_reco= rd *itr, int idx) { struct evsel *evsel; =20 - if (!itr->evlist || !itr->pmu) + if (!itr->evlist) return -EINVAL; =20 evlist__for_each_entry(itr->evlist, evsel) { - if (evsel->core.attr.type =3D=3D itr->pmu->type) { + if (evsel__is_aux_event(evsel)) { if (evsel->disabled) return 0; return evlist__enable_event_idx(itr->evlist, evsel, idx); --=20 2.34.1 From nobody Tue Dec 16 17:55:58 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 307CD17C211; Fri, 23 Aug 2024 11:33:36 +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=1724412819; cv=none; b=IWNvgSlzx5TD2Z6fQzXKIAKv358kEr9vQPXReDyzlzA8fAtM/yw3YNI2STeWne3jTCFn/I0QLc6inmwuoY7497TeN01WTaRu3JXzrFqf356SzNrGGgYk7yOEGDB56HHYOlCPMy1pMSg7DIcroFy8X5qSkT777gqR8HFVDcrC2XE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724412819; c=relaxed/simple; bh=obz0C+FpcdM6N6VsfsEmviC3TU3bTDwL9sKihig86y8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RLxmMKa0HAd2fcZKsPNGxvHYGDek40lorB1bXaHNFIcz0Te3xbwm5lrKPYhXa8nr8jq6E5mOT5Y3N0SCTmitvuUvx2hdS4rZtxzEydq+dGa7uvCbcmqpl8rDD/33zg5d48rLSb4dfzJZgTPGvjxUu1Tpz5cIswTtC3wTsyVQ0gI= 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 56DB9168F; Fri, 23 Aug 2024 04:34:02 -0700 (PDT) Received: from e132581.cambridge.arm.com (e132581.arm.com [10.2.76.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E171A3F58B; Fri, 23 Aug 2024 04:33:33 -0700 (PDT) From: Leo Yan To: Peter Zijlstra , Adrian Hunter , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Jiri Olsa , Ian Rogers , "Liang, Kan" , Suzuki K Poulose , Mike Leach , James Clark , John Garry , Will Deacon , Yicong Yang , Jonathan Cameron , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Cc: Leo Yan Subject: [PATCH v6 3/8] perf auxtrace: Remove unused 'pmu' pointer from struct auxtrace_record Date: Fri, 23 Aug 2024 12:33:01 +0100 Message-Id: <20240823113306.2310957-4-leo.yan@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823113306.2310957-1-leo.yan@arm.com> References: <20240823113306.2310957-1-leo.yan@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The 'pmu' pointer in the auxtrace_record structure is not used after support multiple AUX events, remove it. Signed-off-by: Leo Yan Reviewed-by: Adrian Hunter --- tools/perf/arch/arm/util/cs-etm.c | 1 - tools/perf/arch/arm64/util/arm-spe.c | 1 - tools/perf/arch/arm64/util/hisi-ptt.c | 1 - tools/perf/arch/x86/util/intel-bts.c | 1 - tools/perf/arch/x86/util/intel-pt.c | 1 - tools/perf/util/auxtrace.h | 1 - 6 files changed, 6 deletions(-) diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/c= s-etm.c index da6231367993..96aeb7cdbee1 100644 --- a/tools/perf/arch/arm/util/cs-etm.c +++ b/tools/perf/arch/arm/util/cs-etm.c @@ -888,7 +888,6 @@ struct auxtrace_record *cs_etm_record_init(int *err) } =20 ptr->cs_etm_pmu =3D cs_etm_pmu; - ptr->itr.pmu =3D cs_etm_pmu; ptr->itr.parse_snapshot_options =3D cs_etm_parse_snapshot_options; ptr->itr.recording_options =3D cs_etm_recording_options; ptr->itr.info_priv_size =3D cs_etm_info_priv_size; diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/u= til/arm-spe.c index d59f6ca499f2..2be99fdf997d 100644 --- a/tools/perf/arch/arm64/util/arm-spe.c +++ b/tools/perf/arch/arm64/util/arm-spe.c @@ -514,7 +514,6 @@ struct auxtrace_record *arm_spe_recording_init(int *err, } =20 sper->arm_spe_pmu =3D arm_spe_pmu; - sper->itr.pmu =3D arm_spe_pmu; sper->itr.snapshot_start =3D arm_spe_snapshot_start; sper->itr.snapshot_finish =3D arm_spe_snapshot_finish; sper->itr.find_snapshot =3D arm_spe_find_snapshot; diff --git a/tools/perf/arch/arm64/util/hisi-ptt.c b/tools/perf/arch/arm64/= util/hisi-ptt.c index ba97c8a562a0..eac9739c87e6 100644 --- a/tools/perf/arch/arm64/util/hisi-ptt.c +++ b/tools/perf/arch/arm64/util/hisi-ptt.c @@ -174,7 +174,6 @@ struct auxtrace_record *hisi_ptt_recording_init(int *er= r, } =20 pttr->hisi_ptt_pmu =3D hisi_ptt_pmu; - pttr->itr.pmu =3D hisi_ptt_pmu; pttr->itr.recording_options =3D hisi_ptt_recording_options; pttr->itr.info_priv_size =3D hisi_ptt_info_priv_size; pttr->itr.info_fill =3D hisi_ptt_info_fill; diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/uti= l/intel-bts.c index 34696f3d3d5d..85c8186300c8 100644 --- a/tools/perf/arch/x86/util/intel-bts.c +++ b/tools/perf/arch/x86/util/intel-bts.c @@ -434,7 +434,6 @@ struct auxtrace_record *intel_bts_recording_init(int *e= rr) } =20 btsr->intel_bts_pmu =3D intel_bts_pmu; - btsr->itr.pmu =3D intel_bts_pmu; btsr->itr.recording_options =3D intel_bts_recording_options; btsr->itr.info_priv_size =3D intel_bts_info_priv_size; btsr->itr.info_fill =3D intel_bts_info_fill; diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util= /intel-pt.c index 4b710e875953..ea510a7486b1 100644 --- a/tools/perf/arch/x86/util/intel-pt.c +++ b/tools/perf/arch/x86/util/intel-pt.c @@ -1197,7 +1197,6 @@ struct auxtrace_record *intel_pt_recording_init(int *= err) } =20 ptr->intel_pt_pmu =3D intel_pt_pmu; - ptr->itr.pmu =3D intel_pt_pmu; ptr->itr.recording_options =3D intel_pt_recording_options; ptr->itr.info_priv_size =3D intel_pt_info_priv_size; ptr->itr.info_fill =3D intel_pt_info_fill; diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h index d405efcd8708..a1895a4f530b 100644 --- a/tools/perf/util/auxtrace.h +++ b/tools/perf/util/auxtrace.h @@ -411,7 +411,6 @@ struct auxtrace_record { int (*read_finish)(struct auxtrace_record *itr, int idx); unsigned int alignment; unsigned int default_aux_sample_size; - struct perf_pmu *pmu; struct evlist *evlist; }; =20 --=20 2.34.1 From nobody Tue Dec 16 17:55:58 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5D792187FEA; Fri, 23 Aug 2024 11:33: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=1724412820; cv=none; b=nr4/1KzBzO51mr7WsiwpDIw2eSMokZnNJE4j0OsOxViBdvekEArbC+v2DExRIl7IMtbocJeJT99m5LsqROrAQTBt/B7pIzSDjd7cHUcjhw4mvO/alaNOWGxxiMTkDuXXKGiyKpEd/EYgtUTKofVEhv3JHZXCn7IimuCP8d7c/9A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724412820; c=relaxed/simple; bh=H6w10jYTrJ+KZDCrCKg26+egc1UhDEhCUqlEYNIWxOQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lmY+lg8aLg5Nya5rNQjeq3P5DJkr7xHzpEatRG/cY7GO4/tAxxjObxWudgHZtsFFgApk7x9qI18vtzTv/AzBfko6vyTd4IwG/Fr9lpHG4vv2C78TAfws4Md2jDTL65mNNtzFkcgZxz+UpLDqUrtA/5+ZppHnlgEUjVYhIQZsu+k= 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 DE6EDDA7; Fri, 23 Aug 2024 04:34:04 -0700 (PDT) Received: from e132581.cambridge.arm.com (e132581.arm.com [10.2.76.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 74F6D3F58B; Fri, 23 Aug 2024 04:33:36 -0700 (PDT) From: Leo Yan To: Peter Zijlstra , Adrian Hunter , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Jiri Olsa , Ian Rogers , "Liang, Kan" , Suzuki K Poulose , Mike Leach , James Clark , John Garry , Will Deacon , Yicong Yang , Jonathan Cameron , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Cc: Leo Yan Subject: [PATCH v6 4/8] perf auxtrace: Introduce auxtrace_record__validate_events() Date: Fri, 23 Aug 2024 12:33:02 +0100 Message-Id: <20240823113306.2310957-5-leo.yan@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823113306.2310957-1-leo.yan@arm.com> References: <20240823113306.2310957-1-leo.yan@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A prerequisite for multiple AUX events is that the AUX events cannot overlap CPU maps. The reason is that every CPU has only one AUX trace buffer and maps it to an unique buffer index for CPU and system tracing mode. To prevent the case of CPU maps overlapping occurring within multiple AUX events, the auxtrace_record__validate_events() function is introduced. It iterates through all AUX events and returns failure if it detects CPU maps overlapping. Signed-off-by: Leo Yan --- tools/perf/builtin-record.c | 4 +++ tools/perf/util/auxtrace.c | 64 +++++++++++++++++++++++++++++++++++++ tools/perf/util/auxtrace.h | 7 ++++ 3 files changed, 75 insertions(+) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index adbaf80b398c..2c618efba97d 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -862,6 +862,10 @@ static int record__auxtrace_init(struct record *rec) =20 auxtrace_regroup_aux_output(rec->evlist); =20 + err =3D auxtrace_validate_events(rec->evlist); + if (err) + return err; + return auxtrace_parse_filters(rec->evlist); } =20 diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index ca8682966fae..87e4f21b6edf 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -2828,6 +2828,70 @@ int auxtrace_parse_filters(struct evlist *evlist) return 0; } =20 +int auxtrace_validate_events(struct evlist *evlist) +{ + struct evsel *evsel; + struct perf_cpu_map *cpu_map =3D NULL; + struct perf_cpu_map *cpu_map_intersect =3D NULL; + struct perf_cpu_map *cpu_map_merged =3D NULL; + int ret =3D 0; + + if (!evlist) + return 0; + + /* + * Currently the tool only supports multiple AUX events without + * overlapping CPU maps and every CPU has its unique AUX buffer + * for CPU or system mode tracing. + * + * Returns failure if detects CPU maps overlapping. + */ + evlist__for_each_entry(evlist, evsel) { + if (!evsel__is_aux_event(evsel)) + continue; + + if (perf_cpu_map__is_empty(evsel->pmu->cpus)) + continue; + + cpu_map_intersect =3D perf_cpu_map__intersect(cpu_map, evsel->pmu->cpus); + if (cpu_map_intersect) { + perf_cpu_map__put(cpu_map_intersect); + pr_err("Doesn't support AUX events with overlapping CPU masks\n"); + ret =3D -EINVAL; + break; + } + perf_cpu_map__put(cpu_map_intersect); + + cpu_map_merged =3D perf_cpu_map__merge(cpu_map, evsel->pmu->cpus); + if (!cpu_map_merged) { + ret =3D -ENOMEM; + break; + } + + /* Update the CPU maps after merging */ + perf_cpu_map__put(cpu_map); + cpu_map =3D cpu_map_merged; + } + + if (!ret) + goto out; + + /* If fails, dump CPU maps for debugging */ + evlist__for_each_entry(evlist, evsel) { + char buf[200]; + + if (!evsel__is_aux_event(evsel)) + continue; + + cpu_map__snprint(evsel->pmu->cpus, buf, sizeof(buf)); + pr_debug("AUX event [%s]'s cpu map is: %s\n", evsel->pmu->name, buf); + } + +out: + perf_cpu_map__put(cpu_map); + return ret; +} + int auxtrace__process_event(struct perf_session *session, union perf_event= *event, struct perf_sample *sample, const struct perf_tool *tool) { diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h index a1895a4f530b..67a74ad0c383 100644 --- a/tools/perf/util/auxtrace.h +++ b/tools/perf/util/auxtrace.h @@ -636,6 +636,7 @@ void addr_filters__exit(struct addr_filters *filts); int addr_filters__parse_bare_filter(struct addr_filters *filts, const char *filter); int auxtrace_parse_filters(struct evlist *evlist); +int auxtrace_validate_events(struct evlist *evlist); =20 int auxtrace__process_event(struct perf_session *session, union perf_event= *event, struct perf_sample *sample, const struct perf_tool *tool); @@ -875,6 +876,12 @@ int auxtrace_parse_filters(struct evlist *evlist __may= be_unused) return 0; } =20 +static inline +int auxtrace_validate_events(struct evlist *evlist __maybe_unused) +{ + return 0; +} + int auxtrace_mmap__mmap(struct auxtrace_mmap *mm, struct auxtrace_mmap_params *mp, void *userpg, int fd); --=20 2.34.1 From nobody Tue Dec 16 17:55:58 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0A09E188912; Fri, 23 Aug 2024 11:33:41 +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=1724412823; cv=none; b=lfJkv0RCOKSkkl9d61mPWuOn7okBRIMxrMgQe6D7qJ70xQpkViJlUIeYbXSjw67gExZm+fmtPzIXkMwKaB5DEOrgSKAYXu1UK1sVoZndQNylPKKx/cJgdVCGE6tfpBMOkdsWI7nUd6kJSXRdsGhfNMAx9zAoXexDPRuXsf7+cHc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724412823; c=relaxed/simple; bh=PyVjx29IENoLqvyx/30UeLm79Y8N0zd+gXIAcNt6/g4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rkNvaH3JGZnsxOIEHMq4zblIqziUQFoYcPgB5n0MZVmxggkYtp7CDfwkBEth0xz+8WY1czZv+MaIvQxcwdjPcHBrNNS4JFUQioS8BW3E4+BtXlzOFhxUySSTr0ZZOQrx6G2DcEYUQExGW4zesBwOlg/hB3i4yl9umCsS8jYGmoo= 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 897D2FEC; Fri, 23 Aug 2024 04:34:07 -0700 (PDT) Received: from e132581.cambridge.arm.com (e132581.arm.com [10.2.76.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 086553F58B; Fri, 23 Aug 2024 04:33:38 -0700 (PDT) From: Leo Yan To: Peter Zijlstra , Adrian Hunter , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Jiri Olsa , Ian Rogers , "Liang, Kan" , Suzuki K Poulose , Mike Leach , James Clark , John Garry , Will Deacon , Yicong Yang , Jonathan Cameron , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Cc: Leo Yan Subject: [PATCH v6 5/8] perf auxtrace: Refactor evlist__enable_event_idx() Date: Fri, 23 Aug 2024 12:33:03 +0100 Message-Id: <20240823113306.2310957-6-leo.yan@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823113306.2310957-1-leo.yan@arm.com> References: <20240823113306.2310957-1-leo.yan@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This commit splits the evlist__enable_event_idx() function into two steps. The first step uses a new function evlist__find_cpu_map_idx() to find the CPU map index, based on the found CPU map index or a thread map index, it continues to call evlist__enable_event_idx() for enabling the corresponding event. Signed-off-by: Leo Yan --- tools/perf/util/auxtrace.c | 42 +++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index 87e4f21b6edf..e7b582d92811 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -651,20 +651,30 @@ int auxtrace_parse_snapshot_options(struct auxtrace_r= ecord *itr, return -EINVAL; } =20 -static int evlist__enable_event_idx(struct evlist *evlist, struct evsel *e= vsel, int idx) +static int evlist__find_cpu_map_idx(struct evlist *evlist, struct evsel *e= vsel, + int idx) { bool per_cpu_mmaps =3D !perf_cpu_map__has_any_cpu(evlist->core.user_reque= sted_cpus); + struct perf_cpu evlist_cpu; + int cpu_map_idx; =20 - if (per_cpu_mmaps) { - struct perf_cpu evlist_cpu =3D perf_cpu_map__cpu(evlist->core.all_cpus, = idx); - int cpu_map_idx =3D perf_cpu_map__idx(evsel->core.cpus, evlist_cpu); + if (!per_cpu_mmaps) + return -EINVAL; =20 - if (cpu_map_idx =3D=3D -1) - return -EINVAL; - return perf_evsel__enable_cpu(&evsel->core, cpu_map_idx); - } + evlist_cpu =3D perf_cpu_map__cpu(evlist->core.all_cpus, idx); + cpu_map_idx =3D perf_cpu_map__idx(evsel->core.cpus, evlist_cpu); + if (cpu_map_idx =3D=3D -1) + return -ENOENT; + + return cpu_map_idx; +} =20 - return perf_evsel__enable_thread(&evsel->core, idx); +static int evlist__enable_event_idx(struct evsel *evsel, int cpu_mode, int= idx) +{ + if (cpu_mode) + return perf_evsel__enable_cpu(&evsel->core, idx); + else + return perf_evsel__enable_thread(&evsel->core, idx); } =20 int auxtrace_record__read_finish(struct auxtrace_record *itr, int idx) @@ -676,9 +686,21 @@ int auxtrace_record__read_finish(struct auxtrace_recor= d *itr, int idx) =20 evlist__for_each_entry(itr->evlist, evsel) { if (evsel__is_aux_event(evsel)) { + int cpu_map_idx; + if (evsel->disabled) return 0; - return evlist__enable_event_idx(itr->evlist, evsel, idx); + + cpu_map_idx =3D evlist__find_cpu_map_idx(itr->evlist, + evsel, idx); + /* No map is found in per CPU mmap */ + if (cpu_map_idx =3D=3D -ENOENT) + return cpu_map_idx; + + if (cpu_map_idx >=3D 0) + return evlist__enable_event_idx(evsel, 1, cpu_map_idx); + else + return evlist__enable_event_idx(evsel, 0, idx); } } return -EINVAL; --=20 2.34.1 From nobody Tue Dec 16 17:55:58 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B4F9C18893A; Fri, 23 Aug 2024 11:33:44 +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=1724412826; cv=none; b=U+rUxUq51LuVvYTXZoqELTt4N3gMtsNzIuGjQ/Jb/x/oRzGr25ljYwA0KmxKMowsfq0WzOZ+Xkz6oZbUjWK/llXRY/9GmHcOwa5sJ7amAEwKIFKwcjW28Y63SnY1M2lBGFvkSDlrjCUbvVa54w2LOd8aPFDXS4Wmi8ynksuOvFQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724412826; c=relaxed/simple; bh=NutnnobzY1pqk5yfZrczr9W27ytQvNp5oF4OsYwZfIg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rzU9MmqOpVeSC1LU38bAgYVzayZcxd/5FxkX0Na9tuEEsPYnXmKgn8FYb98UYi/EsYb5RITKG2+hwNlt2I3C7njo6sfJUddlYBjBIA/4pLUkTiiHvVcohUW8VJ7Z3WknQhVtzZh8fdgeUWQI9hucJgtvHB1M4rwqOQgM1k2j1rE= 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 0F4E81688; Fri, 23 Aug 2024 04:34:10 -0700 (PDT) Received: from e132581.cambridge.arm.com (e132581.arm.com [10.2.76.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 90D5D3F58B; Fri, 23 Aug 2024 04:33:41 -0700 (PDT) From: Leo Yan To: Peter Zijlstra , Adrian Hunter , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Jiri Olsa , Ian Rogers , "Liang, Kan" , Suzuki K Poulose , Mike Leach , James Clark , John Garry , Will Deacon , Yicong Yang , Jonathan Cameron , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Cc: Leo Yan Subject: [PATCH v6 6/8] perf auxtrace: Bails out after finding the event for the map index Date: Fri, 23 Aug 2024 12:33:04 +0100 Message-Id: <20240823113306.2310957-7-leo.yan@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823113306.2310957-1-leo.yan@arm.com> References: <20240823113306.2310957-1-leo.yan@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" After finding the corresponding event for the passed buffer index, it is safe to say the found event has been used. Then, the tool can check the event status and bails out if it has been disabled. Signed-off-by: Leo Yan --- tools/perf/util/auxtrace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index e7b582d92811..2acf63efab1d 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -688,15 +688,15 @@ int auxtrace_record__read_finish(struct auxtrace_reco= rd *itr, int idx) if (evsel__is_aux_event(evsel)) { int cpu_map_idx; =20 - if (evsel->disabled) - return 0; - cpu_map_idx =3D evlist__find_cpu_map_idx(itr->evlist, evsel, idx); /* No map is found in per CPU mmap */ if (cpu_map_idx =3D=3D -ENOENT) return cpu_map_idx; =20 + if (evsel->disabled) + return 0; + if (cpu_map_idx >=3D 0) return evlist__enable_event_idx(evsel, 1, cpu_map_idx); else --=20 2.34.1 From nobody Tue Dec 16 17:55:58 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7C0DF188A14; Fri, 23 Aug 2024 11:33:47 +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=1724412829; cv=none; b=sMTtqe5WxxuCI+gzNDVoK4Kql01bYLNAqPpTZny7WquV5ob6hO5H41Q5YHp+aeI/oQ5x6lYDvyO09vHCYcBF/nS2Wrgyv+Cyigvcr1TpypHj7pUOPie5Jg2xz1uJV5PIV053WENLNhD0ZCBHdLtLTyc9PkZu3Uh2fvGFupCefV8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724412829; c=relaxed/simple; bh=Gp4VwjnMboKK/ZjgCFtsQFxNA2MCi84eMCBEeV59tGw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=M3vBkej6zbo2m3gF2z3tTO77NOjcyvDl5bfNtKKT5Q/d0dAbvXfhrRuc+qoXbBq6zJTxTcdsRcyWVXeEP4oiuvnUPJzx0AfJPBKjMzSj2Yltl2d9RU9ZIDfaMTXLvqACzPnvJcRgwoGFkFuviXuCTBljG2iWMdYrCY7Uetyq7ug= 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 98315DA7; Fri, 23 Aug 2024 04:34:12 -0700 (PDT) Received: from e132581.cambridge.arm.com (e132581.arm.com [10.2.76.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2E23E3F58B; Fri, 23 Aug 2024 04:33:44 -0700 (PDT) From: Leo Yan To: Peter Zijlstra , Adrian Hunter , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Jiri Olsa , Ian Rogers , "Liang, Kan" , Suzuki K Poulose , Mike Leach , James Clark , John Garry , Will Deacon , Yicong Yang , Jonathan Cameron , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Cc: Leo Yan Subject: [PATCH v6 7/8] perf auxtrace: Iterate all AUX events when finish reading Date: Fri, 23 Aug 2024 12:33:05 +0100 Message-Id: <20240823113306.2310957-8-leo.yan@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823113306.2310957-1-leo.yan@arm.com> References: <20240823113306.2310957-1-leo.yan@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When finished to read AUX trace data from mmaped buffer, based on the AUX buffer index the core layer needs to search the corresponding PMU event and re-enable it to continue tracing. However, current code only searches the first AUX event. It misses to search other enabled AUX events, thus, it returns failure if the buffer index does not belong to the first AUX event. This patch changes to continue searching every enabled AUX events for covering the mmaped buffer indexes. Signed-off-by: Leo Yan --- tools/perf/util/auxtrace.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index 2acf63efab1d..864ed20794ab 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -690,9 +690,13 @@ int auxtrace_record__read_finish(struct auxtrace_recor= d *itr, int idx) =20 cpu_map_idx =3D evlist__find_cpu_map_idx(itr->evlist, evsel, idx); - /* No map is found in per CPU mmap */ + /* + * No map is found in per CPU mmap. Multiple AUX events + * might be opened in a session, continue to check if + * the next AUX event can cover the mmaped buffer 'idx'. + */ if (cpu_map_idx =3D=3D -ENOENT) - return cpu_map_idx; + continue; =20 if (evsel->disabled) return 0; --=20 2.34.1 From nobody Tue Dec 16 17:55:58 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B27C7188A24; Fri, 23 Aug 2024 11:33:49 +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=1724412831; cv=none; b=XzpoT9qh3G8HskqTkTupz8da+aXj88stfjn/P0fYQStnvRZxVtuqBEGBAgScuC75V1eQ315+dYQjoP3QJM3EqECW6CCCvXhhMLnvNIr8Yi/opHv5Z1ClrLAPgCuJx8I6TQrr8/0GTnnrD1Mq58QHLG6RbZapWQRT9zpJ2kQsIDQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724412831; c=relaxed/simple; bh=cMHzfQ9hXRH0a2cw3aKhfnQcf1GD+TH3ZUYtvgpZyXE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YN8y1V8Ju9q0GOWg8hTmY+VxerVhRnmKQQyyU2XbsW5AYpBuNwvF5Yd0kLk9p6cH6BSZuTgF+xm8EgcFijVDJ6C8BrYsNJN5xmUVQi/uc7sBi80hTGB0uio/zRV6G+1Vy90gifdaK+SDLDzEmeRXsWzDLm/X/DalP2uuG06jd/s= 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 2C0D5FEC; Fri, 23 Aug 2024 04:34:15 -0700 (PDT) Received: from e132581.cambridge.arm.com (e132581.arm.com [10.2.76.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B5E7D3F58B; Fri, 23 Aug 2024 04:33:46 -0700 (PDT) From: Leo Yan To: Peter Zijlstra , Adrian Hunter , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Jiri Olsa , Ian Rogers , "Liang, Kan" , Suzuki K Poulose , Mike Leach , James Clark , John Garry , Will Deacon , Yicong Yang , Jonathan Cameron , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Cc: Leo Yan Subject: [PATCH v6 8/8] perf arm-spe: Support multiple events in arm_spe_evsel_is_auxtrace() Date: Fri, 23 Aug 2024 12:33:06 +0100 Message-Id: <20240823113306.2310957-9-leo.yan@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823113306.2310957-1-leo.yan@arm.com> References: <20240823113306.2310957-1-leo.yan@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The 'pmu_type' field is an unique value and cannot support multiple PMU events. The arm_spe_evsel_is_auxtrace() function changes to compare PMU name to decide if it is a Arm SPE event. This leads to the 'pmu_type' field is no longer used, remove it. Signed-off-by: Leo Yan --- tools/perf/util/arm-spe.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c index 138ffc71b32d..27724711e763 100644 --- a/tools/perf/util/arm-spe.c +++ b/tools/perf/util/arm-spe.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -45,7 +46,6 @@ struct arm_spe { u32 auxtrace_type; struct perf_session *session; struct machine *machine; - u32 pmu_type; u64 midr; =20 struct perf_tsc_conversion tc; @@ -1053,12 +1053,10 @@ static void arm_spe_free(struct perf_session *sessi= on) free(spe); } =20 -static bool arm_spe_evsel_is_auxtrace(struct perf_session *session, +static bool arm_spe_evsel_is_auxtrace(struct perf_session *session __maybe= _unused, struct evsel *evsel) { - struct arm_spe *spe =3D container_of(session->auxtrace, struct arm_spe, a= uxtrace); - - return evsel->core.attr.type =3D=3D spe->pmu_type; + return strstarts(evsel->name, "arm_spe"); } =20 static const char * const arm_spe_info_fmts[] =3D { @@ -1099,7 +1097,7 @@ arm_spe_synth_events(struct arm_spe *spe, struct perf= _session *session) int err; =20 evlist__for_each_entry(evlist, evsel) { - if (evsel->core.attr.type =3D=3D spe->pmu_type) { + if (arm_spe_evsel_is_auxtrace(session, evsel)) { found =3D true; break; } @@ -1284,7 +1282,6 @@ int arm_spe_process_auxtrace_info(union perf_event *e= vent, spe->session =3D session; spe->machine =3D &session->machines.host; /* No kvm support */ spe->auxtrace_type =3D auxtrace_info->type; - spe->pmu_type =3D auxtrace_info->priv[ARM_SPE_PMU_TYPE]; spe->midr =3D midr; =20 spe->timeless_decoding =3D arm_spe__is_timeless_decoding(spe); --=20 2.34.1