[PATCH v2] perf report: Fix regression when decoding intelPT traces

[PATCH v2] perf report: Fix regression when decoding intelPT traces

[Mathieu Poirier]

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 <mathieu.poirier@linaro.org>
---
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, &timestamp);
-		if (ret)
+		if (ret != -1)
 			return ret;
 
 		ret = perf_session__queue_event(session, event, timestamp, file_offset);
-- 
2.7.4

Re: [PATCH v2] perf report: Fix regression when decoding intelPT traces

[Jiri Olsa]

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 <mathieu.poirier@linaro.org>
> ---
> 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, &timestamp);
> -		if (ret)
> +		if (ret != -1)
>  			return ret;
>  
>  		ret = perf_session__queue_event(session, event, timestamp, file_offset);
> -- 
> 2.7.4
> 

Acked-by: Jiri Olsa <jolsa@kernel.org>

thanks,
jirka

[tip:perf/core] perf report: Fix regression when decoding Intel-PT traces

[tip-bot for Mathieu Poirier]

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, &timestamp);
-		if (ret)
+		if (ret != -1)
 			return ret;
 
 		ret = perf_session__queue_event(session, event, timestamp, file_offset);