| Message ID | 20230119154308.3815108-7-james.clark@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | perf cs_etm: Basic support for virtual/kernel timestamps | expand |
On 19/01/2023 15:43, James Clark wrote: > From: German Gomez <german.gomez@arm.com> > > Read the value of ts_source exposed by the driver and store it in the > ETMv4 and ETE header. If the interface doesn't exist (such as in older > Kernels), defaults to a safe value of -1. Super minor nits feel free to ignore. > > Signed-off-by: German Gomez <german.gomez@arm.com> > Signed-off-by: James Clark <james.clark@arm.com> > --- > tools/perf/arch/arm/util/cs-etm.c | 48 +++++++++++++++++++++++++++++++ > tools/perf/util/cs-etm-base.c | 2 ++ > tools/perf/util/cs-etm.h | 2 ++ > 3 files changed, 52 insertions(+) > > diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/cs-etm.c > index b526ffe550a5..481e170cd3f1 100644 > --- a/tools/perf/arch/arm/util/cs-etm.c > +++ b/tools/perf/arch/arm/util/cs-etm.c > @@ -53,6 +53,7 @@ static const char * const metadata_etmv4_ro[] = { > [CS_ETMV4_TRCIDR2] = "trcidr/trcidr2", > [CS_ETMV4_TRCIDR8] = "trcidr/trcidr8", > [CS_ETMV4_TRCAUTHSTATUS] = "mgmt/trcauthstatus", > + [CS_ETMV4_TS_SOURCE] = "ts_source", > }; > > static const char * const metadata_ete_ro[] = { > @@ -62,6 +63,7 @@ static const char * const metadata_ete_ro[] = { > [CS_ETE_TRCIDR8] = "trcidr/trcidr8", > [CS_ETE_TRCAUTHSTATUS] = "mgmt/trcauthstatus", > [CS_ETE_TRCDEVARCH] = "mgmt/trcdevarch", > + [CS_ETE_TS_SOURCE] = "ts_source", > }; > > static bool cs_etm_is_etmv4(struct auxtrace_record *itr, int cpu); > @@ -613,6 +615,32 @@ static int cs_etm_get_ro(struct perf_pmu *pmu, int cpu, const char *path) > return val; > } > > +static int cs_etm_get_ro_signed(struct perf_pmu *pmu, int cpu, const char *path) minor nit: This doesn't necessarily care if it is RO ? Also, does it make sense to rename to include cpu relation : say, cs_etm_pmu_cpu_get_signed() ? > +{ > + char pmu_path[PATH_MAX]; > + int scan; > + int val = 0; > + > + /* Get RO metadata from sysfs */ > + snprintf(pmu_path, PATH_MAX, "cpu%d/%s", cpu, path); > + > + scan = perf_pmu__scan_file(pmu, pmu_path, "%d", &val); > + if (scan != 1) > + pr_err("%s: error reading: %s\n", __func__, pmu_path); > + > + return val; > +} > + > +static bool cs_etm_pmu_path_exists(struct perf_pmu *pmu, int cpu, const char *path) nit: cs_etm_pmu_cpu_path_exists() ? To make the "cpu" relation explicit ? Otherwise looks good to me. Suzuki
On 19/01/2023 15:56, Suzuki K Poulose wrote: > On 19/01/2023 15:43, James Clark wrote: >> From: German Gomez <german.gomez@arm.com> >> >> Read the value of ts_source exposed by the driver and store it in the >> ETMv4 and ETE header. If the interface doesn't exist (such as in older >> Kernels), defaults to a safe value of -1. > > Super minor nits feel free to ignore. > >> >> Signed-off-by: German Gomez <german.gomez@arm.com> >> Signed-off-by: James Clark <james.clark@arm.com> >> --- >> tools/perf/arch/arm/util/cs-etm.c | 48 +++++++++++++++++++++++++++++++ >> tools/perf/util/cs-etm-base.c | 2 ++ >> tools/perf/util/cs-etm.h | 2 ++ >> 3 files changed, 52 insertions(+) >> >> diff --git a/tools/perf/arch/arm/util/cs-etm.c >> b/tools/perf/arch/arm/util/cs-etm.c >> index b526ffe550a5..481e170cd3f1 100644 >> --- a/tools/perf/arch/arm/util/cs-etm.c >> +++ b/tools/perf/arch/arm/util/cs-etm.c >> @@ -53,6 +53,7 @@ static const char * const metadata_etmv4_ro[] = { >> [CS_ETMV4_TRCIDR2] = "trcidr/trcidr2", >> [CS_ETMV4_TRCIDR8] = "trcidr/trcidr8", >> [CS_ETMV4_TRCAUTHSTATUS] = "mgmt/trcauthstatus", >> + [CS_ETMV4_TS_SOURCE] = "ts_source", >> }; >> static const char * const metadata_ete_ro[] = { >> @@ -62,6 +63,7 @@ static const char * const metadata_ete_ro[] = { >> [CS_ETE_TRCIDR8] = "trcidr/trcidr8", >> [CS_ETE_TRCAUTHSTATUS] = "mgmt/trcauthstatus", >> [CS_ETE_TRCDEVARCH] = "mgmt/trcdevarch", >> + [CS_ETE_TS_SOURCE] = "ts_source", >> }; >> static bool cs_etm_is_etmv4(struct auxtrace_record *itr, int cpu); >> @@ -613,6 +615,32 @@ static int cs_etm_get_ro(struct perf_pmu *pmu, >> int cpu, const char *path) >> return val; >> } >> +static int cs_etm_get_ro_signed(struct perf_pmu *pmu, int cpu, >> const char *path) > > minor nit: This doesn't necessarily care if it is RO ? > Also, does it make sense to rename to include cpu relation : > > say, cs_etm_pmu_cpu_get_signed() ? > >> +{ >> + char pmu_path[PATH_MAX]; >> + int scan; >> + int val = 0; >> + >> + /* Get RO metadata from sysfs */ >> + snprintf(pmu_path, PATH_MAX, "cpu%d/%s", cpu, path); >> + >> + scan = perf_pmu__scan_file(pmu, pmu_path, "%d", &val); >> + if (scan != 1) >> + pr_err("%s: error reading: %s\n", __func__, pmu_path); >> + >> + return val; >> +} >> + >> +static bool cs_etm_pmu_path_exists(struct perf_pmu *pmu, int cpu, >> const char *path) > > nit: cs_etm_pmu_cpu_path_exists() ? To make the "cpu" relation explicit ? > For both of these points, I think it was just trying to be consistent with what is already there. There is already cs_etm_is_etmv4() and cs_etm_get_ro() which don't mention the cpu part, and also the metadata_etmv4_ro variable which has _ro. You're right that it doesn't matter that they're read only, but at the moment everything is so it's probably easiest to leave it for now rather than go and update everything. > Otherwise looks good to me. > > Suzuki > Thanks for the review.
diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/cs-etm.c index b526ffe550a5..481e170cd3f1 100644 --- a/tools/perf/arch/arm/util/cs-etm.c +++ b/tools/perf/arch/arm/util/cs-etm.c @@ -53,6 +53,7 @@ static const char * const metadata_etmv4_ro[] = { [CS_ETMV4_TRCIDR2] = "trcidr/trcidr2", [CS_ETMV4_TRCIDR8] = "trcidr/trcidr8", [CS_ETMV4_TRCAUTHSTATUS] = "mgmt/trcauthstatus", + [CS_ETMV4_TS_SOURCE] = "ts_source", }; static const char * const metadata_ete_ro[] = { @@ -62,6 +63,7 @@ static const char * const metadata_ete_ro[] = { [CS_ETE_TRCIDR8] = "trcidr/trcidr8", [CS_ETE_TRCAUTHSTATUS] = "mgmt/trcauthstatus", [CS_ETE_TRCDEVARCH] = "mgmt/trcdevarch", + [CS_ETE_TS_SOURCE] = "ts_source", }; static bool cs_etm_is_etmv4(struct auxtrace_record *itr, int cpu); @@ -613,6 +615,32 @@ static int cs_etm_get_ro(struct perf_pmu *pmu, int cpu, const char *path) return val; } +static int cs_etm_get_ro_signed(struct perf_pmu *pmu, int cpu, const char *path) +{ + char pmu_path[PATH_MAX]; + int scan; + int val = 0; + + /* Get RO metadata from sysfs */ + snprintf(pmu_path, PATH_MAX, "cpu%d/%s", cpu, path); + + scan = perf_pmu__scan_file(pmu, pmu_path, "%d", &val); + if (scan != 1) + pr_err("%s: error reading: %s\n", __func__, pmu_path); + + return val; +} + +static bool cs_etm_pmu_path_exists(struct perf_pmu *pmu, int cpu, const char *path) +{ + char pmu_path[PATH_MAX]; + + /* Get RO metadata from sysfs */ + snprintf(pmu_path, PATH_MAX, "cpu%d/%s", cpu, path); + + return perf_pmu__file_exists(pmu, pmu_path); +} + #define TRCDEVARCH_ARCHPART_SHIFT 0 #define TRCDEVARCH_ARCHPART_MASK GENMASK(11, 0) #define TRCDEVARCH_ARCHPART(x) (((x) & TRCDEVARCH_ARCHPART_MASK) >> TRCDEVARCH_ARCHPART_SHIFT) @@ -654,6 +682,16 @@ static void cs_etm_save_etmv4_header(__u64 data[], struct auxtrace_record *itr, metadata_etmv4_ro[CS_ETMV4_TRCIDR8]); data[CS_ETMV4_TRCAUTHSTATUS] = cs_etm_get_ro(cs_etm_pmu, cpu, metadata_etmv4_ro[CS_ETMV4_TRCAUTHSTATUS]); + + /* Kernels older than 5.19 may not expose ts_source */ + if (cs_etm_pmu_path_exists(cs_etm_pmu, cpu, metadata_etmv4_ro[CS_ETMV4_TS_SOURCE])) + data[CS_ETMV4_TS_SOURCE] = (__u64) cs_etm_get_ro_signed(cs_etm_pmu, cpu, + metadata_etmv4_ro[CS_ETMV4_TS_SOURCE]); + else { + pr_warning("[%03d] pmu file 'ts_source' not found. Fallback to safe value (-1)\n", + cpu); + data[CS_ETMV4_TS_SOURCE] = (__u64) -1; + } } static void cs_etm_save_ete_header(__u64 data[], struct auxtrace_record *itr, int cpu) @@ -679,6 +717,16 @@ static void cs_etm_save_ete_header(__u64 data[], struct auxtrace_record *itr, in /* ETE uses the same registers as ETMv4 plus TRCDEVARCH */ data[CS_ETE_TRCDEVARCH] = cs_etm_get_ro(cs_etm_pmu, cpu, metadata_ete_ro[CS_ETE_TRCDEVARCH]); + + /* Kernels older than 5.19 may not expose ts_source */ + if (cs_etm_pmu_path_exists(cs_etm_pmu, cpu, metadata_ete_ro[CS_ETE_TS_SOURCE])) + data[CS_ETE_TS_SOURCE] = (__u64) cs_etm_get_ro_signed(cs_etm_pmu, cpu, + metadata_ete_ro[CS_ETE_TS_SOURCE]); + else { + pr_warning("[%03d] pmu file 'ts_source' not found. Fallback to safe value (-1)\n", + cpu); + data[CS_ETE_TS_SOURCE] = (__u64) -1; + } } static void cs_etm_get_metadata(int cpu, u32 *offset, diff --git a/tools/perf/util/cs-etm-base.c b/tools/perf/util/cs-etm-base.c index 282042c6e944..5f48b756c4cf 100644 --- a/tools/perf/util/cs-etm-base.c +++ b/tools/perf/util/cs-etm-base.c @@ -36,6 +36,7 @@ static const char * const cs_etmv4_priv_fmts[] = { [CS_ETMV4_TRCIDR2] = " TRCIDR2 %llx\n", [CS_ETMV4_TRCIDR8] = " TRCIDR8 %llx\n", [CS_ETMV4_TRCAUTHSTATUS] = " TRCAUTHSTATUS %llx\n", + [CS_ETMV4_TS_SOURCE] = " TS_SOURCE %lld\n", }; static const char * const cs_ete_priv_fmts[] = { @@ -50,6 +51,7 @@ static const char * const cs_ete_priv_fmts[] = { [CS_ETE_TRCIDR8] = " TRCIDR8 %llx\n", [CS_ETE_TRCAUTHSTATUS] = " TRCAUTHSTATUS %llx\n", [CS_ETE_TRCDEVARCH] = " TRCDEVARCH %llx\n", + [CS_ETE_TS_SOURCE] = " TS_SOURCE %lld\n", }; static const char * const param_unk_fmt = diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h index c5925428afa9..ad790930bcbc 100644 --- a/tools/perf/util/cs-etm.h +++ b/tools/perf/util/cs-etm.h @@ -71,6 +71,7 @@ enum { CS_ETMV4_TRCIDR2, CS_ETMV4_TRCIDR8, CS_ETMV4_TRCAUTHSTATUS, + CS_ETMV4_TS_SOURCE, CS_ETMV4_PRIV_MAX, }; @@ -92,6 +93,7 @@ enum { CS_ETE_TRCIDR8, CS_ETE_TRCAUTHSTATUS, CS_ETE_TRCDEVARCH, + CS_ETE_TS_SOURCE, CS_ETE_PRIV_MAX };