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 04494C43217 for ; Thu, 1 Dec 2022 10:38:09 +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:MIME-Version:References:In-Reply-To: Subject:Cc:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=O0gB+DG787iboQEw3lEnI3qOHJmR72QbfhFav+JfFbY=; b=DFAGofXUh5JJk/ IAUc9khlmW+LmHonrD6Z8Gg9zXz/DtoJL7+kIbKVOTrIJ31J9OOD/VgRgczaGk6ZP864ADxksBeAq q6X/r6lkSk5IO+4Txenc0l6nzpqd2NdIO0ajsLGru6x6VLCNQjy/Lgbr3pKLEcYbfPV+H1LY03gis P0dUkSxsOerelBb0Ecb94+yz3OOOJiJifhPhljKPJisGSuQiXowTOcK13hLSKMjS0aGvABqrmRjqm ar5puJVrjKvZZ4aAJ3o2ATEexaad+j5WqZhSoTDNI43aGlA0ZX6M5VjfuuD03FFe8IHoOrlNg6TsT ja7AFup6JKwO3QrgdZ/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p0gw6-006lsB-8O; Thu, 01 Dec 2022 10:36:58 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p0gw2-006lqW-4R for linux-arm-kernel@lists.infradead.org; Thu, 01 Dec 2022 10:36:56 +0000 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 58FA761F62; Thu, 1 Dec 2022 10:36:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC406C433C1; Thu, 1 Dec 2022 10:36:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669891012; bh=Lry5sI7ZzVgzkzluRZ7tP0BZmk5tn6W5JjEgO6v8d8U=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=GeCMzXKWLqV+qaWBLMIdqSR+DgAjnUzEqdXmre1OuYeRFmK8zx4Wpr2oGVbW4wctN Mx7MfrwxigpiiLxVvbWyNZakFpJdLDxWz7kekpUmV4Tl/BBgjAVF7bT2uhw6Enk12c MTgbfiYpisQKgSQKERwTThfCHnKtuUxP7BXK0a4W/B4SiDxYpmpmk//tHuJYpdooxO +cuNOLb5Y66nxv09MJwMVU7kAwVZ3g/xfQXqRnBDgbNeGP5pAY668mpemkxpJMZPjI Wc3Qsu0VbV+MkE+attTv+CpXmkbCIIx01XYvTce8Eo/lVYcHGldRhDR00reIvHMJmt MLW3nSkrOodFw== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1p0gvy-009no0-7z; Thu, 01 Dec 2022 10:36:50 +0000 Date: Thu, 01 Dec 2022 10:36:49 +0000 Message-ID: <868rjrmmv2.wl-maz@kernel.org> From: Marc Zyngier To: Naresh Kamboju Cc: linux-stable , open list , lkft-triage@lists.linaro.org, Greg Kroah-Hartman , Guenter Roeck , Arnd Bergmann , Linux ARM , Will Deacon , Catalin Marinas Subject: Re: stable-rc-5.10: arm64: allmodconfig: (.hyp.text+0x1a4c): undefined reference to `__kvm_nvhe_memset' In-Reply-To: References: User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: naresh.kamboju@linaro.org, stable@vger.kernel.org, linux-kernel@vger.kernel.org, lkft-triage@lists.linaro.org, gregkh@linuxfoundation.org, linux@roeck-us.net, arnd@arndb.de, linux-arm-kernel@lists.infradead.org, will@kernel.org, catalin.marinas@arm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221201_023654_288531_1B039632 X-CRM114-Status: GOOD ( 21.22 ) 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="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, 01 Dec 2022 09:39:57 +0000, Naresh Kamboju wrote: > > [please ignore if it is already reported] > > The stable-rc 5.10 arm64 allmodconfig builds failed with gcc-12. > List of build warnings and errors with gcc-12 are listed below. > > aarch64-linux-gnu-ld: Unexpected GOT/PLT entries detected! > aarch64-linux-gnu-ld: Unexpected run-time procedure linkages detected! > aarch64-linux-gnu-ld: arch/arm64/kvm/hyp/nvhe/kvm_nvhe.o: in function > `__kvm_nvhe___kvm_tlb_flush_vmid_ipa': > (.hyp.text+0x1a4c): undefined reference to `__kvm_nvhe_memset' Stupid gcc. Can you try the following patch and check if this works for you? Thanks, M. >From 4e775885654bd667a519df5ca5aaf702ce438f5e Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Fri, 19 Mar 2021 10:01:10 +0000 Subject: [PATCH] KVM: arm64: Link position-independent string routines into .hyp.text Commit 7b4a7b5e6fefd15f708f959dd43e188444e252ec upstream. Pull clear_page(), copy_page(), memcpy() and memset() into the nVHE hyp code and ensure that we always execute the '__pi_' entry point on the offchance that it changes in future. [ qperret: Commit title nits and added linker script alias ] Signed-off-by: Will Deacon Signed-off-by: Quentin Perret Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20210319100146.1149909-3-qperret@google.com --- arch/arm64/include/asm/hyp_image.h | 3 +++ arch/arm64/kernel/image-vars.h | 11 +++++++++++ arch/arm64/kvm/hyp/nvhe/Makefile | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/arch/arm64/include/asm/hyp_image.h b/arch/arm64/include/asm/hyp_image.h index daa1a1da539e..e06842756051 100644 --- a/arch/arm64/include/asm/hyp_image.h +++ b/arch/arm64/include/asm/hyp_image.h @@ -31,6 +31,9 @@ */ #define KVM_NVHE_ALIAS(sym) kvm_nvhe_sym(sym) = sym; +/* Defines a linker script alias for KVM nVHE hyp symbols */ +#define KVM_NVHE_ALIAS_HYP(first, sec) kvm_nvhe_sym(first) = kvm_nvhe_sym(sec); + #endif /* LINKER_SCRIPT */ #endif /* __ARM64_HYP_IMAGE_H__ */ diff --git a/arch/arm64/kernel/image-vars.h b/arch/arm64/kernel/image-vars.h index c615b285ff5b..48e43b29a2d5 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -103,6 +103,17 @@ KVM_NVHE_ALIAS(gic_nonsecure_priorities); KVM_NVHE_ALIAS(__start___kvm_ex_table); KVM_NVHE_ALIAS(__stop___kvm_ex_table); +/* Position-independent library routines */ +KVM_NVHE_ALIAS_HYP(clear_page, __pi_clear_page); +KVM_NVHE_ALIAS_HYP(copy_page, __pi_copy_page); +KVM_NVHE_ALIAS_HYP(memcpy, __pi_memcpy); +KVM_NVHE_ALIAS_HYP(memset, __pi_memset); + +#ifdef CONFIG_KASAN +KVM_NVHE_ALIAS_HYP(__memcpy, __pi_memcpy); +KVM_NVHE_ALIAS_HYP(__memset, __pi_memset); +#endif + #endif /* CONFIG_KVM */ #endif /* __ARM64_KERNEL_IMAGE_VARS_H */ diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile index ddde15fe85f2..230bba1a6716 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -6,9 +6,13 @@ asflags-y := -D__KVM_NVHE_HYPERVISOR__ ccflags-y := -D__KVM_NVHE_HYPERVISOR__ +lib-objs := clear_page.o copy_page.o memcpy.o memset.o +lib-objs := $(addprefix ../../../lib/, $(lib-objs)) + obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o hyp-main.o obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \ ../fpsimd.o ../hyp-entry.o +obj-y += $(lib-objs) ## ## Build rules for compiling nVHE hyp code -- 2.34.1 -- Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel