From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EF9AC433DF for ; Mon, 24 Aug 2020 20:22:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CA86F20738 for ; Mon, 24 Aug 2020 20:22:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GSUE2gCj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726531AbgHXUWZ (ORCPT ); Mon, 24 Aug 2020 16:22:25 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:29983 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725904AbgHXUWY (ORCPT ); Mon, 24 Aug 2020 16:22:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598300542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LgfiJ85ig5vZACF8oig+q5AGQy3ENzbLv5e0pq2KZk8=; b=GSUE2gCjkrmkbo94FkqUpZ60YKSxnz3ot51R9E8b6xyDANSDSfAlOUrucWfZAc+tSzXEPq t3AD5lfyRN0L+pmXW/D0p+1Vonbndd4SOQghoUZLbpwxsNkKPttAH8IHSTa4r6ssd0qxTZ Kq++e14vvPS9emZJwirgzrPgyEeLBRE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-209-S4b5GZN3Of-4ZPmgvxxppA-1; Mon, 24 Aug 2020 16:22:20 -0400 X-MC-Unique: S4b5GZN3Of-4ZPmgvxxppA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 52FE118A224F; Mon, 24 Aug 2020 20:22:18 +0000 (UTC) Received: from krava (unknown [10.40.192.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id F3E6460DA0; Mon, 24 Aug 2020 20:22:15 +0000 (UTC) Date: Mon, 24 Aug 2020 22:22:15 +0200 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: Jin Yao , Thomas Richter , Jiri Olsa , Namhyung Kim , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, svens@linux.ibm.com, gor@linux.ibm.com, sumanthk@linux.ibm.com, heiko.carstens@de.ibm.com Subject: Re: [PATCH] Fix s390x compile error on F32 utils/stat-display.c Message-ID: <20200824202215.GA631468@krava> References: <20200722092053.22345-1-tmricht@linux.ibm.com> <20200812112708.GA13995@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20200812112708.GA13995@kernel.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 12, 2020 at 08:27:08AM -0300, Arnaldo Carvalho de Melo wrote: > Em Wed, Jul 22, 2020 at 11:20:53AM +0200, Thomas Richter escreveu: > > 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. > > What is the sequence of events that gets to this? I.e. is it valid to > get a config->aggr_mode == AGGR_NONE, then have evsel not be percore and > config->percore_show_thread to be false? > > I wonder if this won't be papering over some bug :-\ > > Jin? > > This is where this came from: > commit 4fc4d8dfa056dfd48afe73b9ea3b7570ceb80b9c (tag: perf-core-for-mingo-5.2-20190517) > Author: Jin Yao > Date: Fri Apr 12 21:59:49 2019 +0800 > > perf stat: Support 'percore' event qualifier > > With this patch, we can use the 'percore' event qualifier in perf-stat. > > --- > > Also please add at least Jiri and Namhyung on the CC list, having the > person that added that array usage also helps. > > [acme@quaco perf]$ scripts/get_maintainer.pl tools/perf | grep reviewer > Mark Rutland (reviewer:PERFORMANCE EVENTS SUBSYSTEM) > Alexander Shishkin (reviewer:PERFORMANCE EVENTS SUBSYSTEM) > Jiri Olsa (reviewer:PERFORMANCE EVENTS SUBSYSTEM) > Namhyung Kim (reviewer:PERFORMANCE EVENTS SUBSYSTEM) > [acme@quaco perf]$ > > Thanks, > > - Arnaldo > > > 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]# I tested on s390 with rhel8, but did not get this error, f32's gcc must be smarter > > > > Output after: > > # make util/stat-display.o > > ..... > > CC util/stat-display.o > > [root@t35lp46 perf]# > > > > Signed-off-by: Thomas Richter > > --- > > tools/perf/util/stat-display.c | 9 +++++---- > > 1 file changed, 5 insertions(+), 4 deletions(-) > > > > diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c > > index 57d0706e1330..e49e544188e4 100644 > > --- a/tools/perf/util/stat-display.c > > +++ b/tools/perf/util/stat-display.c > > @@ -118,10 +118,11 @@ static void aggr_printout(struct perf_stat_config *config, > > config->csv_output ? 0 : -3, > > cpu_map__id_to_cpu(id), config->csv_sep); > > } else { > > - fprintf(config->output, "CPU%*d%s", > > - config->csv_output ? 0 : -7, > > - evsel__cpus(evsel)->map[id], > > - config->csv_sep); > > + if (id > -1) > > + fprintf(config->output, "CPU%*d%s", > > + config->csv_output ? 0 : -7, > > + evsel__cpus(evsel)->map[id], > > + config->csv_sep); -1 is only through print_counter_aggr which is called for AGGR_GLOBAL case as you described, but I guess we can have this check as precaution you could put it together with above else } else if (id > -1) thanks, jirka