[PATCH] perf tools: Do not zero sample_id_all for group members

[PATCH] perf tools: Do not zero sample_id_all for group members

[Jiri Olsa]

Andi reported following malfunction:

  # perf record -e '{ref-cycles,cycles}:S' -a sleep 1
  # perf script
  non matching sample_id_all

That's because we disable sample_id_all bit for non-sampling
group members. We can't do that, because it needs to be the
same over the whole event list. This patch keeps it untouched
again.

Fixes: e9add8bac6c6 ("perf evsel: Disable write_backward for leader sampling group events")
Reported-by: Andi Kleen <andi@firstfloor.org>
Link: http://lkml.kernel.org/n/tip-y7hc1i6en4saxqxuwr2g24f1@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/tests/attr/test-record-group-sampling | 1 -
 tools/perf/util/evsel.c                          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/tools/perf/tests/attr/test-record-group-sampling b/tools/perf/tests/attr/test-record-group-sampling
index 8a33ca4f9e1f..f0729c454f16 100644
--- a/tools/perf/tests/attr/test-record-group-sampling
+++ b/tools/perf/tests/attr/test-record-group-sampling
@@ -37,4 +37,3 @@ sample_freq=0
 sample_period=0
 freq=0
 write_backward=0
-sample_id_all=0
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index cb7f01059940..ff5313b70cb5 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -952,7 +952,6 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts,
 		attr->sample_freq    = 0;
 		attr->sample_period  = 0;
 		attr->write_backward = 0;
-		attr->sample_id_all  = 0;
 	}
 
 	if (opts->no_samples)
-- 
2.17.1

Re: [PATCH] perf tools: Do not zero sample_id_all for group members

[Andi Kleen]

On Sun, Sep 23, 2018 at 05:04:20PM +0200, Jiri Olsa wrote:
> Andi reported following malfunction:
> 
>   # perf record -e '{ref-cycles,cycles}:S' -a sleep 1
>   # perf script
>   non matching sample_id_all
> 
> That's because we disable sample_id_all bit for non-sampling
> group members. We can't do that, because it needs to be the
> same over the whole event list. This patch keeps it untouched
> again.
> 
> Fixes: e9add8bac6c6 ("perf evsel: Disable write_backward for leader sampling group events")
> Reported-by: Andi Kleen <andi@firstfloor.org>
> Link: http://lkml.kernel.org/n/tip-y7hc1i6en4saxqxuwr2g24f1@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>

Tested-by: Andi Kleen <ak@linux.intel.com>

Should be also cc stable please

-Andi

[tip:perf/urgent] perf tools: Do not zero sample_id_all for group members

[tip-bot for Jiri Olsa]

Commit-ID:  8e88c29b351ed4e09dd63f825f1c8260b0cb0ab3
Gitweb:     https://git.kernel.org/tip/8e88c29b351ed4e09dd63f825f1c8260b0cb0ab3
Author:     Jiri Olsa <jolsa@kernel.org>
AuthorDate: Sun, 23 Sep 2018 17:04:20 +0200
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 6 Nov 2018 08:29:56 -0300

perf tools: Do not zero sample_id_all for group members

Andi reported following malfunction:

  # perf record -e '{ref-cycles,cycles}:S' -a sleep 1
  # perf script
  non matching sample_id_all

That's because we disable sample_id_all bit for non-sampling group
members. We can't do that, because it needs to be the same over the
whole event list. This patch keeps it untouched again.

Reported-by: Andi Kleen <andi@firstfloor.org>
Tested-by: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180923150420.27327-1-jolsa@kernel.org
Fixes: e9add8bac6c6 ("perf evsel: Disable write_backward for leader sampling group events")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/tests/attr/test-record-group-sampling | 1 -
 tools/perf/util/evsel.c                          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/tools/perf/tests/attr/test-record-group-sampling b/tools/perf/tests/attr/test-record-group-sampling
index 8a33ca4f9e1f..f0729c454f16 100644
--- a/tools/perf/tests/attr/test-record-group-sampling
+++ b/tools/perf/tests/attr/test-record-group-sampling
@@ -37,4 +37,3 @@ sample_freq=0
 sample_period=0
 freq=0
 write_backward=0
-sample_id_all=0
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 6d187059a373..d37bb1566cd9 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -956,7 +956,6 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts,
 		attr->sample_freq    = 0;
 		attr->sample_period  = 0;
 		attr->write_backward = 0;
-		attr->sample_id_all  = 0;
 	}
 
 	if (opts->no_samples)