perf, tools: Fix perf stat --per-core on multi socket systems
PATCH 1/1 perf, tools: Fix perf stat --per-core on multi socket systems
From: Andi Kleen <[email protected]>
On systems with more than one socket perf stat --per-core would either segfault or stop before outputting all cores. The problem was that the output code referenced the id including the socket number in the higher bits, which is far beyond any per cpu array.
Mask out the socket number before referencing cpus in abs_printout.
I also renamed the variable in nsec_printout to be clear what it is, even though it doesn't reference cpus.
--- tools/perf/builtin-stat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
tools/perf/builtin-stat.c +5 -4
@@ -732,7 +732,7 @@ static void aggr_printout(struct perf_evsel *evsel, int id, int nr) } } -static void nsec_printout (int cpu,int nr,struct perf_evsel *evsel,double avg) +static void nsec_printout (int id,int nr,struct perf_evsel *evsel,double avg) {double msecs = avg /1e6 ;const char *fmt_v, *fmt_n;
@@ -741,7 +741,7 @@ static void nsec_printout(int cpu, int nr, struct perf_evsel *evsel, double avg) fmt_v = csv_output ?"%.6f%s" :"%18.6f%s" ; fmt_n = csv_output ?"%s" :"%-25s" ; -aggr_printout (evsel, cpu, nr); +aggr_printout (evsel, id, nr);scnprintf (name,sizeof (name),"%s%s" ,perf_evsel__name (evsel), csv_output ?"" :" (msec)" );
@@ -947,11 +947,12 @@ static void print_ll_cache_misses(int cpu,fprintf (output," of all LL-cache hits " ); } -static void abs_printout (int cpu,int nr,struct perf_evsel *evsel,double avg) +static void abs_printout (int id,int nr,struct perf_evsel *evsel,double avg) {double total, ratio =0.0 , total2;double sc = evsel->scale;const char *fmt; +int cpu =cpu_map__id_to_cpu (id);if (csv_output) { fmt = sc !=1.0 ?"%.2f%s" :"%.0f%s" ;
@@ -962,7 +963,7 @@ static void abs_printout(int cpu, int nr, struct perf_evsel *evsel, double avg) fmt = sc !=1.0 ?"%18.2f%s" :"%18.0f%s" ; } -aggr_printout (evsel, cpu, nr); +aggr_printout (evsel, id, nr);if (aggr_mode ==AGGR_GLOBAL ) cpu =0 ;
Signature · 1 line
1.9.3
Quoted 8 lines · Andi Kleen
From: Andi Kleen <[email protected]>
On systems with more than one socket perf stat --per-core would either segfault or stop before outputting all cores. The problem was that the output code referenced the id including the socket number in the higher bits, which is far beyond any per cpu array.
Quoted 8 lines
Mask out the socket number before referencing cpus in
abs_printout.I also renamed the variable in
nsec_printoutto be clear what it is, even though it doesn't reference cpus.Signed-off-by Andi Kleen <[email protected]>
This works for me and is the better approach compared to what I saw in Matt Flemming's patch: https://lkml.org/lkml/2014/9/24/571
Quoted 52 lines
--- tools/perf/builtin-stat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)tools/perf/builtin-stat.c +5
-5@@ -732,7 +732,7 @@ static void aggr_printout(struct perf_evsel *evsel, int id, int nr) } } -static void nsec_printout (int cpu,int nr,struct perf_evsel *evsel,double avg) +static void nsec_printout (int id,int nr,struct perf_evsel *evsel,double avg) {double msecs = avg /1e6 ;const char *fmt_v, *fmt_n;@@ -741,7 +741,7 @@ static void nsec_printout(int cpu, int nr, struct perf_evsel *evsel, double avg) fmt_v = csv_output ?"%.6f%s" :"%18.6f%s" ; fmt_n = csv_output ?"%s" :"%-25s" ; -aggr_printout (evsel, cpu, nr); +aggr_printout (evsel, id, nr);scnprintf (name,sizeof (name),"%s%s" ,perf_evsel__name (evsel), csv_output ?"" :" (msec)" );@@ -947,11 +947,12 @@ static void print_ll_cache_misses(int cpu,fprintf (output," of all LL-cache hits " ); } -static void abs_printout (int cpu,int nr,struct perf_evsel *evsel,double avg) +static void abs_printout (int id,int nr,struct perf_evsel *evsel,double avg) {double total, ratio =0.0 , total2;double sc = evsel->scale;const char *fmt; +int cpu =cpu_map__id_to_cpu (id);if (csv_output) { fmt = sc !=1.0 ?"%.2f%s" :"%.0f%s" ;@@ -962,7 +963,7 @@ static void abs_printout(int cpu, int nr, struct perf_evsel *evsel, double avg) fmt = sc !=1.0 ?"%18.2f%s" :"%18.0f%s" ; } -aggr_printout (evsel, cpu, nr); +aggr_printout (evsel, id, nr);if (aggr_mode ==AGGR_GLOBAL ) cpu =0 ; --1.9.3
tip-bot for Andi Kleen
merge bot[tip:perf/core] perf stat: Fix --per-core on multi socket systems
In reply to Andi Kleenperf stat: Fix --per-core on multi socket systems
Commit-ID: da88c7f78d842a6938d9adde6af87a2ce262051d Gitweb: http://git.kernel.org/tip/da88c7f78d842a6938d9adde6af87a2ce262051d Author: Andi Kleen <[email protected]> AuthorDate: Wed, 24 Sep 2014 13:50:46 -0700 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 26 Sep 2014 10:17:13 -0300
perf stat: Fix --per-core on multi socket systems
On systems with more than one socket perf stat --per-core would either segfault or stop before outputting all cores.
The problem was that the output code referenced the id including the socket number in the higher bits, which is far beyond any per cpu array.
Mask out the socket number before referencing cpus in abs_printout.
I also renamed the variable in nsec_printout to be clear what it is, even though it doesn't reference cpus.
--- tools/perf/builtin-stat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
tools/perf/builtin-stat.c +5 -4
@@ -732,7 +732,7 @@ static void aggr_printout(struct perf_evsel *evsel, int id, int nr) } } -static void nsec_printout (int cpu,int nr,struct perf_evsel *evsel,double avg) +static void nsec_printout (int id,int nr,struct perf_evsel *evsel,double avg) {double msecs = avg /1e6 ;const char *fmt_v, *fmt_n;
@@ -741,7 +741,7 @@ static void nsec_printout(int cpu, int nr, struct perf_evsel *evsel, double avg) fmt_v = csv_output ?"%.6f%s" :"%18.6f%s" ; fmt_n = csv_output ?"%s" :"%-25s" ; -aggr_printout (evsel, cpu, nr); +aggr_printout (evsel, id, nr);scnprintf (name,sizeof (name),"%s%s" ,perf_evsel__name (evsel), csv_output ?"" :" (msec)" );
@@ -947,11 +947,12 @@ static void print_ll_cache_misses(int cpu,fprintf (output," of all LL-cache hits " ); } -static void abs_printout (int cpu,int nr,struct perf_evsel *evsel,double avg) +static void abs_printout (int id,int nr,struct perf_evsel *evsel,double avg) {double total, ratio =0.0 , total2;double sc = evsel->scale;const char *fmt; +int cpu =cpu_map__id_to_cpu (id);if (csv_output) { fmt = sc !=1.0 ?"%.2f%s" :"%.0f%s" ;
@@ -962,7 +963,7 @@ static void abs_printout(int cpu, int nr, struct perf_evsel *evsel, double avg) fmt = sc !=1.0 ?"%18.2f%s" :"%18.0f%s" ; } -aggr_printout (evsel, cpu, nr); +aggr_printout (evsel, id, nr);if (aggr_mode ==AGGR_GLOBAL ) cpu =0 ;