* [tip:perf/core] perf evsel: Fix up leftover perf_evsel_stat usage via evsel->priv
[not found] <20171109150046.GN4333@kernel.org>
@ 2017-11-18 8:26 ` tip-bot for Arnaldo Carvalho de Melo
2017-11-29 6:29 ` tip-bot for Arnaldo Carvalho de Melo
1 sibling, 0 replies; 2+ messages in thread
From: tip-bot for Arnaldo Carvalho de Melo @ 2017-11-18 8:26 UTC (permalink / raw)
To: linux-tip-commits
Cc: dsahern, tmricht, namhyung, jolsa, andi, acme, brueckner, hpa,
linux-kernel, tglx, adrian.hunter, mingo, wangnan0
Commit-ID: 82806c3aae7496d6974429f3bd43ebeeef18b9b2
Gitweb: https://git.kernel.org/tip/82806c3aae7496d6974429f3bd43ebeeef18b9b2
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Thu, 9 Nov 2017 12:03:40 -0300
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 16 Nov 2017 14:49:53 -0300
perf evsel: Fix up leftover perf_evsel_stat usage via evsel->priv
I forgot one conversion, which got noticed by Thomas when running:
$ perf stat -e '{cpu-clock,instructions}' kill
kill: not enough arguments
Segmentation fault (core dumped)
$
Fix it, those stats are in evsel->stats, not anymore in evsel->priv.
Reported-by: Thomas-Mich Richter <tmricht@linux.vnet.ibm.com>
Tested-by: Thomas-Mich Richter <tmricht@linux.vnet.ibm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: e669e833da8d ("perf evsel: Restore evsel->priv as a tool private area")
Link: http://lkml.kernel.org/r/20171109150046.GN4333@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/evsel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 4376cdf..cb9bcdb 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1377,7 +1377,7 @@ perf_evsel__process_group_data(struct perf_evsel *leader,
static int
perf_evsel__read_group(struct perf_evsel *leader, int cpu, int thread)
{
- struct perf_stat_evsel *ps = leader->priv;
+ struct perf_stat_evsel *ps = leader->stats;
u64 read_format = leader->attr.read_format;
int size = perf_evsel__read_size(leader);
u64 *data = ps->group_data;
^ permalink raw reply related [flat|nested] 2+ messages in thread* [tip:perf/core] perf evsel: Fix up leftover perf_evsel_stat usage via evsel->priv
[not found] <20171109150046.GN4333@kernel.org>
2017-11-18 8:26 ` [tip:perf/core] perf evsel: Fix up leftover perf_evsel_stat usage via evsel->priv tip-bot for Arnaldo Carvalho de Melo
@ 2017-11-29 6:29 ` tip-bot for Arnaldo Carvalho de Melo
1 sibling, 0 replies; 2+ messages in thread
From: tip-bot for Arnaldo Carvalho de Melo @ 2017-11-29 6:29 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, adrian.hunter, acme, wangnan0, tmricht, andi,
namhyung, jolsa, brueckner, dsahern, hpa, tglx, mingo
Commit-ID: 8e2d8e204247aa9eeb87893f6b8bf0cf29428b31
Gitweb: https://git.kernel.org/tip/8e2d8e204247aa9eeb87893f6b8bf0cf29428b31
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Thu, 9 Nov 2017 12:03:40 -0300
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 28 Nov 2017 14:20:32 -0300
perf evsel: Fix up leftover perf_evsel_stat usage via evsel->priv
I forgot one conversion, which got noticed by Thomas when running:
$ perf stat -e '{cpu-clock,instructions}' kill
kill: not enough arguments
Segmentation fault (core dumped)
$
Fix it, those stats are in evsel->stats, not anymore in evsel->priv.
Reported-by: Thomas-Mich Richter <tmricht@linux.vnet.ibm.com>
Tested-by: Thomas-Mich Richter <tmricht@linux.vnet.ibm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: e669e833da8d ("perf evsel: Restore evsel->priv as a tool private area")
Link: http://lkml.kernel.org/r/20171109150046.GN4333@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/evsel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index bfde6a7..d5fbcf8 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1375,7 +1375,7 @@ perf_evsel__process_group_data(struct perf_evsel *leader,
static int
perf_evsel__read_group(struct perf_evsel *leader, int cpu, int thread)
{
- struct perf_stat_evsel *ps = leader->priv;
+ struct perf_stat_evsel *ps = leader->stats;
u64 read_format = leader->attr.read_format;
int size = perf_evsel__read_size(leader);
u64 *data = ps->group_data;
^ permalink raw reply related [flat|nested] 2+ messages in thread