Doug / smarc-fsl-linux-kernel | Embedian Git Server

Commit fa30c964c0ac31a705a4f86072267a42343c4158

Authored by Stephane Eranian 2012-03-18 06:23:18 +0800

Committed by Arnaldo Carvalho de Melo 2012-03-27 02:36:03 +0800

Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches

perf tools: Fix bug in raw sample parsing

In perf_event__parse_sample(), the array variable was not incremented
by the amount of data used by the raw_data.

That was okay until we added PERF_SAMPLE_BRANCH_STACK which depends on
the array variable pointing to the beginning of the branch stack data.

But that was not the case if branch stack was combined with raw mode
sampling. That led to bogus branch stack addresses and count.

The bug would show up with:
$ perf record -R -b foo

This patch fixes the problem by correctly moving the array pointer
forward for RAW samples.

Signed-off-by: Stephane Eranian <eranian@google.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20120317222317.GA8803@quad
[ committer note: Fix also later submitted by Jiri Olsa ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

tools/perf/util/evsel.c

tools/perf/util/evsel.c

Diff comments View file @ fa30c96

...	...	@@ -580,6 +580,8 @@
580	580	return -EFAULT;
581	581
582	582	data->raw_data = (void *) pdata;
	583	+
	584	+ array = (void *)array + data->raw_size + sizeof(u32);
583	585	}
584	586
585	587	if (type & PERF_SAMPLE_BRANCH_STACK) {