From: tip-bot for Mathieu Poirier <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, peterz@infradead.org,
linux-kernel@vger.kernel.org, torvalds@linux-foundation.org,
mathieu.poirier@linaro.org, hpa@zytor.com, mingo@kernel.org,
jolsa@kernel.org
Subject: [tip:perf/core] perf report: Fix regression when decoding Intel-PT traces
Date: Sun, 17 Dec 2017 21:31:46 -0800 [thread overview]
Message-ID: <tip-f785657b0fbe69fb3f5dfb0a7567cdb0777e57d1@git.kernel.org> (raw)
In-Reply-To: <1513273620-3351-1-git-send-email-mathieu.poirier@linaro.org>
Commit-ID: f785657b0fbe69fb3f5dfb0a7567cdb0777e57d1
Gitweb: https://git.kernel.org/tip/f785657b0fbe69fb3f5dfb0a7567cdb0777e57d1
Author: Mathieu Poirier <mathieu.poirier@linaro.org>
AuthorDate: Thu, 14 Dec 2017 10:47:00 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 18 Dec 2017 06:26:20 +0100
perf report: Fix regression when decoding Intel-PT traces
Commit:
93d10af26bb7 ("perf tools: Optimize sample parsing for ordered events")
... breaks Intel-PT trace decoding by invariably returning an error if
the event type isn't a PERF_SAMPLE_TIME.
With this patch the timestamp is initialised and processing is allowed to
continue if the error returned by function
perf_evlist__parse_sample_timestamp() is not a fault.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: acme@kernel.org
Cc: alexander.shishkin@linux.intel.com
Cc: jolsa@redhat.com
Link: http://lkml.kernel.org/r/1513273620-3351-1-git-send-email-mathieu.poirier@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/perf/util/session.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 54e30f1..eb59dc7 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1508,10 +1508,10 @@ static s64 perf_session__process_event(struct perf_session *session,
return perf_session__process_user_event(session, event, file_offset);
if (tool->ordered_events) {
- u64 timestamp;
+ u64 timestamp = -1ULL;
ret = perf_evlist__parse_sample_timestamp(evlist, event, ×tamp);
- if (ret)
+ if (ret != -1)
return ret;
ret = perf_session__queue_event(session, event, timestamp, file_offset);
prev parent reply other threads:[~2017-12-18 5:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-14 17:47 [PATCH v2] perf report: Fix regression when decoding intelPT traces Mathieu Poirier
2017-12-18 3:22 ` Jiri Olsa
2017-12-18 5:31 ` tip-bot for Mathieu Poirier [this message]
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=tip-f785657b0fbe69fb3f5dfb0a7567cdb0777e57d1@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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
Powered by JetHome