From patchwork Tue Aug 15 12:50:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 110154 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp5441408obb; Tue, 15 Aug 2017 05:55:03 -0700 (PDT) X-Received: by 10.98.82.197 with SMTP id g188mr28560793pfb.34.1502801703674; Tue, 15 Aug 2017 05:55:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502801703; cv=none; d=google.com; s=arc-20160816; b=0JpNxSEOocr2zFw/tXTBaF7ed4qLRd75KAebE1w6kAmk0Sp7E1l7GLi94RmwUkAkmy MoyGDlMz3CRelarmB1N28ktarg54sDleyHd3daMBIwreYbpAr0sE+rWMAJ1JOGh1fsO2 RdBy7uk2dzDNat4VlRFHvySrMnCfTjzO1Ml9G5tyTciMsj6TasUbh1H4KHIVxNRR1FiK ijaFJEX3G8jVDLNpnmBhZt6fDF1jpYPPPWW5D63nE64w/VWeuRPkIUwEiCg1CsNILZld tvs2Ksx/SIG+oVPrc6xJs+OYp7fSvyVLpoQtW7RfMtWPsKlvMD3fr6+P2fdqjtta6PRp xzWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=f4W+MVt+MWmgN7H5Ph3KbbnDHwzDRKdW0Fw6JePBmSc=; b=L76MY4Wkd+iC3MxrA7fgPfDRICWI0oFlhNHqWqiDGwGbKMCFTbC1JKR3VqWhKWwNAT H8pNSSO/51m15h0zqdvxUC5Wp0EWvguCkPpJL9hlc6fSRndh4l099oM8yzXZ2wPIIdzW MGKbOSPBIi7542pYmU4twpjm/4z4rw4fuRBMjQ6jAPnEzfhRCqBIV58HsBCEgq1GEhIk VhbmbFw0uI9+RmfKZyBqxmzFpimRcRmKcA/SCsBD50Dk3mFBOqtjQN1GgRivHE07tl5r UnRmNtkGoVrYnunKPReV3nhmhvWfPE6DnfJKGCCdY8FE1pDgS+tLrGPzC+w5Ljz4rnWG fz1g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i64si5469001pfj.648.2017.08.15.05.55.03; Tue, 15 Aug 2017 05:55:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752788AbdHOMw5 (ORCPT + 25 others); Tue, 15 Aug 2017 08:52:57 -0400 Received: from foss.arm.com ([217.140.101.70]:51528 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752769AbdHOMwy (ORCPT ); Tue, 15 Aug 2017 08:52:54 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4A6E6168F; Tue, 15 Aug 2017 05:52:54 -0700 (PDT) Received: from leverpostej.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2F1DC3F540; Tue, 15 Aug 2017 05:52:52 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Cc: ard.biesheuvel@linaro.org, catalin.marinas@arm.com, james.morse@arm.com, labbott@redhat.com, linux-kernel@vger.kernel.org, luto@amacapital.net, mark.rutland@arm.com, matt@codeblueprint.co.uk, will.deacon@arm.com, kernel-hardening@lists.openwall.com, keescook@chromium.org Subject: [PATCHv2 08/14] efi/arm64: add EFI_KIMG_ALIGN Date: Tue, 15 Aug 2017 13:50:43 +0100 Message-Id: <1502801449-29246-9-git-send-email-mark.rutland@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1502801449-29246-1-git-send-email-mark.rutland@arm.com> References: <1502801449-29246-1-git-send-email-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The EFI stub is intimately coupled with the kernel, and takes advantage of this by relocating the kernel at a weaker alignment than the documented boot protocol mandates. However, it does so by assuming it can align the kernel to the segment alignment, and assumes that this is 64K. In subsequent patches, we'll have to consider other details to determine this de-facto alignment constraint. This patch adds a new EFI_KIMG_ALIGN definition that will track the kernel's de-facto alignment requirements. Subsequent patches will modify this as required. Signed-off-by: Mark Rutland Cc: Ard Biesheuvel Cc: Catalin Marinas Cc: James Morse Cc: Laura Abbott Cc: Matt Fleming Cc: Will Deacon --- arch/arm64/include/asm/efi.h | 3 +++ drivers/firmware/efi/libstub/arm64-stub.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) -- 1.9.1 diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index 8f3043a..0e8cc3b 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -48,6 +49,8 @@ */ #define EFI_FDT_ALIGN SZ_2M /* used by allocate_new_fdt_and_exit_boot() */ +#define EFI_KIMG_ALIGN SEGMENT_ALIGN + /* on arm64, the FDT may be located anywhere in system RAM */ static inline unsigned long efi_get_max_fdt_addr(unsigned long dram_base) { diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c index b4c2589..af6ae95 100644 --- a/drivers/firmware/efi/libstub/arm64-stub.c +++ b/drivers/firmware/efi/libstub/arm64-stub.c @@ -11,6 +11,7 @@ */ #include #include +#include #include #include @@ -81,9 +82,10 @@ efi_status_t handle_kernel_image(efi_system_table_t *sys_table_arg, /* * If CONFIG_DEBUG_ALIGN_RODATA is not set, produce a * displacement in the interval [0, MIN_KIMG_ALIGN) that - * is a multiple of the minimal segment alignment (SZ_64K) + * doesn't violate this kernel's de-facto alignment + * constraints. */ - u32 mask = (MIN_KIMG_ALIGN - 1) & ~(SZ_64K - 1); + u32 mask = (MIN_KIMG_ALIGN - 1) & ~(EFI_KIMG_ALIGN - 1); u32 offset = !IS_ENABLED(CONFIG_DEBUG_ALIGN_RODATA) ? (phys_seed >> 32) & mask : TEXT_OFFSET;