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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23ACCC636D4 for ; Fri, 3 Feb 2023 14:35:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232755AbjBCOfj (ORCPT ); Fri, 3 Feb 2023 09:35:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232618AbjBCOfg (ORCPT ); Fri, 3 Feb 2023 09:35:36 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF7721C59D; Fri, 3 Feb 2023 06:35:34 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A522BB829BD; Fri, 3 Feb 2023 14:35:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7A10C433EF; Fri, 3 Feb 2023 14:35:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675434932; bh=591cCBZ+PsEVXsKpjn0NOJi6MWraP0qqr2cYXmxSpYw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=oA+IlZSUQ7ppuaUpOeX6yVRxJgsyonYX3RIlBZvC+MfnI2SvZlx1eCvmp9jCio614 YDRIHOtwbhxGJX1Eztr3rfn8/1BwT5F5DoYSNRFbGGTAgokcqrmQ2vCieA6QeVaMw1 81vSyt7YwUtEVPA9rv5ldkS6GnSsbHAU49WJE4Yh0r9LUN5jU5SdLITjc2XpF10YJU 3i78nR0H4oHA1uE7CNT/wTE6MVNSIM9tEaJ+xq+TrPnRUhDw1um+pz/a2fqaus2N0r ArvI+Hu//fVzBIN6yrBWOfM5nVsxKUxFhVof59fPfacLmr9HLQemIfKtrsNsxWFmQ8 2YPAJKViqtDKg== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 09108405BE; Fri, 3 Feb 2023 11:35:29 -0300 (-03) Date: Fri, 3 Feb 2023 11:35:28 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kan Liang , Kim Phillips , Florian Fischer , Ravi Bangoria , Xing Zhengjun , Rob Herring , Kang Minchul , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Sandipan Das , Jing Zhang , linuxppc-dev@lists.ozlabs.org, Kajol Jain , Stephane Eranian , Perry Taylor , Caleb Biggers Subject: Re: [PATCH v1] perf pmu: Fix aarch64 build Message-ID: References: <20230203014014.75720-1-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Url: http://acmel.wordpress.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Fri, Feb 03, 2023 at 11:17:38AM -0300, Arnaldo Carvalho de Melo escreveu: > Em Thu, Feb 02, 2023 at 05:41:22PM -0800, Ian Rogers escreveu: > > On Thu, Feb 2, 2023 at 5:40 PM Ian Rogers wrote: > > > > > > ARM64 overrides a weak function but a previous change had broken the > > > build. > > > > > > Fixes: 8cefeb8bd336 ("perf pmu-events: Introduce pmu_metrics_table") > > > > As 8cefeb8bd336 ("perf pmu-events: Introduce pmu_metrics_table") is > > only on tmp.perf/core then it may be best to just squash this fix into > > that. > > Yeah, that was my intention, I'll fold it there to keep bisection, > thanks for fixing it so fast, I'll double check on my rk3399 board and > on again on the cross-build container. Nope, that is not what I reported yesterday, trying to build it on the rk3399 board: acme@roc-rk3399-pc:~/git/perf$ cat /etc/os-release PRETTY_NAME="Ubuntu 22.04.1 LTS" NAME="Ubuntu" VERSION_ID="22.04" VERSION="22.04.1 LTS (Jammy Jellyfish)" VERSION_CODENAME=jammy ID=ubuntu ID_LIKE=debian HOME_URL="https://www.ubuntu.com/" SUPPORT_URL="https://help.ubuntu.com/" BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/" PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy" UBUNTU_CODENAME=jammy acme@roc-rk3399-pc:~/git/perf$ CC /tmp/build/perf/arch/arm64/util/pmu.o CC /tmp/build/perf/bench/epoll-wait.o arch/arm64/util/pmu.c: In function ‘pmu__find_core_pmu’: arch/arm64/util/pmu.c:27:33: error: declaration of ‘pmu_metrics_table__find’ shadows a global declaration [-Werror=shadow] 27 | const struct pmu_metrics_table *pmu_metrics_table__find(void) | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from arch/arm64/util/pmu.c:5: arch/arm64/util/../../../util/pmu.h:234:33: note: shadowed declaration is here 234 | const struct pmu_metrics_table *pmu_metrics_table__find(void); | ^~~~~~~~~~~~~~~~~~~~~~~ arch/arm64/util/pmu.c: In function ‘pmu_metrics_table__find’: arch/arm64/util/pmu.c:29:26: error: declaration of ‘pmu’ shadows a previous local [-Werror=shadow] 29 | struct perf_pmu *pmu = pmu__find_core_pmu(); | ^~~ arch/arm64/util/pmu.c:11:26: note: shadowed declaration is here 11 | struct perf_pmu *pmu = NULL; | ^~~ arch/arm64/util/pmu.c: In function ‘pmu__find_core_pmu’: arch/arm64/util/pmu.c:27:1: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] 27 | const struct pmu_metrics_table *pmu_metrics_table__find(void) | ^~~~~ arch/arm64/util/pmu.c:37:32: error: declaration of ‘pmu_events_table__find’ shadows a global declaration [-Werror=shadow] 37 | const struct pmu_events_table *pmu_events_table__find(void) | ^~~~~~~~~~~~~~~~~~~~~~ In file included from arch/arm64/util/pmu.c:5: arch/arm64/util/../../../util/pmu.h:233:32: note: shadowed declaration is here 233 | const struct pmu_events_table *pmu_events_table__find(void); | ^~~~~~~~~~~~~~~~~~~~~~ arch/arm64/util/pmu.c: In function ‘pmu_events_table__find’: arch/arm64/util/pmu.c:39:26: error: declaration of ‘pmu’ shadows a previous local [-Werror=shadow] 39 | struct perf_pmu *pmu = pmu__find_core_pmu(); | ^~~ arch/arm64/util/pmu.c:11:26: note: shadowed declaration is here 11 | struct perf_pmu *pmu = NULL; | ^~~ arch/arm64/util/pmu.c: In function ‘pmu__find_core_pmu’: arch/arm64/util/pmu.c:47:8: error: declaration of ‘perf_pmu__cpu_slots_per_cycle’ shadows a global declaration [-Werror=shadow] 47 | double perf_pmu__cpu_slots_per_cycle(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from arch/arm64/util/pmu.c:5: arch/arm64/util/../../../util/pmu.h:255:8: note: shadowed declaration is here 255 | double perf_pmu__cpu_slots_per_cycle(void); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/arm64/util/pmu.c: In function ‘perf_pmu__cpu_slots_per_cycle’: arch/arm64/util/pmu.c:51:26: error: declaration of ‘pmu’ shadows a previous local [-Werror=shadow] 51 | struct perf_pmu *pmu = pmu__find_core_pmu(); | ^~~ arch/arm64/util/pmu.c:11:26: note: shadowed declaration is here 11 | struct perf_pmu *pmu = NULL; | ^~~ arch/arm64/util/pmu.c: In function ‘pmu__find_core_pmu’: arch/arm64/util/pmu.c:64:1: error: expected declaration or statement at end of input 64 | } | ^ At top level: arch/arm64/util/pmu.c:47:8: error: ‘perf_pmu__cpu_slots_per_cycle’ defined but not used [-Werror=unused-function] 47 | double perf_pmu__cpu_slots_per_cycle(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/arm64/util/pmu.c:37:32: error: ‘pmu_events_table__find’ defined but not used [-Werror=unused-function] 37 | const struct pmu_events_table *pmu_events_table__find(void) | ^~~~~~~~~~~~~~~~~~~~~~ arch/arm64/util/pmu.c:27:33: error: ‘pmu_metrics_table__find’ defined but not used [-Werror=unused-function] 27 | const struct pmu_metrics_table *pmu_metrics_table__find(void) | ^~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[6]: *** [/home/acme/git/perf/tools/build/Makefile.build:98: /tmp/build/perf/arch/arm64/util/pmu.o] Error 1 make[5]: *** [/home/acme/git/perf/tools/build/Makefile.build:140: util] Error 2 make[4]: *** [/home/acme/git/perf/tools/build/Makefile.build:140: arm64] Error 2 make[3]: *** [/home/acme/git/perf/tools/build/Makefile.build:140: arch] Error 2 make[3]: *** Waiting for unfinished jobs.... 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9387FC61DA4 for ; Fri, 3 Feb 2023 14:37:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LID2/WbH6vp+0PEGRgk8GZyvqqCvuPwR2ZU6yhoUDq0=; b=04TJVII2rshAnL KNjuT0q73gu31a5ncCOEhgIGJoAkVFFOMmYqTVlMVYY0gCLw9EOufr3NbUiO/DzAc6lUSS/k8j9+E Pd1tiwnglaibjPlIJdA99txDcDMyzkUeRgAxNwagmM1S4zzNgqNZuKfwQOfOQ67itSX7GRoG13bf7 uw4wDpY0GeqAphZ4MLMujHlXpcM0itfMBCThf63j7yGsFhzvCXK4uMKKbVv8xPPqOYNF6dklYor74 PK8NlSxfs5QqlgzYRPqE7R0ZUWMBFAO+bTbw6AyTiOnAcwhkmKqpcnjyPT7m5X/yN6iV9ExgdTwQZ TQO9Iur2jrvvr6Acp0dw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pNxB5-002Udv-7Y; Fri, 03 Feb 2023 14:36:35 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pNxAF-002UIg-Dx for linux-arm-kernel@bombadil.infradead.org; Fri, 03 Feb 2023 14:35:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=In-Reply-To:Content-Transfer-Encoding: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date: Sender:Reply-To:Content-ID:Content-Description; bh=hwfZ+2dkbP3kY/KTO3SfnqGjbsJ3CsSQoWvk7UmD61Y=; b=SFXC6BTLYY+2kfhwSKri9vY5wO lyNOeoVKkUBIybMxMUTRVDKX7gmoSFdBrHHIGoWL2V9MEtG/RaBgjG2daoxQXOgsYO4TPh/OafPko mHpn9ab16vrbBdUiM+VTKpTLCpI/TatdlVZZorluHflIRiwJDUMD+Qk6iegdXiMYeN4frrmDfjBue BATGWTCGe8G4q8tun4SOJhdl0VSS726l9nM8uxR5b+CR4XTCHlp5ZHY7Bs0dZFeEB0K3Uxi3FxA+B 05lKdB32NdsBkIdu+Z/135k/frlRO8Wf2E+9x3shyQBguIpYdGfa5J7ReLpd4BzJjXBCQx/UhTjni De/1H6MQ==; Received: from [187.19.237.165] (helo=quaco.ghostprotocols.net) by desiato.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1pNx9U-005Wzm-1k; Fri, 03 Feb 2023 14:35:03 +0000 Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 09108405BE; Fri, 3 Feb 2023 11:35:29 -0300 (-03) Date: Fri, 3 Feb 2023 11:35:28 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kan Liang , Kim Phillips , Florian Fischer , Ravi Bangoria , Xing Zhengjun , Rob Herring , Kang Minchul , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Sandipan Das , Jing Zhang , linuxppc-dev@lists.ozlabs.org, Kajol Jain , Stephane Eranian , Perry Taylor , Caleb Biggers Subject: Re: [PATCH v1] perf pmu: Fix aarch64 build Message-ID: References: <20230203014014.75720-1-irogers@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Url: http://acmel.wordpress.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RW0gRnJpLCBGZWIgMDMsIDIwMjMgYXQgMTE6MTc6MzhBTSAtMDMwMCwgQXJuYWxkbyBDYXJ2YWxo byBkZSBNZWxvIGVzY3JldmV1Ogo+IEVtIFRodSwgRmViIDAyLCAyMDIzIGF0IDA1OjQxOjIyUE0g LTA4MDAsIElhbiBSb2dlcnMgZXNjcmV2ZXU6Cj4gPiBPbiBUaHUsIEZlYiAyLCAyMDIzIGF0IDU6 NDAgUE0gSWFuIFJvZ2VycyA8aXJvZ2Vyc0Bnb29nbGUuY29tPiB3cm90ZToKPiA+ID4KPiA+ID4g QVJNNjQgb3ZlcnJpZGVzIGEgd2VhayBmdW5jdGlvbiBidXQgYSBwcmV2aW91cyBjaGFuZ2UgaGFk IGJyb2tlbiB0aGUKPiA+ID4gYnVpbGQuCj4gPiA+Cj4gPiA+IEZpeGVzOiA4Y2VmZWI4YmQzMzYg KCJwZXJmIHBtdS1ldmVudHM6IEludHJvZHVjZSBwbXVfbWV0cmljc190YWJsZSIpCj4gPiAKPiA+ IEFzIDhjZWZlYjhiZDMzNiAoInBlcmYgcG11LWV2ZW50czogSW50cm9kdWNlIHBtdV9tZXRyaWNz X3RhYmxlIikgaXMKPiA+IG9ubHkgb24gdG1wLnBlcmYvY29yZSB0aGVuIGl0IG1heSBiZSBiZXN0 IHRvIGp1c3Qgc3F1YXNoIHRoaXMgZml4IGludG8KPiA+IHRoYXQuCj4gCj4gWWVhaCwgdGhhdCB3 YXMgbXkgaW50ZW50aW9uLCBJJ2xsIGZvbGQgaXQgdGhlcmUgdG8ga2VlcCBiaXNlY3Rpb24sCj4g dGhhbmtzIGZvciBmaXhpbmcgaXQgc28gZmFzdCwgSSdsbCBkb3VibGUgY2hlY2sgb24gbXkgcmsz Mzk5IGJvYXJkIGFuZAo+IG9uIGFnYWluIG9uIHRoZSBjcm9zcy1idWlsZCBjb250YWluZXIuCgpO b3BlLCB0aGF0IGlzIG5vdCB3aGF0IEkgcmVwb3J0ZWQgeWVzdGVyZGF5LCB0cnlpbmcgdG8gYnVp bGQgaXQgb24gdGhlCnJrMzM5OSBib2FyZDoKCmFjbWVAcm9jLXJrMzM5OS1wYzp+L2dpdC9wZXJm JCBjYXQgL2V0Yy9vcy1yZWxlYXNlClBSRVRUWV9OQU1FPSJVYnVudHUgMjIuMDQuMSBMVFMiCk5B TUU9IlVidW50dSIKVkVSU0lPTl9JRD0iMjIuMDQiClZFUlNJT049IjIyLjA0LjEgTFRTIChKYW1t eSBKZWxseWZpc2gpIgpWRVJTSU9OX0NPREVOQU1FPWphbW15CklEPXVidW50dQpJRF9MSUtFPWRl YmlhbgpIT01FX1VSTD0iaHR0cHM6Ly93d3cudWJ1bnR1LmNvbS8iClNVUFBPUlRfVVJMPSJodHRw czovL2hlbHAudWJ1bnR1LmNvbS8iCkJVR19SRVBPUlRfVVJMPSJodHRwczovL2J1Z3MubGF1bmNo cGFkLm5ldC91YnVudHUvIgpQUklWQUNZX1BPTElDWV9VUkw9Imh0dHBzOi8vd3d3LnVidW50dS5j b20vbGVnYWwvdGVybXMtYW5kLXBvbGljaWVzL3ByaXZhY3ktcG9saWN5IgpVQlVOVFVfQ09ERU5B TUU9amFtbXkKYWNtZUByb2MtcmszMzk5LXBjOn4vZ2l0L3BlcmYkCgogQ0MgICAgICAvdG1wL2J1 aWxkL3BlcmYvYXJjaC9hcm02NC91dGlsL3BtdS5vCiAgQ0MgICAgICAvdG1wL2J1aWxkL3BlcmYv YmVuY2gvZXBvbGwtd2FpdC5vCmFyY2gvYXJtNjQvdXRpbC9wbXUuYzogSW4gZnVuY3Rpb24g4oCY cG11X19maW5kX2NvcmVfcG114oCZOgphcmNoL2FybTY0L3V0aWwvcG11LmM6Mjc6MzM6IGVycm9y OiBkZWNsYXJhdGlvbiBvZiDigJhwbXVfbWV0cmljc190YWJsZV9fZmluZOKAmSBzaGFkb3dzIGEg Z2xvYmFsIGRlY2xhcmF0aW9uIFstV2Vycm9yPXNoYWRvd10KICAgMjcgfCBjb25zdCBzdHJ1Y3Qg cG11X21ldHJpY3NfdGFibGUgKnBtdV9tZXRyaWNzX3RhYmxlX19maW5kKHZvaWQpCiAgICAgIHwg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBefn5+fn5+fn5+fn5+fn5+fn5+fn5+fgpJ biBmaWxlIGluY2x1ZGVkIGZyb20gYXJjaC9hcm02NC91dGlsL3BtdS5jOjU6CmFyY2gvYXJtNjQv dXRpbC8uLi8uLi8uLi91dGlsL3BtdS5oOjIzNDozMzogbm90ZTogc2hhZG93ZWQgZGVjbGFyYXRp b24gaXMgaGVyZQogIDIzNCB8IGNvbnN0IHN0cnVjdCBwbXVfbWV0cmljc190YWJsZSAqcG11X21l dHJpY3NfdGFibGVfX2ZpbmQodm9pZCk7CiAgICAgIHwgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBefn5+fn5+fn5+fn5+fn5+fn5+fn5+fgphcmNoL2FybTY0L3V0aWwvcG11LmM6IElu IGZ1bmN0aW9uIOKAmHBtdV9tZXRyaWNzX3RhYmxlX19maW5k4oCZOgphcmNoL2FybTY0L3V0aWwv cG11LmM6Mjk6MjY6IGVycm9yOiBkZWNsYXJhdGlvbiBvZiDigJhwbXXigJkgc2hhZG93cyBhIHBy ZXZpb3VzIGxvY2FsIFstV2Vycm9yPXNoYWRvd10KICAgMjkgfCAgICAgICAgIHN0cnVjdCBwZXJm X3BtdSAqcG11ID0gcG11X19maW5kX2NvcmVfcG11KCk7CiAgICAgIHwgICAgICAgICAgICAgICAg ICAgICAgICAgIF5+fgphcmNoL2FybTY0L3V0aWwvcG11LmM6MTE6MjY6IG5vdGU6IHNoYWRvd2Vk IGRlY2xhcmF0aW9uIGlzIGhlcmUKICAgMTEgfCAgICAgICAgIHN0cnVjdCBwZXJmX3BtdSAqcG11 ID0gTlVMTDsKICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAgICAgXn5+CmFyY2gvYXJtNjQv dXRpbC9wbXUuYzogSW4gZnVuY3Rpb24g4oCYcG11X19maW5kX2NvcmVfcG114oCZOgphcmNoL2Fy bTY0L3V0aWwvcG11LmM6Mjc6MTogZXJyb3I6IElTTyBDOTAgZm9yYmlkcyBtaXhlZCBkZWNsYXJh dGlvbnMgYW5kIGNvZGUgWy1XZXJyb3I9ZGVjbGFyYXRpb24tYWZ0ZXItc3RhdGVtZW50XQogICAy NyB8IGNvbnN0IHN0cnVjdCBwbXVfbWV0cmljc190YWJsZSAqcG11X21ldHJpY3NfdGFibGVfX2Zp bmQodm9pZCkKICAgICAgfCBefn5+fgphcmNoL2FybTY0L3V0aWwvcG11LmM6Mzc6MzI6IGVycm9y OiBkZWNsYXJhdGlvbiBvZiDigJhwbXVfZXZlbnRzX3RhYmxlX19maW5k4oCZIHNoYWRvd3MgYSBn bG9iYWwgZGVjbGFyYXRpb24gWy1XZXJyb3I9c2hhZG93XQogICAzNyB8IGNvbnN0IHN0cnVjdCBw bXVfZXZlbnRzX3RhYmxlICpwbXVfZXZlbnRzX3RhYmxlX19maW5kKHZvaWQpCiAgICAgIHwgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIF5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KSW4gZmls ZSBpbmNsdWRlZCBmcm9tIGFyY2gvYXJtNjQvdXRpbC9wbXUuYzo1OgphcmNoL2FybTY0L3V0aWwv Li4vLi4vLi4vdXRpbC9wbXUuaDoyMzM6MzI6IG5vdGU6IHNoYWRvd2VkIGRlY2xhcmF0aW9uIGlz IGhlcmUKICAyMzMgfCBjb25zdCBzdHJ1Y3QgcG11X2V2ZW50c190YWJsZSAqcG11X2V2ZW50c190 YWJsZV9fZmluZCh2b2lkKTsKICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Xn5+fn5+fn5+fn5+fn5+fn5+fn5+fgphcmNoL2FybTY0L3V0aWwvcG11LmM6IEluIGZ1bmN0aW9u IOKAmHBtdV9ldmVudHNfdGFibGVfX2ZpbmTigJk6CmFyY2gvYXJtNjQvdXRpbC9wbXUuYzozOToy NjogZXJyb3I6IGRlY2xhcmF0aW9uIG9mIOKAmHBtdeKAmSBzaGFkb3dzIGEgcHJldmlvdXMgbG9j YWwgWy1XZXJyb3I9c2hhZG93XQogICAzOSB8ICAgICAgICAgc3RydWN0IHBlcmZfcG11ICpwbXUg PSBwbXVfX2ZpbmRfY29yZV9wbXUoKTsKICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAgICAg Xn5+CmFyY2gvYXJtNjQvdXRpbC9wbXUuYzoxMToyNjogbm90ZTogc2hhZG93ZWQgZGVjbGFyYXRp b24gaXMgaGVyZQogICAxMSB8ICAgICAgICAgc3RydWN0IHBlcmZfcG11ICpwbXUgPSBOVUxMOwog ICAgICB8ICAgICAgICAgICAgICAgICAgICAgICAgICBefn4KYXJjaC9hcm02NC91dGlsL3BtdS5j OiBJbiBmdW5jdGlvbiDigJhwbXVfX2ZpbmRfY29yZV9wbXXigJk6CmFyY2gvYXJtNjQvdXRpbC9w bXUuYzo0Nzo4OiBlcnJvcjogZGVjbGFyYXRpb24gb2Yg4oCYcGVyZl9wbXVfX2NwdV9zbG90c19w ZXJfY3ljbGXigJkgc2hhZG93cyBhIGdsb2JhbCBkZWNsYXJhdGlvbiBbLVdlcnJvcj1zaGFkb3dd CiAgIDQ3IHwgZG91YmxlIHBlcmZfcG11X19jcHVfc2xvdHNfcGVyX2N5Y2xlKHZvaWQpCiAgICAg IHwgICAgICAgIF5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CkluIGZpbGUgaW5jbHVkZWQg ZnJvbSBhcmNoL2FybTY0L3V0aWwvcG11LmM6NToKYXJjaC9hcm02NC91dGlsLy4uLy4uLy4uL3V0 aWwvcG11Lmg6MjU1Ojg6IG5vdGU6IHNoYWRvd2VkIGRlY2xhcmF0aW9uIGlzIGhlcmUKICAyNTUg fCBkb3VibGUgcGVyZl9wbXVfX2NwdV9zbG90c19wZXJfY3ljbGUodm9pZCk7CiAgICAgIHwgICAg ICAgIF5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CmFyY2gvYXJtNjQvdXRpbC9wbXUuYzog SW4gZnVuY3Rpb24g4oCYcGVyZl9wbXVfX2NwdV9zbG90c19wZXJfY3ljbGXigJk6CmFyY2gvYXJt NjQvdXRpbC9wbXUuYzo1MToyNjogZXJyb3I6IGRlY2xhcmF0aW9uIG9mIOKAmHBtdeKAmSBzaGFk b3dzIGEgcHJldmlvdXMgbG9jYWwgWy1XZXJyb3I9c2hhZG93XQogICA1MSB8ICAgICAgICAgc3Ry dWN0IHBlcmZfcG11ICpwbXUgPSBwbXVfX2ZpbmRfY29yZV9wbXUoKTsKICAgICAgfCAgICAgICAg ICAgICAgICAgICAgICAgICAgXn5+CmFyY2gvYXJtNjQvdXRpbC9wbXUuYzoxMToyNjogbm90ZTog c2hhZG93ZWQgZGVjbGFyYXRpb24gaXMgaGVyZQogICAxMSB8ICAgICAgICAgc3RydWN0IHBlcmZf cG11ICpwbXUgPSBOVUxMOwogICAgICB8ICAgICAgICAgICAgICAgICAgICAgICAgICBefn4KYXJj aC9hcm02NC91dGlsL3BtdS5jOiBJbiBmdW5jdGlvbiDigJhwbXVfX2ZpbmRfY29yZV9wbXXigJk6 CmFyY2gvYXJtNjQvdXRpbC9wbXUuYzo2NDoxOiBlcnJvcjogZXhwZWN0ZWQgZGVjbGFyYXRpb24g b3Igc3RhdGVtZW50IGF0IGVuZCBvZiBpbnB1dAogICA2NCB8IH0KICAgICAgfCBeCkF0IHRvcCBs ZXZlbDoKYXJjaC9hcm02NC91dGlsL3BtdS5jOjQ3Ojg6IGVycm9yOiDigJhwZXJmX3BtdV9fY3B1 X3Nsb3RzX3Blcl9jeWNsZeKAmSBkZWZpbmVkIGJ1dCBub3QgdXNlZCBbLVdlcnJvcj11bnVzZWQt ZnVuY3Rpb25dCiAgIDQ3IHwgZG91YmxlIHBlcmZfcG11X19jcHVfc2xvdHNfcGVyX2N5Y2xlKHZv aWQpCiAgICAgIHwgICAgICAgIF5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CmFyY2gvYXJt NjQvdXRpbC9wbXUuYzozNzozMjogZXJyb3I6IOKAmHBtdV9ldmVudHNfdGFibGVfX2ZpbmTigJkg ZGVmaW5lZCBidXQgbm90IHVzZWQgWy1XZXJyb3I9dW51c2VkLWZ1bmN0aW9uXQogICAzNyB8IGNv bnN0IHN0cnVjdCBwbXVfZXZlbnRzX3RhYmxlICpwbXVfZXZlbnRzX3RhYmxlX19maW5kKHZvaWQp CiAgICAgIHwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF5+fn5+fn5+fn5+fn5+fn5+ fn5+fn4KYXJjaC9hcm02NC91dGlsL3BtdS5jOjI3OjMzOiBlcnJvcjog4oCYcG11X21ldHJpY3Nf dGFibGVfX2ZpbmTigJkgZGVmaW5lZCBidXQgbm90IHVzZWQgWy1XZXJyb3I9dW51c2VkLWZ1bmN0 aW9uXQogICAyNyB8IGNvbnN0IHN0cnVjdCBwbXVfbWV0cmljc190YWJsZSAqcG11X21ldHJpY3Nf dGFibGVfX2ZpbmQodm9pZCkKICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IF5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CmNjMTogYWxsIHdhcm5pbmdzIGJlaW5nIHRyZWF0ZWQg YXMgZXJyb3JzCm1ha2VbNl06ICoqKiBbL2hvbWUvYWNtZS9naXQvcGVyZi90b29scy9idWlsZC9N YWtlZmlsZS5idWlsZDo5ODogL3RtcC9idWlsZC9wZXJmL2FyY2gvYXJtNjQvdXRpbC9wbXUub10g RXJyb3IgMQptYWtlWzVdOiAqKiogWy9ob21lL2FjbWUvZ2l0L3BlcmYvdG9vbHMvYnVpbGQvTWFr ZWZpbGUuYnVpbGQ6MTQwOiB1dGlsXSBFcnJvciAyCm1ha2VbNF06ICoqKiBbL2hvbWUvYWNtZS9n aXQvcGVyZi90b29scy9idWlsZC9NYWtlZmlsZS5idWlsZDoxNDA6IGFybTY0XSBFcnJvciAyCm1h a2VbM106ICoqKiBbL2hvbWUvYWNtZS9naXQvcGVyZi90b29scy9idWlsZC9NYWtlZmlsZS5idWls ZDoxNDA6IGFyY2hdIEVycm9yIDIKbWFrZVszXTogKioqIFdhaXRpbmcgZm9yIHVuZmluaXNoZWQg am9icy4uLi4KCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmlu ZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9s aW51eC1hcm0ta2VybmVsCg== 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 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1BE2EC61DA4 for ; Fri, 3 Feb 2023 14:36:31 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4P7dWd2qrxz3fG9 for ; Sat, 4 Feb 2023 01:36:29 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=oA+IlZSU; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=139.178.84.217; helo=dfw.source.kernel.org; envelope-from=acme@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=oA+IlZSU; dkim-atps=neutral Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4P7dVZ5rBNz2xdw for ; Sat, 4 Feb 2023 01:35:34 +1100 (AEDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EA0F061F48; Fri, 3 Feb 2023 14:35:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7A10C433EF; Fri, 3 Feb 2023 14:35:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675434932; bh=591cCBZ+PsEVXsKpjn0NOJi6MWraP0qqr2cYXmxSpYw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=oA+IlZSUQ7ppuaUpOeX6yVRxJgsyonYX3RIlBZvC+MfnI2SvZlx1eCvmp9jCio614 YDRIHOtwbhxGJX1Eztr3rfn8/1BwT5F5DoYSNRFbGGTAgokcqrmQ2vCieA6QeVaMw1 81vSyt7YwUtEVPA9rv5ldkS6GnSsbHAU49WJE4Yh0r9LUN5jU5SdLITjc2XpF10YJU 3i78nR0H4oHA1uE7CNT/wTE6MVNSIM9tEaJ+xq+TrPnRUhDw1um+pz/a2fqaus2N0r ArvI+Hu//fVzBIN6yrBWOfM5nVsxKUxFhVof59fPfacLmr9HLQemIfKtrsNsxWFmQ8 2YPAJKViqtDKg== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 09108405BE; Fri, 3 Feb 2023 11:35:29 -0300 (-03) Date: Fri, 3 Feb 2023 11:35:28 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Subject: Re: [PATCH v1] perf pmu: Fix aarch64 build Message-ID: References: <20230203014014.75720-1-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Url: http://acmel.wordpress.com X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Kang Minchul , Sandipan Das , Peter Zijlstra , Perry Taylor , Stephane Eranian , linux-kernel@vger.kernel.org, James Clark , Kim Phillips , Will Deacon , Kan Liang , Rob Herring , Alexander Shishkin , Ingo Molnar , Xing Zhengjun , Mike Leach , John Garry , Kajol Jain , Namhyung Kim , Caleb Biggers , linux-arm-kernel@lists.infradead.org, Ravi Bangoria , Florian Fischer , Adrian Hunter , linux-perf-users@vger.kernel.org, Jiri Olsa , Leo Yan , linuxppc-dev@lists.ozlabs.org, Jing Zhang Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Em Fri, Feb 03, 2023 at 11:17:38AM -0300, Arnaldo Carvalho de Melo escreveu: > Em Thu, Feb 02, 2023 at 05:41:22PM -0800, Ian Rogers escreveu: > > On Thu, Feb 2, 2023 at 5:40 PM Ian Rogers wrote: > > > > > > ARM64 overrides a weak function but a previous change had broken the > > > build. > > > > > > Fixes: 8cefeb8bd336 ("perf pmu-events: Introduce pmu_metrics_table") > > > > As 8cefeb8bd336 ("perf pmu-events: Introduce pmu_metrics_table") is > > only on tmp.perf/core then it may be best to just squash this fix into > > that. > > Yeah, that was my intention, I'll fold it there to keep bisection, > thanks for fixing it so fast, I'll double check on my rk3399 board and > on again on the cross-build container. Nope, that is not what I reported yesterday, trying to build it on the rk3399 board: acme@roc-rk3399-pc:~/git/perf$ cat /etc/os-release PRETTY_NAME="Ubuntu 22.04.1 LTS" NAME="Ubuntu" VERSION_ID="22.04" VERSION="22.04.1 LTS (Jammy Jellyfish)" VERSION_CODENAME=jammy ID=ubuntu ID_LIKE=debian HOME_URL="https://www.ubuntu.com/" SUPPORT_URL="https://help.ubuntu.com/" BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/" PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy" UBUNTU_CODENAME=jammy acme@roc-rk3399-pc:~/git/perf$ CC /tmp/build/perf/arch/arm64/util/pmu.o CC /tmp/build/perf/bench/epoll-wait.o arch/arm64/util/pmu.c: In function ‘pmu__find_core_pmu’: arch/arm64/util/pmu.c:27:33: error: declaration of ‘pmu_metrics_table__find’ shadows a global declaration [-Werror=shadow] 27 | const struct pmu_metrics_table *pmu_metrics_table__find(void) | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from arch/arm64/util/pmu.c:5: arch/arm64/util/../../../util/pmu.h:234:33: note: shadowed declaration is here 234 | const struct pmu_metrics_table *pmu_metrics_table__find(void); | ^~~~~~~~~~~~~~~~~~~~~~~ arch/arm64/util/pmu.c: In function ‘pmu_metrics_table__find’: arch/arm64/util/pmu.c:29:26: error: declaration of ‘pmu’ shadows a previous local [-Werror=shadow] 29 | struct perf_pmu *pmu = pmu__find_core_pmu(); | ^~~ arch/arm64/util/pmu.c:11:26: note: shadowed declaration is here 11 | struct perf_pmu *pmu = NULL; | ^~~ arch/arm64/util/pmu.c: In function ‘pmu__find_core_pmu’: arch/arm64/util/pmu.c:27:1: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] 27 | const struct pmu_metrics_table *pmu_metrics_table__find(void) | ^~~~~ arch/arm64/util/pmu.c:37:32: error: declaration of ‘pmu_events_table__find’ shadows a global declaration [-Werror=shadow] 37 | const struct pmu_events_table *pmu_events_table__find(void) | ^~~~~~~~~~~~~~~~~~~~~~ In file included from arch/arm64/util/pmu.c:5: arch/arm64/util/../../../util/pmu.h:233:32: note: shadowed declaration is here 233 | const struct pmu_events_table *pmu_events_table__find(void); | ^~~~~~~~~~~~~~~~~~~~~~ arch/arm64/util/pmu.c: In function ‘pmu_events_table__find’: arch/arm64/util/pmu.c:39:26: error: declaration of ‘pmu’ shadows a previous local [-Werror=shadow] 39 | struct perf_pmu *pmu = pmu__find_core_pmu(); | ^~~ arch/arm64/util/pmu.c:11:26: note: shadowed declaration is here 11 | struct perf_pmu *pmu = NULL; | ^~~ arch/arm64/util/pmu.c: In function ‘pmu__find_core_pmu’: arch/arm64/util/pmu.c:47:8: error: declaration of ‘perf_pmu__cpu_slots_per_cycle’ shadows a global declaration [-Werror=shadow] 47 | double perf_pmu__cpu_slots_per_cycle(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from arch/arm64/util/pmu.c:5: arch/arm64/util/../../../util/pmu.h:255:8: note: shadowed declaration is here 255 | double perf_pmu__cpu_slots_per_cycle(void); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/arm64/util/pmu.c: In function ‘perf_pmu__cpu_slots_per_cycle’: arch/arm64/util/pmu.c:51:26: error: declaration of ‘pmu’ shadows a previous local [-Werror=shadow] 51 | struct perf_pmu *pmu = pmu__find_core_pmu(); | ^~~ arch/arm64/util/pmu.c:11:26: note: shadowed declaration is here 11 | struct perf_pmu *pmu = NULL; | ^~~ arch/arm64/util/pmu.c: In function ‘pmu__find_core_pmu’: arch/arm64/util/pmu.c:64:1: error: expected declaration or statement at end of input 64 | } | ^ At top level: arch/arm64/util/pmu.c:47:8: error: ‘perf_pmu__cpu_slots_per_cycle’ defined but not used [-Werror=unused-function] 47 | double perf_pmu__cpu_slots_per_cycle(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/arm64/util/pmu.c:37:32: error: ‘pmu_events_table__find’ defined but not used [-Werror=unused-function] 37 | const struct pmu_events_table *pmu_events_table__find(void) | ^~~~~~~~~~~~~~~~~~~~~~ arch/arm64/util/pmu.c:27:33: error: ‘pmu_metrics_table__find’ defined but not used [-Werror=unused-function] 27 | const struct pmu_metrics_table *pmu_metrics_table__find(void) | ^~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[6]: *** [/home/acme/git/perf/tools/build/Makefile.build:98: /tmp/build/perf/arch/arm64/util/pmu.o] Error 1 make[5]: *** [/home/acme/git/perf/tools/build/Makefile.build:140: util] Error 2 make[4]: *** [/home/acme/git/perf/tools/build/Makefile.build:140: arm64] Error 2 make[3]: *** [/home/acme/git/perf/tools/build/Makefile.build:140: arch] Error 2 make[3]: *** Waiting for unfinished jobs....