From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757951AbdLRDWT (ORCPT ); Sun, 17 Dec 2017 22:22:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52168 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757738AbdLRDWR (ORCPT ); Sun, 17 Dec 2017 22:22:17 -0500 Date: Mon, 18 Dec 2017 04:22:08 +0100 From: Jiri Olsa To: Mathieu Poirier Cc: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] perf report: Fix regression when decoding intelPT traces Message-ID: <20171218032208.GB25916@krava.home> References: <1513273620-3351-1-git-send-email-mathieu.poirier@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1513273620-3351-1-git-send-email-mathieu.poirier@linaro.org> User-Agent: Mutt/1.9.1 (2017-09-22) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 18 Dec 2017 03:22:17 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 14, 2017 at 10:47:00AM -0700, Mathieu Poirier wrote: > 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 > --- > Change for v2: > - Better handling of error conditions as suggested by Jiri. > - Slight modification of the changelog to reflect the above. > --- > 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 54e30f1bcbd7..eb59dc7c7314 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); > -- > 2.7.4 > Acked-by: Jiri Olsa thanks, jirka