From patchwork Wed May 6 08:19:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 206358 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.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 80724C28CBC for ; Wed, 6 May 2020 08:19:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B3E220838 for ; Wed, 6 May 2020 08:19:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588753197; bh=jMKvMvx/VZsgPraeKZL5gLbLDRd1V7waMyF7WN//z/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mmKx4SB5KfwQKQdKHWT/2gYT9UxScPLqTr20BOMFsYjR28Wboka3jvnrqBszeO4+V tjp1nizW4T3sgRRj6wfr/ajpa6ABJKYWdwtv75K8M3Y421zQyOpoURsLjbPT3pUmH+ /qMtRkh+MrWZif/CLQKCnV7hZX+2wH53Q2hRlU6A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728840AbgEFIT4 (ORCPT ); Wed, 6 May 2020 04:19:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:51636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728871AbgEFITz (ORCPT ); Wed, 6 May 2020 04:19:55 -0400 Received: from e123331-lin.nice.arm.com (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr [109.210.65.247]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 296682082E; Wed, 6 May 2020 08:19:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588753195; bh=jMKvMvx/VZsgPraeKZL5gLbLDRd1V7waMyF7WN//z/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ee69Wl73rUNQwCerRlx6AVptbNrVfSlow/9UFoITrM2kDwIHVazAoLwqK0F5nGWS6 AqLbgGdrPxbR8frFnezAVLB23TvXDGNhLxm2VnXWAbTAyoRNAUDkLfOjsLf2dW6u0g 5a1lFjOZuk6RLqS5RSlSWANt/Ok3jbFED6ZvwLZM= From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Geert Uytterhoeven , Nicolas Pitre , Linus Walleij , Russell King , Heinrich Schuchardt Subject: [PATCH v3 2/5] ARM: decompressor: split off _edata and stack base into separate object Date: Wed, 6 May 2020 10:19:36 +0200 Message-Id: <20200506081939.8986-3-ardb@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200506081939.8986-1-ardb@kernel.org> References: <20200506081939.8986-1-ardb@kernel.org> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org In preparation of moving the handling of the LC0 object to a later stage in the decompressor startup code, move out _edata and the initial value of the stack pointer, which are now used in two places, and are needed earlier than the remaining contents of LC0. Signed-off-by: Ard Biesheuvel Reviewed-by: Geert Uytterhoeven Reviewed-by: Nicolas Pitre --- arch/arm/boot/compressed/head.S | 35 ++++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index bb674febf640..449457d00c4e 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -259,19 +259,17 @@ not_angel: * Find the start of physical memory. * Try the DTB first, if available. */ - adr r0, LC0 - ldr r1, [r0] @ get absolute LC0 - ldr sp, [r0, #24] @ get stack location - sub r1, r0, r1 @ compute relocation offset - add sp, sp, r1 @ apply relocation + adr r0, LC1 + ldr sp, [r0] @ get stack location + add sp, sp, r0 @ apply relocation #ifdef CONFIG_ARM_APPENDED_DTB /* * Look for an appended DTB. If found, use it and * move stack away from it. */ - ldr r6, [r0, #12] @ get &_edata - add r6, r6, r1 @ relocate it + ldr r6, [r0, #4] @ get &_edata + add r6, r6, r0 @ relocate it ldmia r6, {r0, r5} @ get DTB signature and size #ifndef __ARMEB__ ldr r1, =0xedfe0dd0 @ sig is 0xd00dfeed big endian @@ -345,22 +343,20 @@ not_angel: orrcc r4, r4, #1 @ remember we skipped cache_on blcs cache_on -restart: adr r0, LC0 - ldmia r0, {r1, r2, r3, r6, r11, r12} - ldr sp, [r0, #24] +restart: adr r0, LC1 + ldr sp, [r0] + ldr r6, [r0, #4] + add sp, sp, r0 + add r6, r6, r0 - /* - * We might be running at a different address. We need - * to fix up various pointers. - */ + adr r0, LC0 + ldmia r0, {r1, r2, r3, r11, r12} sub r0, r0, r1 @ calculate the delta offset - add r6, r6, r0 @ _edata get_inflated_image_size r9, r10, lr #ifndef CONFIG_ZBOOT_ROM /* malloc space is above the relocated stack (64k max) */ - add sp, sp, r0 add r10, sp, #0x10000 #else /* @@ -712,12 +708,15 @@ not_relocated: mov r0, #0 LC0: .word LC0 @ r1 .word __bss_start @ r2 .word _end @ r3 - .word _edata @ r6 .word _got_start @ r11 .word _got_end @ ip - .word .L_user_stack_end @ sp .size LC0, . - LC0 + .type LC1, #object +LC1: .word .L_user_stack_end - LC1 @ sp + .word _edata - LC1 @ r6 + .size LC1, . - LC1 + .Lheadroom: .word _end - restart + 16384 + 1024*1024 From patchwork Wed May 6 08:19:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 206357 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.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 79276C47258 for ; Wed, 6 May 2020 08:20:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4F4DC20714 for ; Wed, 6 May 2020 08:20:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588753202; bh=s8227r3wr+M1LR2ra2WRSSL45hZ8JOxmjLKJcXVBONI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=z1BnU6mgWdUFfEDDbmDgVeX1yEjv3gn2WYSTzDt2loGFNsfQXawC5rmCXFH7soNuE WrYVw/XP95ue87Rh3gz4pHUq+sZlaYxwK/A0o5R5mog7bH9tcLPBbgJN0K4xkXTUNC Ig9xPgP9/MAvj5OQQBjFhWVtYSE0DICSnW96QEtg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728678AbgEFIUB (ORCPT ); Wed, 6 May 2020 04:20:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:51930 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728398AbgEFIUA (ORCPT ); Wed, 6 May 2020 04:20:00 -0400 Received: from e123331-lin.nice.arm.com (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr [109.210.65.247]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 12A2F207DD; Wed, 6 May 2020 08:19:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588753200; bh=s8227r3wr+M1LR2ra2WRSSL45hZ8JOxmjLKJcXVBONI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h2xi8hwK1/gE7lQNUJRajm7OJOpRAZ4Ex4VugdP6ljnBn3B9u8jnRa9G3ZpSXs6lh FGggTfXmnXdse38q0IPNv3vz584+CRWEHgZxdIuZm694tMcmkxq/cGjWtb1WEQohOM 5QaQ8R5WjE0VYX0/F6ZEWxSTKduJhEPr7ATLw0aE= From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Geert Uytterhoeven , Nicolas Pitre , Linus Walleij , Russell King , Heinrich Schuchardt Subject: [PATCH v3 4/5] ARM: decompressor: move GOT into .data for EFI enabled builds Date: Wed, 6 May 2020 10:19:38 +0200 Message-Id: <20200506081939.8986-5-ardb@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200506081939.8986-1-ardb@kernel.org> References: <20200506081939.8986-1-ardb@kernel.org> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org We will be running the decompressor in place after a future patch, instead of copying it around first. This means we no longer have to disable and re-enable the MMU and caches either. However, this means we will be loaded with the restricted permissions set by the UEFI firmware, which means that we have to move the GOT table into the data section in order for the contents to be writable by the code itself. Signed-off-by: Ard Biesheuvel Reviewed-by: Nicolas Pitre --- arch/arm/boot/compressed/vmlinux.lds.S | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/compressed/vmlinux.lds.S b/arch/arm/boot/compressed/vmlinux.lds.S index b247f399de71..d0619ec05705 100644 --- a/arch/arm/boot/compressed/vmlinux.lds.S +++ b/arch/arm/boot/compressed/vmlinux.lds.S @@ -63,9 +63,11 @@ SECTIONS _etext = .; .got.plt : { *(.got.plt) } +#ifndef CONFIG_EFI_STUB _got_start = .; .got : { *(.got) } _got_end = .; +#endif /* ensure the zImage file size is always a multiple of 64 bits */ /* (without a dummy byte, ld just ignores the empty section) */ @@ -74,6 +76,9 @@ SECTIONS #ifdef CONFIG_EFI_STUB .data : ALIGN(4096) { __pecoff_data_start = .; + _got_start = .; + *(.got) + _got_end = .; /* * The EFI stub always executes from RAM, and runs strictly before the * decompressor, so we can make an exception for its r/w data, and keep it