perf tsc: Support cap_user_time_short for event TIME_CONV

The synthesized event TIME_CONV doesn't contain the complete parameters
for counters, this will lead to wrong conversion between counter cycles
and timestamp.

This patch extends event TIME_CONV to record flags 'cap_user_time_zero'
which is used to indicate the counter parameters are valid or not, if
not will directly return 0 for timestamp calculation.  And record the
flag 'cap_user_time_short' and its relevant fields 'time_cycles' and
'time_mask' for cycle calibration.

Signed-off-by: Leo Yan <leo.yan@linaro.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kemeng Shi <shikemeng@huawei.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nick Gasson <nick.gasson@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Remi Bernon <rbernon@codeweavers.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Steve Maclean <steve.maclean@microsoft.com>
Cc: Will Deacon <will@kernel.org>
Cc: Zou Wei <zou_wei@huawei.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lore.kernel.org/lkml/20200914115311.2201-5-leo.yan@linaro.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/lib/perf/include/perf/event.h b/tools/lib/perf/include/perf/event.h
index 8420288..a6dbba6 100644 (file)
--- a/tools/lib/perf/include/perf/event.h
+++ b/tools/lib/perf/include/perf/event.h
@@ -324,6 +324,10 @@ struct perf_record_time_conv {
        __u64                    time_shift;
        __u64                    time_mult;
        __u64                    time_zero;
+       __u64                    time_cycles;
+       __u64                    time_mask;
+       bool                     cap_user_time_zero;
+       bool                     cap_user_time_short;
 };
 
 struct perf_record_header_feature {

diff --git a/tools/perf/util/jitdump.c b/tools/perf/util/jitdump.c
index 0804308..055bab7 100644 (file)
--- a/tools/perf/util/jitdump.c
+++ b/tools/perf/util/jitdump.c
@@ -374,11 +374,15 @@ static uint64_t convert_timestamp(struct jit_buf_desc *jd, uint64_t timestamp)
        if (!jd->use_arch_timestamp)
                return timestamp;
 
-       tc.time_shift = jd->session->time_conv.time_shift;
-       tc.time_mult  = jd->session->time_conv.time_mult;
-       tc.time_zero  = jd->session->time_conv.time_zero;
-
-       if (!tc.time_mult)
+       tc.time_shift          = jd->session->time_conv.time_shift;
+       tc.time_mult           = jd->session->time_conv.time_mult;
+       tc.time_zero           = jd->session->time_conv.time_zero;
+       tc.time_cycles         = jd->session->time_conv.time_cycles;
+       tc.time_mask           = jd->session->time_conv.time_mask;
+       tc.cap_user_time_zero  = jd->session->time_conv.cap_user_time_zero;
+       tc.cap_user_time_short = jd->session->time_conv.cap_user_time_short;
+
+       if (!tc.cap_user_time_zero)
                return 0;
 
        return tsc_to_perf_time(timestamp, &tc);

diff --git a/tools/perf/util/tsc.c b/tools/perf/util/tsc.c
index c0ca402..62b4c75 100644 (file)
--- a/tools/perf/util/tsc.c
+++ b/tools/perf/util/tsc.c
@@ -98,6 +98,10 @@ int perf_event__synth_time_conv(const struct perf_event_mmap_page *pc,
        event.time_conv.time_mult  = tc.time_mult;
        event.time_conv.time_shift = tc.time_shift;
        event.time_conv.time_zero  = tc.time_zero;
+       event.time_conv.time_cycles = tc.time_cycles;
+       event.time_conv.time_mask = tc.time_mask;
+       event.time_conv.cap_user_time_zero = tc.cap_user_time_zero;
+       event.time_conv.cap_user_time_short = tc.cap_user_time_short;
 
        return process(tool, &event, NULL, machine);
 }