Commit 78a93d4c authored Sep 14, 2020 by Leo Yan Committed by Arnaldo Carvalho de Melo Sep 22, 2020

perf tsc: Calculate timestamp with cap_user_time_short



The perf mmap'ed buffer contains the flag 'cap_user_time_short' and two
extra fields 'time_cycles' and 'time_mask', perf tool needs to know them
for handling the counter wrapping case.

This patch is to reads out the relevant parameters from the head of the
first mmap'ed page and stores into the structure 'perf_tsc_conversion',
if the flag 'cap_user_time_short' has been set, it will firstly
calibrate cycle value for timestamp calculation.

Committer testing:

Before/after:

  # perf test tsc
  70: Convert perf time to TSC                                        : Ok
  #
  # perf test -v tsc
  70: Convert perf time to TSC                                        :
  --- start ---
  test child forked, pid 11059
  mmap size 528384B
  1st event perf time 996384576521 tsc 3850532906613
  rdtsc          time 996384578455 tsc 3850532913950
  2nd event perf time 996384578845 tsc 3850532915428
  test child finished with 0
  ---- end ----
  Convert perf time to TSC: Ok
  #

Signed-off-by: Leo Yan <leo.yan@linaro.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
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-4-leo.yan@linaro.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 4979e861

tools/perf/util/tsc.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -28,6 +28,10 @@ u64 tsc_to_perf_time(u64 cyc, struct perf_tsc_conversion *tc)
		{
		u64 quot, rem;

		if (tc->cap_user_time_short)
		cyc = tc->time_cycles +
		((cyc - tc->time_cycles) & tc->time_mask);

		quot = cyc >> tc->time_shift;
		rem = cyc & (((u64)1 << tc->time_shift) - 1);
		return tc->time_zero + quot * tc->time_mult +
		@@ -37,7 +41,6 @@ u64 tsc_to_perf_time(u64 cyc, struct perf_tsc_conversion *tc)
		int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,
		struct perf_tsc_conversion *tc)
		{
		bool cap_user_time_zero;
		u32 seq;
		int i = 0;

		@@ -47,7 +50,10 @@ int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,
		tc->time_mult = pc->time_mult;
		tc->time_shift = pc->time_shift;
		tc->time_zero = pc->time_zero;
		cap_user_time_zero = pc->cap_user_time_zero;
		tc->time_cycles = pc->time_cycles;
		tc->time_mask = pc->time_mask;
		tc->cap_user_time_zero = pc->cap_user_time_zero;
		tc->cap_user_time_short = pc->cap_user_time_short;
		rmb();
		if (pc->lock == seq && !(seq & 1))
		break;
		@@ -57,7 +63,7 @@ int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,
		}
		}

		if (!cap_user_time_zero)
		if (!tc->cap_user_time_zero)
		return -EOPNOTSUPP;

		return 0;

tools/perf/util/tsc.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,11 @@ struct perf_tsc_conversion {
		u16 time_shift;
		u32 time_mult;
		u64 time_zero;
		u64 time_cycles;
		u64 time_mask;

		bool cap_user_time_zero;
		bool cap_user_time_short;
		};

		struct perf_event_mmap_page;

Admin message