* [PATCH] perf stat: Fix s390x compile error on F32 utils/stat-display.c
@ 2020-08-25 6:33 Thomas Richter
2020-08-25 7:14 ` Jiri Olsa
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Richter @ 2020-08-25 6:33 UTC (permalink / raw)
To: linux-kernel, linux-perf-users, acme
Cc: svens, gor, sumanthk, heiko.carstens, jolsa, Thomas Richter
Fix a compile error on F32 and gcc version 10.1 on s390 in file
utils/stat-display.c. The error does not show up with make DEBUG=y.
In fact the issue shows up when using both compiler options
-O6 and -D_FORTIFY_SOURCE=2 (which are omitted with DEBUG=Y).
This is the offending call chain:
print_counter_aggr()
printout(config, -1, 0, ...) with 2nd parm id set to -1
aggr_printout(config, x, id --> -1, ...) which leads to this code:
case AGGR_NONE:
if (evsel->percore && !config->percore_show_thread) {
....
} else {
fprintf(config->output, "CPU%*d%s",
config->csv_output ? 0 : -7,
evsel__cpus(evsel)->map[id],
^^ id is -1 !!!!
config->csv_sep);
}
This is a compiler inlining issue which is detected on s390 but not on
other plattforms.
Output before:
# make util/stat-display.o
.....
util/stat-display.c: In function ‘perf_evlist__print_counters’:
util/stat-display.c:121:4: error: array subscript -1 is below array
bounds of ‘int[]’ [-Werror=array-bounds]
121 | fprintf(config->output, "CPU%*d%s",
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
122 | config->csv_output ? 0 : -7,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
123 | evsel__cpus(evsel)->map[id],
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
124 | config->csv_sep);
| ~~~~~~~~~~~~~~~~
In file included from util/evsel.h:13,
from util/evlist.h:13,
from util/stat-display.c:9:
/root/linux/tools/lib/perf/include/internal/cpumap.h:10:7:
note: while referencing ‘map’
10 | int map[];
| ^~~
cc1: all warnings being treated as errors
mv: cannot stat 'util/.stat-display.o.tmp': No such file or directory
make[3]: *** [/root/linux/tools/build/Makefile.build:97: util/stat-display.o]
Error 1
make[2]: *** [Makefile.perf:716: util/stat-display.o] Error 2
make[1]: *** [Makefile.perf:231: sub-make] Error 2
make: *** [Makefile:110: util/stat-display.o] Error 2
[root@t35lp46 perf]#
Output after:
# make util/stat-display.o
.....
CC util/stat-display.o
[root@t35lp46 perf]#
Suggested-by: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
---
tools/perf/util/stat-display.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 57d0706e1330..cbe836649f84 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -117,12 +117,11 @@ static void aggr_printout(struct perf_stat_config *config,
cpu_map__id_to_die(id),
config->csv_output ? 0 : -3,
cpu_map__id_to_cpu(id), config->csv_sep);
- } else {
+ } else if (id > -1)
fprintf(config->output, "CPU%*d%s",
config->csv_output ? 0 : -7,
evsel__cpus(evsel)->map[id],
config->csv_sep);
- }
break;
case AGGR_THREAD:
fprintf(config->output, "%*s-%*d%s",
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] perf stat: Fix s390x compile error on F32 utils/stat-display.c
2020-08-25 6:33 [PATCH] perf stat: Fix s390x compile error on F32 utils/stat-display.c Thomas Richter
@ 2020-08-25 7:14 ` Jiri Olsa
2020-08-26 13:00 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Olsa @ 2020-08-25 7:14 UTC (permalink / raw)
To: Thomas Richter
Cc: linux-kernel, linux-perf-users, acme, svens, gor, sumanthk,
heiko.carstens
On Tue, Aug 25, 2020 at 08:33:04AM +0200, Thomas Richter wrote:
SNIP
> diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
> index 57d0706e1330..cbe836649f84 100644
> --- a/tools/perf/util/stat-display.c
> +++ b/tools/perf/util/stat-display.c
> @@ -117,12 +117,11 @@ static void aggr_printout(struct perf_stat_config *config,
> cpu_map__id_to_die(id),
> config->csv_output ? 0 : -3,
> cpu_map__id_to_cpu(id), config->csv_sep);
> - } else {
> + } else if (id > -1)
> fprintf(config->output, "CPU%*d%s",
> config->csv_output ? 0 : -7,
> evsel__cpus(evsel)->map[id],
> config->csv_sep);
> - }
I think we want multiple if lines within { } but
scripts/checkpatch.pl does not scream about this,
so leaving this to Arnaldo ;-)
Acked-by: Jiri Olsa <jolsa@redhat.com>
thanks,
jirka
> break;
> case AGGR_THREAD:
> fprintf(config->output, "%*s-%*d%s",
> --
> 2.26.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] perf stat: Fix s390x compile error on F32 utils/stat-display.c
2020-08-25 7:14 ` Jiri Olsa
@ 2020-08-26 13:00 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-08-26 13:00 UTC (permalink / raw)
To: Jiri Olsa
Cc: Thomas Richter, linux-kernel, linux-perf-users, svens, gor,
sumanthk, heiko.carstens
Em Tue, Aug 25, 2020 at 09:14:42AM +0200, Jiri Olsa escreveu:
> On Tue, Aug 25, 2020 at 08:33:04AM +0200, Thomas Richter wrote:
>
> SNIP
>
> > diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
> > index 57d0706e1330..cbe836649f84 100644
> > --- a/tools/perf/util/stat-display.c
> > +++ b/tools/perf/util/stat-display.c
> > @@ -117,12 +117,11 @@ static void aggr_printout(struct perf_stat_config *config,
> > cpu_map__id_to_die(id),
> > config->csv_output ? 0 : -3,
> > cpu_map__id_to_cpu(id), config->csv_sep);
> > - } else {
> > + } else if (id > -1)
> > fprintf(config->output, "CPU%*d%s",
> > config->csv_output ? 0 : -7,
> > evsel__cpus(evsel)->map[id],
> > config->csv_sep);
> > - }
> I think we want multiple if lines within { } but
> scripts/checkpatch.pl does not scream about this, so leaving this to
> Arnaldo ;-)
Yeah, I removed the removal of the {} for a multiline else block, added
your Acked-by, thanks,
- Analdo
> Acked-by: Jiri Olsa <jolsa@redhat.com>
>
> thanks,
> jirka
>
> > break;
> > case AGGR_THREAD:
> > fprintf(config->output, "%*s-%*d%s",
> > --
> > 2.26.2
> >
>
--
- Arnaldo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-26 13:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-25 6:33 [PATCH] perf stat: Fix s390x compile error on F32 utils/stat-display.c Thomas Richter
2020-08-25 7:14 ` Jiri Olsa
2020-08-26 13:00 ` Arnaldo Carvalho de Melo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).