From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933497AbeAXL0H (ORCPT ); Wed, 24 Jan 2018 06:26:07 -0500 Received: from terminus.zytor.com ([65.50.211.136]:38737 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933085AbeAXL0E (ORCPT ); Wed, 24 Jan 2018 06:26:04 -0500 Date: Wed, 24 Jan 2018 03:22:41 -0800 From: tip-bot for Mathieu Poirier Message-ID: Cc: linux-kernel@vger.kernel.org, mathieu.poirier@linaro.org, peterz@infradead.org, mingo@kernel.org, alexander.shishkin@linux.intel.com, tglx@linutronix.de, jolsa@redhat.com, hpa@zytor.com, acme@redhat.com, adrian.hunter@intel.com Reply-To: linux-kernel@vger.kernel.org, mathieu.poirier@linaro.org, peterz@infradead.org, mingo@kernel.org, acme@redhat.com, adrian.hunter@intel.com, tglx@linutronix.de, alexander.shishkin@linux.intel.com, hpa@zytor.com, jolsa@redhat.com In-Reply-To: <1515616312-27645-1-git-send-email-mathieu.poirier@linaro.org> References: <1515616312-27645-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: 631e8f0a9748d7ef1eb6a84d0d5b9e81a79433ef 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: 631e8f0a9748d7ef1eb6a84d0d5b9e81a79433ef Gitweb: https://git.kernel.org/tip/631e8f0a9748d7ef1eb6a84d0d5b9e81a79433ef Author: Mathieu Poirier AuthorDate: Wed, 10 Jan 2018 13:31:52 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 23 Jan 2018 09:51:36 -0300 perf report: Fix regression when decoding intel_pt traces Commit (93d10af26bb7 perf tools: Optimize sample parsing for ordered events) breaks intelPT 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: Adrian Hunter Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Peter Zijlstra Fixes: 93d10af26bb7 ("perf tools: Optimize sample parsing for ordered events") Link: http://lkml.kernel.org/r/1515616312-27645-1-git-send-email-mathieu.poirier@linaro.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 8d0fa2f..c71ced7 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 && ret != -1) return ret; ret = perf_session__queue_event(session, event, timestamp, file_offset);