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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 9A989C433DB for ; Tue, 2 Feb 2021 20:31:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 53F3364E3F for ; Tue, 2 Feb 2021 20:31:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231354AbhBBUbX (ORCPT ); Tue, 2 Feb 2021 15:31:23 -0500 Received: from ozlabs.org ([203.11.71.1]:34115 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232292AbhBBUaY (ORCPT ); Tue, 2 Feb 2021 15:30:24 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4DVbyX1kT8z9tlG; Wed, 3 Feb 2021 07:29:39 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1612297781; bh=c7crrQEODf2qbx/knCVkXS1+eHCfuTc2GtRcGMFLPa8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=QlbartB2Z29fbdFcfsFkde64ZHvi8MDRLScImSH8Swif6sXJL0Mdw1D2K3Xkql5qb fGMO6ZsB9auQBMlATX+o5LJ0F3lQ0BbEZrVc7SfdWs3ZhVp7G/V44rhKttEP8Sc9YN /f1FxTdQkSt13gVto/TJhtwHnlVTe4aRgTqi5jcIRIs/yHrCvmc+fpN7Z2DrLtOD8N 3rQ9MdZK6kpnLwJ6CDOIDdScCZ6B+xttpOJdL9Y64Q6jafzRvWcLq9Cy7dZqxz1156 1EQhIUiWhJ6Bw0LneFU1e9u1CC5Gz0zFd5f+Dkj0yfd5VbqtuhgxSptqUamLxnVI4l cBTiLQPEmhsVA== Date: Wed, 3 Feb 2021 07:29:38 +1100 From: Stephen Rothwell To: Andrey Konovalov Cc: Anders Roxell , Andrew Morton , Linux-Next Mailing List , lkft-triage@lists.linaro.org, Catalin Marinas , Will Deacon , Linux ARM Subject: Re: arch/arm64/kernel/mte.c:121:15: error: 'mte_enable_kernel_sync' undeclared here (not in a function); did you mean 'mte_enable_kernel'? Message-ID: <20210203072938.62be70f5@canb.auug.org.au> In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/zxCl9viMoN_X5j/RVEP/jkr"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/zxCl9viMoN_X5j/RVEP/jkr Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Tue, 2 Feb 2021 14:46:24 +0100 Andrey Konovalov = wrote: > > On Tue, Feb 2, 2021 at 11:09 AM Anders Roxell = wrote: > > > > I've seen this failure on tag next-20210202: > > arch/arm64/kernel/mte.c:121:15: error: 'mte_enable_kernel_sync' > > undeclared here (not in a function); did you mean 'mte_enable_kernel'? > > > > I think it may be a merge conflict that didn't get resolved correctly? = =20 >=20 > Yes, that patch was supposed to go on top of another one (which > actually renames mte_enable_kernel to mte_enable_kernel_sync), but the > latter wasn't picked up into mm. >=20 > > The below change fixed the issue: > > > > diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c > > index 275b5d0f38b8..8f5bd1293496 100644 > > --- a/arch/arm64/kernel/mte.c > > +++ b/arch/arm64/kernel/mte.c > > @@ -118,7 +118,7 @@ void mte_set_report_once(bool state) > > { > > WRITE_ONCE(report_fault_once, state); > > } > > -EXPORT_SYMBOL(mte_enable_kernel_sync); > > +EXPORT_SYMBOL(mte_enable_kernel); > > EXPORT_SYMBOL(mte_set_report_once); > > > > bool mte_report_once(void) =20 >=20 > The changed export also needs to be moved next to mte_enable_kernel(). >=20 > Thanks! I have applied the following to linux-next today: From: Stephen Rothwell Date: Wed, 3 Feb 2021 07:22:35 +1100 Subject: [PATCH] arm64-kasan-export-mte-symbols-for-kasan-tests-fix Signed-off-by: Stephen Rothwell --- arch/arm64/kernel/mte.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index 275b5d0f38b8..8c7e32054172 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -113,12 +113,12 @@ void mte_enable_kernel(void) sysreg_clear_set(sctlr_el1, SCTLR_ELx_TCF_MASK, SCTLR_ELx_TCF_SYNC); isb(); } +EXPORT_SYMBOL(mte_enable_kernel); =20 void mte_set_report_once(bool state) { WRITE_ONCE(report_fault_once, state); } -EXPORT_SYMBOL(mte_enable_kernel_sync); EXPORT_SYMBOL(mte_set_report_once); =20 bool mte_report_once(void) --=20 2.30.0 --=20 Cheers, Stephen Rothwell --Sig_/zxCl9viMoN_X5j/RVEP/jkr Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAZtjIACgkQAVBC80lX 0Gxj9ggAko0IF9Ur0pUQN+pZWvqEnnJh583lS9rGICT3O3GtavRhSN+GShlKJ+3P 3nVZ/pE88hRTehjcjGDGvwUupPeDQ6m2GX+zYefOeW7RmbKJqvVOuAqvAkuy13vw K38pOjaEraT/fK/GyK2Y1a4gF9Sgxzb/Cpoj8pXYaPlithIUSh3ZC2VWDrF5tyCq c36gVhLoFtWYhGboiatclIhR+jGkSlbZtMvA2P8qWjBjcZQK1DMYWNBmI9hkV1jk jVBXn+uVfs4g0FttugD6kzP7ztxjiFiAJ94EfMFwGYmYqhbJJCJrxMfT10D74S51 FkU5MGhn4vJzPrdNBXLPXMEzFW3Y/A== =n402 -----END PGP SIGNATURE----- --Sig_/zxCl9viMoN_X5j/RVEP/jkr-- 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=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 6F375C433DB for ; Tue, 2 Feb 2021 20:31:25 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2011264D90 for ; Tue, 2 Feb 2021 20:31:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2011264D90 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:References:In-Reply-To:Message-ID:Subject:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pt6e3Tbcwl8OWuGF4mZzNVHvHQloNaSYmpO9pRUTBYQ=; b=TgrKzLa0LkdgpmZeCZDIfMpvY MdxvDUPCi4Ehx6Rh6yF1bbHVM90rIcRKvCPvNjZvJpIOuoJrtvw+DA4NBrs+1DajKKsUjAKa5B0TW 1nIQ60pssaQIm7VcFCIGxKOJ5bgyyIDAqByx/SCe3mNOP9SPry6QAiBv/nFGbfnmV1kk4QTCSNqII I6k5873AL0OtEZhpC4liY+IxHdjXbkTTvLx3EwTZV+DN6xfnPzZuPEmGB2/SFhRt6RpXOmjqmemQI SRzjBIk6abN00AY2IBYoDIQ4MGnMdesjhHRVowFXYOgbZQfqBIQzj2xFTw1IKnrEkic+RbBsSya82 WSFDFSiJw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l72J3-0007oC-G2; Tue, 02 Feb 2021 20:29:49 +0000 Received: from ozlabs.org ([2401:3900:2:1::2]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l72Iz-0007nL-1G for linux-arm-kernel@lists.infradead.org; Tue, 02 Feb 2021 20:29:47 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4DVbyX1kT8z9tlG; Wed, 3 Feb 2021 07:29:39 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1612297781; bh=c7crrQEODf2qbx/knCVkXS1+eHCfuTc2GtRcGMFLPa8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=QlbartB2Z29fbdFcfsFkde64ZHvi8MDRLScImSH8Swif6sXJL0Mdw1D2K3Xkql5qb fGMO6ZsB9auQBMlATX+o5LJ0F3lQ0BbEZrVc7SfdWs3ZhVp7G/V44rhKttEP8Sc9YN /f1FxTdQkSt13gVto/TJhtwHnlVTe4aRgTqi5jcIRIs/yHrCvmc+fpN7Z2DrLtOD8N 3rQ9MdZK6kpnLwJ6CDOIDdScCZ6B+xttpOJdL9Y64Q6jafzRvWcLq9Cy7dZqxz1156 1EQhIUiWhJ6Bw0LneFU1e9u1CC5Gz0zFd5f+Dkj0yfd5VbqtuhgxSptqUamLxnVI4l cBTiLQPEmhsVA== Date: Wed, 3 Feb 2021 07:29:38 +1100 From: Stephen Rothwell To: Andrey Konovalov Subject: Re: arch/arm64/kernel/mte.c:121:15: error: 'mte_enable_kernel_sync' undeclared here (not in a function); did you mean 'mte_enable_kernel'? Message-ID: <20210203072938.62be70f5@canb.auug.org.au> In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210202_152946_526106_1574EE13 X-CRM114-Status: GOOD ( 26.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anders Roxell , Catalin Marinas , Will Deacon , lkft-triage@lists.linaro.org, Linux-Next Mailing List , Andrew Morton , Linux ARM Content-Type: multipart/mixed; boundary="===============5196710042864311892==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --===============5196710042864311892== Content-Type: multipart/signed; boundary="Sig_/zxCl9viMoN_X5j/RVEP/jkr"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/zxCl9viMoN_X5j/RVEP/jkr Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Tue, 2 Feb 2021 14:46:24 +0100 Andrey Konovalov = wrote: > > On Tue, Feb 2, 2021 at 11:09 AM Anders Roxell = wrote: > > > > I've seen this failure on tag next-20210202: > > arch/arm64/kernel/mte.c:121:15: error: 'mte_enable_kernel_sync' > > undeclared here (not in a function); did you mean 'mte_enable_kernel'? > > > > I think it may be a merge conflict that didn't get resolved correctly? = =20 >=20 > Yes, that patch was supposed to go on top of another one (which > actually renames mte_enable_kernel to mte_enable_kernel_sync), but the > latter wasn't picked up into mm. >=20 > > The below change fixed the issue: > > > > diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c > > index 275b5d0f38b8..8f5bd1293496 100644 > > --- a/arch/arm64/kernel/mte.c > > +++ b/arch/arm64/kernel/mte.c > > @@ -118,7 +118,7 @@ void mte_set_report_once(bool state) > > { > > WRITE_ONCE(report_fault_once, state); > > } > > -EXPORT_SYMBOL(mte_enable_kernel_sync); > > +EXPORT_SYMBOL(mte_enable_kernel); > > EXPORT_SYMBOL(mte_set_report_once); > > > > bool mte_report_once(void) =20 >=20 > The changed export also needs to be moved next to mte_enable_kernel(). >=20 > Thanks! I have applied the following to linux-next today: From: Stephen Rothwell Date: Wed, 3 Feb 2021 07:22:35 +1100 Subject: [PATCH] arm64-kasan-export-mte-symbols-for-kasan-tests-fix Signed-off-by: Stephen Rothwell --- arch/arm64/kernel/mte.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index 275b5d0f38b8..8c7e32054172 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -113,12 +113,12 @@ void mte_enable_kernel(void) sysreg_clear_set(sctlr_el1, SCTLR_ELx_TCF_MASK, SCTLR_ELx_TCF_SYNC); isb(); } +EXPORT_SYMBOL(mte_enable_kernel); =20 void mte_set_report_once(bool state) { WRITE_ONCE(report_fault_once, state); } -EXPORT_SYMBOL(mte_enable_kernel_sync); EXPORT_SYMBOL(mte_set_report_once); =20 bool mte_report_once(void) --=20 2.30.0 --=20 Cheers, Stephen Rothwell --Sig_/zxCl9viMoN_X5j/RVEP/jkr Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAZtjIACgkQAVBC80lX 0Gxj9ggAko0IF9Ur0pUQN+pZWvqEnnJh583lS9rGICT3O3GtavRhSN+GShlKJ+3P 3nVZ/pE88hRTehjcjGDGvwUupPeDQ6m2GX+zYefOeW7RmbKJqvVOuAqvAkuy13vw K38pOjaEraT/fK/GyK2Y1a4gF9Sgxzb/Cpoj8pXYaPlithIUSh3ZC2VWDrF5tyCq c36gVhLoFtWYhGboiatclIhR+jGkSlbZtMvA2P8qWjBjcZQK1DMYWNBmI9hkV1jk jVBXn+uVfs4g0FttugD6kzP7ztxjiFiAJ94EfMFwGYmYqhbJJCJrxMfT10D74S51 FkU5MGhn4vJzPrdNBXLPXMEzFW3Y/A== =n402 -----END PGP SIGNATURE----- --Sig_/zxCl9viMoN_X5j/RVEP/jkr-- --===============5196710042864311892== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --===============5196710042864311892==--