From patchwork Mon Apr 11 09:47:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 12808866 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 87702C433F5 for ; Mon, 11 Apr 2022 09:54:46 +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: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GkbPbXpV2ahv2+1azrhHCg6hHU5ltWdLRyhq/fuETuo=; b=IMfZ1Q0Eit7GoT oAEprdUZzQYSDr6Uk5oKGnSZ12ITjXAdLXg7LUmyWbwVw2sJQhCUPXFSnfGdu53WbM3fUtd5OlP2q e2Rw899OQ+JFN9sVIvoYdIN0RerCkRiHnkkS9U/T+if/JSlCaPnI+yEjBtCs1LuoN5zBOun5d+2Qj x1vlehUwhRZub+jPhUbL49f7xN+Rj/a3YC3/BH/ldp3wUvlq1tg1ib3vy/+iZ4nkmmqgXhSMAiL85 wvrpOT8f8gRzbXmhysxAWHcrVJpMnXHxiXh2GY7wd0u5ps5cj7wvS/3FTgwqRlL/WrtkifxKL02zI Bkh3kC7DkvtpcLTizWug==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndqjp-0084lb-BO; Mon, 11 Apr 2022 09:53:37 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndqfA-00826Y-68 for linux-arm-kernel@lists.infradead.org; Mon, 11 Apr 2022 09:48:50 +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 ams.source.kernel.org (Postfix) with ESMTPS id 8AE19B8119B; Mon, 11 Apr 2022 09:48:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44832C385AC; Mon, 11 Apr 2022 09:48:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649670525; bh=ezCtD03gd+BlFVjzy1QZJINfQRhaZrdS2CGkPF2JN04=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Swr4L8aw2q7WvLiJoLiAkEZaHhLBYqt0vRR5dn20oEUaJvfDcqV3qABGxWOUlVWLn 2THuserZMB+453QpIUea9WhdYc0TWvuGR+fi7Rov81n/v9rHUs9NH2T3Opqq9nSnF/ hw7q7p0TmwBrwF7HdHKfcqf53VPHnp9lhhUVxYT1X3prrB5qbsL2r1PqSZPA/Rh9bH 2gt4wSODIKYh+WsXnl/TbR8J25aRTdvPj/9mS+mwKrh7u4bBIyJwNuyIdD5UTSFcxu FRMMiZ2u7Go3sR3lT7UmGvPWF0MIHC9Yet7pUucyj3+LwKBfFlfFXRJAgdXZqQhulz jANstbO4phxfw== From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: linux-efi@vger.kernel.org, Ard Biesheuvel , Marc Zyngier , Will Deacon , Mark Rutland , Kees Cook , Catalin Marinas , Mark Brown Subject: [PATCH v3 01/30] arm64: head: move kimage_vaddr variable into C file Date: Mon, 11 Apr 2022 11:47:55 +0200 Message-Id: <20220411094824.4176877-2-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220411094824.4176877-1-ardb@kernel.org> References: <20220411094824.4176877-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1306; h=from:subject; bh=ezCtD03gd+BlFVjzy1QZJINfQRhaZrdS2CGkPF2JN04=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBiU/k3RkoJrVyON20j4c7YANGKSScRaBHFmhZh4GNE SPoopYiJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYlP5NwAKCRDDTyI5ktmPJKQoC/ 91KwS5lG9U/akIcV36XJFSdhXEY3tbQwETKNegGIlEdbDuV2/e3DXLGJn4m8R0OpiivSIWe11WBnKH qJUhlZLOHTGBsb5IUKV5Ce6AdApDqNTKWU1P85VGMZDqjVdxsP2dydlcBzEhPzJWy/wgFztlSrXBlF g78wn739mxYMsza3x8vBM12oi4Sm0zmRiQImb6RBLZSfAWoi8TvXBUxu73WGG+pfsn5VfO+v1KIBlR 9z9S5dFTvYTZ8mPTKoF65v0ryopZubEcB95X3sfnEPg/zqtykkhy3wmUna0HDc0lUvUJDrDf6R0PZQ i70+EFosBspwKvkag/NzVzi5aldslvrY2GBkyaECdNO6a5QbFbAHVKwKrY9HKD2C1PCz3GCJFlnb9s wn3oye/Tl6EpD4+HMUiPaz/z3WNuRegqtENo92rxWYZr9/S4iK+ETOFsPzGhymZndCZCeIIvV3NfG4 4w7OrcJVVacPSvcyUCnX79zjWoXYR9gaVqCHrCb8FC4hs= X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220411_024848_460393_B6EDAEBF X-CRM114-Status: GOOD ( 12.54 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This variable definition does not need to be in head.S so move it out. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/head.S | 7 ------- arch/arm64/mm/mmu.c | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 6a98f1a38c29..1cdecce552bb 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -469,13 +469,6 @@ SYM_FUNC_START_LOCAL(__primary_switched) ASM_BUG() SYM_FUNC_END(__primary_switched) - .pushsection ".rodata", "a" -SYM_DATA_START(kimage_vaddr) - .quad _text -SYM_DATA_END(kimage_vaddr) -EXPORT_SYMBOL(kimage_vaddr) - .popsection - /* * end early head section, begin head code that is also used for * hotplug and needs to have the same protections as the text region diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 626ec32873c6..fde2b326419a 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -49,6 +49,9 @@ u64 idmap_ptrs_per_pgd = PTRS_PER_PGD; u64 __section(".mmuoff.data.write") vabits_actual; EXPORT_SYMBOL(vabits_actual); +u64 kimage_vaddr __ro_after_init = (u64)&_text; +EXPORT_SYMBOL(kimage_vaddr); + u64 kimage_voffset __ro_after_init; EXPORT_SYMBOL(kimage_voffset);