From: Leo Yan <leo.yan@linaro.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Will Deacon <will@kernel.org>, Ingo Molnar <mingo@redhat.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
John Garry <john.garry@huawei.com>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Kemeng Shi <shikemeng@huawei.com>,
Ian Rogers <irogers@google.com>,
Remi Bernon <rbernon@codeweavers.com>,
Nick Gasson <nick.gasson@arm.com>,
Stephane Eranian <eranian@google.com>,
Andi Kleen <ak@linux.intel.com>,
Steve MacLean <Steve.MacLean@Microsoft.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
Zou Wei <zou_wei@huawei.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Cc: Leo Yan <leo.yan@linaro.org>
Subject: [PATCH v4 3/6] perf tsc: Calculate timestamp with cap_user_time_short
Date: Mon, 14 Sep 2020 19:53:08 +0800 [thread overview]
Message-ID: <20200914115311.2201-4-leo.yan@linaro.org> (raw)
In-Reply-To: <20200914115311.2201-1-leo.yan@linaro.org>
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.
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
tools/perf/util/tsc.c | 12 +++++++++---
tools/perf/util/tsc.h | 5 +++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/tsc.c b/tools/perf/util/tsc.c
index 9e3f04ddddf8..c0ca40204649 100644
--- a/tools/perf/util/tsc.c
+++ b/tools/perf/util/tsc.c
@@ -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;
diff --git a/tools/perf/util/tsc.h b/tools/perf/util/tsc.h
index 3c5a632ee57c..72a15419f3b3 100644
--- a/tools/perf/util/tsc.h
+++ b/tools/perf/util/tsc.h
@@ -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;
--
2.17.1
next prev parent reply other threads:[~2020-09-14 17:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-14 11:53 [PATCH v4 0/6] Perf tool: Support TSC for Arm64 Leo Yan
2020-09-14 11:53 ` [PATCH v4 1/6] perf tsc: Move out common functions from x86 Leo Yan
2020-09-14 11:53 ` [PATCH v4 2/6] perf tsc: Add rdtsc() for Arm64 Leo Yan
2020-09-14 11:53 ` Leo Yan [this message]
2020-09-14 11:53 ` [PATCH v4 4/6] perf tsc: Support cap_user_time_short for event TIME_CONV Leo Yan
2020-09-14 11:53 ` [PATCH v4 5/6] perf tests tsc: Make tsc testing as a common testing Leo Yan
2020-09-14 11:53 ` [PATCH v4 6/6] perf tests tsc: Add checking helper is_supported() Leo Yan
2020-09-22 12:07 ` [PATCH v4 0/6] Perf tool: Support TSC for Arm64 Leo Yan
2020-09-22 16:49 ` Arnaldo Carvalho de Melo
2020-09-23 8:12 ` Leo Yan
2020-09-23 15:27 ` Arnaldo Carvalho de Melo
2020-09-23 15:55 ` Arnaldo Carvalho de Melo
2020-09-23 23:48 ` Leo Yan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200914115311.2201-4-leo.yan@linaro.org \
--to=leo.yan@linaro.org \
--cc=Steve.MacLean@Microsoft.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=gustavoars@kernel.org \
--cc=irogers@google.com \
--cc=john.garry@huawei.com \
--cc=jolsa@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=nick.gasson@arm.com \
--cc=peterz@infradead.org \
--cc=rbernon@codeweavers.com \
--cc=shikemeng@huawei.com \
--cc=will@kernel.org \
--cc=zou_wei@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).