linux-kernel - [tip:perf/core] perf evsel: Fix up leftover perf_evsel

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <tip-82806c3aae7496d6974429f3bd43ebeeef18b9b2@git.kernel.org>
Date:   Sat, 18 Nov 2017 00:26:45 -0800
From:   tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     dsahern@...il.com, tmricht@...ux.vnet.ibm.com, namhyung@...nel.org,
        jolsa@...nel.org, andi@...stfloor.org, acme@...hat.com,
        brueckner@...ux.vnet.ibm.com, hpa@...or.com,
        linux-kernel@...r.kernel.org, tglx@...utronix.de,
        adrian.hunter@...el.com, mingo@...nel.org, wangnan0@...wei.com
Subject: [tip:perf/core] perf evsel: Fix up leftover perf_evsel_stat usage
 via evsel->priv

Commit-ID:  82806c3aae7496d6974429f3bd43ebeeef18b9b2
Gitweb:     https://git.kernel.org/tip/82806c3aae7496d6974429f3bd43ebeeef18b9b2
Author:     Arnaldo Carvalho de Melo <acme@...hat.com>
AuthorDate: Thu, 9 Nov 2017 12:03:40 -0300
Committer:  Arnaldo Carvalho de Melo <acme@...hat.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@...ux.vnet.ibm.com>
Tested-by: Thomas-Mich Richter <tmricht@...ux.vnet.ibm.com>
Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: Andi Kleen <andi@...stfloor.org>
Cc: David Ahern <dsahern@...il.com>
Cc: Hendrik Brueckner <brueckner@...ux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Wang Nan <wangnan0@...wei.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@...hat.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;