From nobody Sun Sep 14 16:29:01 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCB52C27C7C for ; Fri, 20 Jan 2023 14:41:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230271AbjATOlS (ORCPT ); Fri, 20 Jan 2023 09:41:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230437AbjATOlQ (ORCPT ); Fri, 20 Jan 2023 09:41:16 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1414D51C52; Fri, 20 Jan 2023 06:40:54 -0800 (PST) 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 61C851595; Fri, 20 Jan 2023 06:38:56 -0800 (PST) Received: from e126815.warwick.arm.com (e126815.arm.com [10.32.32.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C0E4E3F67D; Fri, 20 Jan 2023 06:38:11 -0800 (PST) From: James Clark To: linux-perf-users@vger.kernel.org, tanmay@marvell.com, leo.yan@linaro.org, mike.leach@linaro.org Cc: sgoutham@marvell.com, gcherian@marvell.com, lcherian@marvell.com, bbhushan2@marvell.com, German Gomez , James Clark , Mathieu Poirier , Suzuki K Poulose , John Garry , Will Deacon , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 5/8] perf cs_etm: Keep separate symbols for ETMv4 and ETE parameters Date: Fri, 20 Jan 2023 14:36:58 +0000 Message-Id: <20230120143702.4035046-6-james.clark@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230120143702.4035046-1-james.clark@arm.com> References: <20230120143702.4035046-1-james.clark@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: German Gomez Previously, adding a new parameter at the end of ETMv4 meant adding it somewhere in the middle of ETE, which is not supported by the current header version. Reviewed-by: Mike Leach Signed-off-by: German Gomez Signed-off-by: James Clark --- tools/perf/arch/arm/util/cs-etm.c | 43 ++++++++++++++++++++++++++----- tools/perf/util/cs-etm-base.c | 32 +++++++++++++++++------ tools/perf/util/cs-etm.c | 12 ++++----- tools/perf/util/cs-etm.h | 11 +++++++- 4 files changed, 76 insertions(+), 22 deletions(-) diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/c= s-etm.c index a346d5f3dafa..b526ffe550a5 100644 --- a/tools/perf/arch/arm/util/cs-etm.c +++ b/tools/perf/arch/arm/util/cs-etm.c @@ -53,7 +53,15 @@ static const char * const metadata_etmv4_ro[] =3D { [CS_ETMV4_TRCIDR2] =3D "trcidr/trcidr2", [CS_ETMV4_TRCIDR8] =3D "trcidr/trcidr8", [CS_ETMV4_TRCAUTHSTATUS] =3D "mgmt/trcauthstatus", - [CS_ETE_TRCDEVARCH] =3D "mgmt/trcdevarch" +}; + +static const char * const metadata_ete_ro[] =3D { + [CS_ETE_TRCIDR0] =3D "trcidr/trcidr0", + [CS_ETE_TRCIDR1] =3D "trcidr/trcidr1", + [CS_ETE_TRCIDR2] =3D "trcidr/trcidr2", + [CS_ETE_TRCIDR8] =3D "trcidr/trcidr8", + [CS_ETE_TRCAUTHSTATUS] =3D "mgmt/trcauthstatus", + [CS_ETE_TRCDEVARCH] =3D "mgmt/trcdevarch", }; =20 static bool cs_etm_is_etmv4(struct auxtrace_record *itr, int cpu); @@ -617,7 +625,7 @@ static bool cs_etm_is_ete(struct auxtrace_record *itr, = int cpu) { struct cs_etm_recording *ptr =3D container_of(itr, struct cs_etm_recordin= g, itr); struct perf_pmu *cs_etm_pmu =3D ptr->cs_etm_pmu; - int trcdevarch =3D cs_etm_get_ro(cs_etm_pmu, cpu, metadata_etmv4_ro[CS_ET= E_TRCDEVARCH]); + int trcdevarch =3D cs_etm_get_ro(cs_etm_pmu, cpu, metadata_ete_ro[CS_ETE_= TRCDEVARCH]); =20 /* * ETE if ARCHVER is 5 (ARCHVER is 4 for ETM) and ARCHPART is 0xA13. @@ -648,6 +656,31 @@ static void cs_etm_save_etmv4_header(__u64 data[], str= uct auxtrace_record *itr, metadata_etmv4_ro[CS_ETMV4_TRCAUTHSTATUS]); } =20 +static void cs_etm_save_ete_header(__u64 data[], struct auxtrace_record *i= tr, int cpu) +{ + struct cs_etm_recording *ptr =3D container_of(itr, struct cs_etm_recordin= g, itr); + struct perf_pmu *cs_etm_pmu =3D ptr->cs_etm_pmu; + + /* Get trace configuration register */ + data[CS_ETE_TRCCONFIGR] =3D cs_etmv4_get_config(itr); + /* Get traceID from the framework */ + data[CS_ETE_TRCTRACEIDR] =3D coresight_get_trace_id(cpu); + /* Get read-only information from sysFS */ + data[CS_ETE_TRCIDR0] =3D cs_etm_get_ro(cs_etm_pmu, cpu, + metadata_ete_ro[CS_ETE_TRCIDR0]); + data[CS_ETE_TRCIDR1] =3D cs_etm_get_ro(cs_etm_pmu, cpu, + metadata_ete_ro[CS_ETE_TRCIDR1]); + data[CS_ETE_TRCIDR2] =3D cs_etm_get_ro(cs_etm_pmu, cpu, + metadata_ete_ro[CS_ETE_TRCIDR2]); + data[CS_ETE_TRCIDR8] =3D cs_etm_get_ro(cs_etm_pmu, cpu, + metadata_ete_ro[CS_ETE_TRCIDR8]); + data[CS_ETE_TRCAUTHSTATUS] =3D cs_etm_get_ro(cs_etm_pmu, cpu, + metadata_ete_ro[CS_ETE_TRCAUTHSTATUS]); + /* ETE uses the same registers as ETMv4 plus TRCDEVARCH */ + data[CS_ETE_TRCDEVARCH] =3D cs_etm_get_ro(cs_etm_pmu, cpu, + metadata_ete_ro[CS_ETE_TRCDEVARCH]); +} + static void cs_etm_get_metadata(int cpu, u32 *offset, struct auxtrace_record *itr, struct perf_record_auxtrace_info *info) @@ -661,11 +694,7 @@ static void cs_etm_get_metadata(int cpu, u32 *offset, /* first see what kind of tracer this cpu is affined to */ if (cs_etm_is_ete(itr, cpu)) { magic =3D __perf_cs_ete_magic; - /* ETE uses the same registers as ETMv4 plus TRCDEVARCH */ - cs_etm_save_etmv4_header(&info->priv[*offset], itr, cpu); - info->priv[*offset + CS_ETE_TRCDEVARCH] =3D - cs_etm_get_ro(cs_etm_pmu, cpu, - metadata_etmv4_ro[CS_ETE_TRCDEVARCH]); + cs_etm_save_ete_header(&info->priv[*offset], itr, cpu); =20 /* How much space was used */ increment =3D CS_ETE_PRIV_MAX; diff --git a/tools/perf/util/cs-etm-base.c b/tools/perf/util/cs-etm-base.c index 597542410854..282042c6e944 100644 --- a/tools/perf/util/cs-etm-base.c +++ b/tools/perf/util/cs-etm-base.c @@ -36,7 +36,20 @@ static const char * const cs_etmv4_priv_fmts[] =3D { [CS_ETMV4_TRCIDR2] =3D " TRCIDR2 %llx\n", [CS_ETMV4_TRCIDR8] =3D " TRCIDR8 %llx\n", [CS_ETMV4_TRCAUTHSTATUS] =3D " TRCAUTHSTATUS %llx\n", - [CS_ETE_TRCDEVARCH] =3D " TRCDEVARCH %llx\n" +}; + +static const char * const cs_ete_priv_fmts[] =3D { + [CS_ETM_MAGIC] =3D " Magic number %llx\n", + [CS_ETM_CPU] =3D " CPU %lld\n", + [CS_ETM_NR_TRC_PARAMS] =3D " NR_TRC_PARAMS %llx\n", + [CS_ETE_TRCCONFIGR] =3D " TRCCONFIGR %llx\n", + [CS_ETE_TRCTRACEIDR] =3D " TRCTRACEIDR %llx\n", + [CS_ETE_TRCIDR0] =3D " TRCIDR0 %llx\n", + [CS_ETE_TRCIDR1] =3D " TRCIDR1 %llx\n", + [CS_ETE_TRCIDR2] =3D " TRCIDR2 %llx\n", + [CS_ETE_TRCIDR8] =3D " TRCIDR8 %llx\n", + [CS_ETE_TRCAUTHSTATUS] =3D " TRCAUTHSTATUS %llx\n", + [CS_ETE_TRCDEVARCH] =3D " TRCDEVARCH %llx\n", }; =20 static const char * const param_unk_fmt =3D @@ -96,19 +109,22 @@ static int cs_etm__print_cpu_metadata_v1(u64 *val, int= *offset) else fprintf(stdout, cs_etm_priv_fmts[j], val[i]); } - } else if (magic =3D=3D __perf_cs_etmv4_magic || magic =3D=3D __perf_cs_e= te_magic) { - /* - * ETE and ETMv4 can be printed in the same block because the number of = parameters - * is saved and they share the list of parameter names. ETE is also only= supported - * in V1 files. - */ + } else if (magic =3D=3D __perf_cs_etmv4_magic) { for (j =3D 0; j < total_params; j++, i++) { /* if newer record - could be excess params */ - if (j >=3D CS_ETE_PRIV_MAX) + if (j >=3D CS_ETMV4_PRIV_MAX) fprintf(stdout, param_unk_fmt, j, val[i]); else fprintf(stdout, cs_etmv4_priv_fmts[j], val[i]); } + } else if (magic =3D=3D __perf_cs_ete_magic) { + for (j =3D 0; j < total_params; j++, i++) { + /* if newer record - could be excess params */ + if (j >=3D CS_ETE_PRIV_MAX) + fprintf(stdout, param_unk_fmt, j, val[i]); + else + fprintf(stdout, cs_ete_priv_fmts[j], val[i]); + } } else { /* failure - note bad magic value and error out */ fprintf(stdout, magic_unk_fmt, magic); diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 33303d03c2fa..879576d5f899 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -464,12 +464,12 @@ static void cs_etm__set_trace_param_ete(struct cs_etm= _trace_params *t_params, u64 **metadata =3D etm->metadata; =20 t_params[idx].protocol =3D CS_ETM_PROTO_ETE; - t_params[idx].ete.reg_idr0 =3D metadata[idx][CS_ETMV4_TRCIDR0]; - t_params[idx].ete.reg_idr1 =3D metadata[idx][CS_ETMV4_TRCIDR1]; - t_params[idx].ete.reg_idr2 =3D metadata[idx][CS_ETMV4_TRCIDR2]; - t_params[idx].ete.reg_idr8 =3D metadata[idx][CS_ETMV4_TRCIDR8]; - t_params[idx].ete.reg_configr =3D metadata[idx][CS_ETMV4_TRCCONFIGR]; - t_params[idx].ete.reg_traceidr =3D metadata[idx][CS_ETMV4_TRCTRACEIDR]; + t_params[idx].ete.reg_idr0 =3D metadata[idx][CS_ETE_TRCIDR0]; + t_params[idx].ete.reg_idr1 =3D metadata[idx][CS_ETE_TRCIDR1]; + t_params[idx].ete.reg_idr2 =3D metadata[idx][CS_ETE_TRCIDR2]; + t_params[idx].ete.reg_idr8 =3D metadata[idx][CS_ETE_TRCIDR8]; + t_params[idx].ete.reg_configr =3D metadata[idx][CS_ETE_TRCCONFIGR]; + t_params[idx].ete.reg_traceidr =3D metadata[idx][CS_ETE_TRCTRACEIDR]; t_params[idx].ete.reg_devarch =3D metadata[idx][CS_ETE_TRCDEVARCH]; } =20 diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h index 5da50d5dae6b..c5925428afa9 100644 --- a/tools/perf/util/cs-etm.h +++ b/tools/perf/util/cs-etm.h @@ -82,7 +82,16 @@ enum { * added in header V1 */ enum { - CS_ETE_TRCDEVARCH =3D CS_ETMV4_PRIV_MAX, + /* Dynamic, configurable parameters */ + CS_ETE_TRCCONFIGR =3D CS_ETM_COMMON_BLK_MAX_V1, + CS_ETE_TRCTRACEIDR, + /* RO, taken from sysFS */ + CS_ETE_TRCIDR0, + CS_ETE_TRCIDR1, + CS_ETE_TRCIDR2, + CS_ETE_TRCIDR8, + CS_ETE_TRCAUTHSTATUS, + CS_ETE_TRCDEVARCH, CS_ETE_PRIV_MAX }; =20 --=20 2.25.1