From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>,
linux-kernel@vger.kernel.org,
Stephane Eranian <eranian@google.com>
Subject: [PATCH V2 5/8] perf jit: Move clockid validation
Date: Tue, 8 Mar 2016 10:38:47 +0200 [thread overview]
Message-ID: <1457426327-30192-1-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1457005856-6143-6-git-send-email-adrian.hunter@intel.com>
Move clockid validation into jit_process() so it can later be
made conditional.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
Changes in V2:
Fixed "From" and "Signed-off-by" email addresses
tools/perf/builtin-inject.c | 24 ------------------------
tools/perf/util/jitdump.c | 23 +++++++++++++++++++++++
2 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 1635533921e8..319b7b4f7743 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -729,23 +729,6 @@ static int __cmd_inject(struct perf_inject *inject)
return ret;
}
-#ifdef HAVE_LIBELF_SUPPORT
-static int
-jit_validate_events(struct perf_session *session)
-{
- struct perf_evsel *evsel;
-
- /*
- * check that all events use CLOCK_MONOTONIC
- */
- evlist__for_each(session->evlist, evsel) {
- if (evsel->attr.use_clockid == 0 || evsel->attr.clockid != CLOCK_MONOTONIC)
- return -1;
- }
- return 0;
-}
-#endif
-
int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
{
struct perf_inject inject = {
@@ -853,13 +836,6 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
}
#ifdef HAVE_LIBELF_SUPPORT
if (inject.jit_mode) {
- /*
- * validate event is using the correct clockid
- */
- if (jit_validate_events(inject.session)) {
- fprintf(stderr, "error, jitted code must be sampled with perf record -k 1\n");
- return -1;
- }
inject.tool.mmap2 = perf_event__jit_repipe_mmap2;
inject.tool.mmap = perf_event__jit_repipe_mmap;
inject.tool.ordered_events = true;
diff --git a/tools/perf/util/jitdump.c b/tools/perf/util/jitdump.c
index bd9e44f9fff2..cd272cc21e05 100644
--- a/tools/perf/util/jitdump.c
+++ b/tools/perf/util/jitdump.c
@@ -99,6 +99,21 @@ jit_close(struct jit_buf_desc *jd)
}
static int
+jit_validate_events(struct perf_session *session)
+{
+ struct perf_evsel *evsel;
+
+ /*
+ * check that all events use CLOCK_MONOTONIC
+ */
+ evlist__for_each(session->evlist, evsel) {
+ if (evsel->attr.use_clockid == 0 || evsel->attr.clockid != CLOCK_MONOTONIC)
+ return -1;
+ }
+ return 0;
+}
+
+static int
jit_open(struct jit_buf_desc *jd, const char *name)
{
struct jitheader header;
@@ -157,6 +172,14 @@ jit_open(struct jit_buf_desc *jd, const char *name)
goto error;
}
+ /*
+ * validate event is using the correct clockid
+ */
+ if (jit_validate_events(jd->session)) {
+ pr_err("error, jitted code must be sampled with perf record -k 1\n");
+ goto error;
+ }
+
bs = header.total_size - sizeof(header);
if (bs > bsz) {
--
1.9.1
next prev parent reply other threads:[~2016-03-08 8:42 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-03 11:50 [PATCH 0/8] perf tools: Add Intel PT support for jitdump Adrian Hunter
2016-03-03 11:50 ` [PATCH 1/8] perf inject: Hit all DSOs for AUX data in JIT and other cases Adrian Hunter
2016-03-08 10:30 ` [tip:perf/core] " tip-bot for Adrian Hunter
2016-03-03 11:50 ` [PATCH 2/8] perf session: Simplify tool stubs Adrian Hunter
2016-03-08 8:38 ` [PATCH V2 " Adrian Hunter
2016-03-08 10:30 ` [tip:perf/core] " tip-bot for Adrian Hunter
2016-03-03 11:50 ` [PATCH 3/8] perf tools: Add time conversion event Adrian Hunter
2016-03-08 8:38 ` [PATCH V2 " Adrian Hunter
2016-03-31 6:33 ` Adrian Hunter
2016-03-31 13:53 ` Arnaldo Carvalho de Melo
2016-04-06 7:07 ` [tip:perf/core] " tip-bot for Adrian Hunter
2016-03-03 11:50 ` [PATCH 4/8] perf jit: Let jit_process() return errors Adrian Hunter
2016-03-08 10:30 ` [tip:perf/core] " tip-bot for Adrian Hunter
2016-03-03 11:50 ` [PATCH 5/8] perf jit: Move clockid validation Adrian Hunter
2016-03-08 8:38 ` Adrian Hunter [this message]
2016-03-08 10:31 ` [tip:perf/core] " tip-bot for Adrian Hunter
2016-03-03 11:50 ` [PATCH 6/8] perf jit: Add support for using TSC as a timestamp Adrian Hunter
2016-03-08 8:38 ` [PATCH V2 " Adrian Hunter
2016-04-01 3:49 ` [PATCH] perf tools: Fix build errors on tsc functions for archs other than x86 He Kuang
2016-04-01 7:13 ` Adrian Hunter
2016-04-01 13:13 ` Arnaldo Carvalho de Melo
2016-04-01 13:19 ` Hekuang
2016-04-01 13:24 ` Arnaldo Carvalho de Melo
2016-04-01 13:39 ` Adrian Hunter
2016-04-06 7:08 ` [tip:perf/core] perf jit: Add support for using TSC as a timestamp tip-bot for Adrian Hunter
2016-03-03 11:50 ` [PATCH 7/8] perf intel-pt/bts: Define JITDUMP_USE_ARCH_TIMESTAMP Adrian Hunter
2016-03-08 8:38 ` [PATCH V2 " Adrian Hunter
2016-04-06 7:08 ` [tip:perf/core] " tip-bot for Adrian Hunter
2016-03-03 11:50 ` [PATCH 8/8] perf tools: Use 64-bit shifts with (TSC) time conversion Adrian Hunter
2016-03-08 10:31 ` [tip:perf/core] " tip-bot for Adrian Hunter
2016-03-08 8:49 ` [PATCH 0/8] perf tools: Add Intel PT support for jitdump Adrian Hunter
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=1457426327-30192-1-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=acme@kernel.org \
--cc=eranian@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/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).