From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932582AbdLRFgJ (ORCPT ); Mon, 18 Dec 2017 00:36:09 -0500 Received: from terminus.zytor.com ([65.50.211.136]:46141 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932328AbdLRFgH (ORCPT ); Mon, 18 Dec 2017 00:36:07 -0500 Date: Sun, 17 Dec 2017 21:31:46 -0800 From: tip-bot for Mathieu Poirier Message-ID: 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 Reply-To: tglx@linutronix.de, hpa@zytor.com, mathieu.poirier@linaro.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@kernel.org, jolsa@kernel.org In-Reply-To: <1513273620-3351-1-git-send-email-mathieu.poirier@linaro.org> References: <1513273620-3351-1-git-send-email-mathieu.poirier@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf report: Fix regression when decoding Intel-PT traces Git-Commit-ID: f785657b0fbe69fb3f5dfb0a7567cdb0777e57d1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f785657b0fbe69fb3f5dfb0a7567cdb0777e57d1 Gitweb: https://git.kernel.org/tip/f785657b0fbe69fb3f5dfb0a7567cdb0777e57d1 Author: Mathieu Poirier AuthorDate: Thu, 14 Dec 2017 10:47:00 -0700 Committer: Ingo Molnar 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 Acked-by: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner 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 --- 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);