From patchwork Wed Apr 25 06:35:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 134237 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp477587lji; Tue, 24 Apr 2018 23:35:37 -0700 (PDT) X-Google-Smtp-Source: AIpwx49T6jvwYVF+kknU2NeyrISWhh4RX2sidHiKd5vR4ul/b4jl6qW8moTkhADm3vr8rBV4Ykgi X-Received: by 10.98.214.5 with SMTP id r5mr18945273pfg.8.1524638136976; Tue, 24 Apr 2018 23:35:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524638136; cv=none; d=google.com; s=arc-20160816; b=M1mF2qqk6FxAvChyAOt9Uh6xE6UMq1xZWTQ0hhls/dAWGSBZVLZXmKdY3tqHMpELlM HWFU8j4lPIfh19ghfWJyu0WYXNkWmyUvmDNCh0y5tFhj/tMhxvTJ+lpiPl7s8WsKIuHy DK5crDMWbH/FhdAkoDOzmt9iK43Z3H0O+I3CXuWG7E/Hy6OuABeJHyIqU5EmiFBMPQ94 f7SsSpCAak7ig83lz1oR/Pffj2mYwbzxrgPyVWXJpORD3TL4j5K1LFlzNfQ90Q4RA/s2 aKBsxvleq2NbeYxeNoOpnrS1naKtDgHxGuvafol34gZFmOMoBpBuqq9kgKhrmkJupSp7 7qwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=p8uH+fmAFMFnF6qxiSTvqfhTmnNAGO6GGl8TcKsQrhU=; b=B6XFNfFxDS+bhbnh+HEUNLYPxM55ndpGp/KzVMWhq8H9dp9xOtHGk37IDLikCrRixk WqGX5Y06WukUH6NQKPhAjrT6ceaAwgg38c6cIfuPRW3pCfI2SpH2lkQ8dHoeI4FAbwzy bRYeOMXOJUwDcLgVgtvdrCFzqBvjbtsoscys6a+ywg7VYxRjHKEpnmMjrvWwrb20y8fW ksVPjWnOTJvm0u3PE8cPJDl0PtJ3Y2lRswC0PuBabZhGqVshkcfLRI2qS5sjicqMsxgo nMPuO+Uvr4ufMWPk1QNmQ6unK/c3oX7xUmZ+PmxrCxjJjFfSyPlP4SpQtu1SxL0zr4n9 YFgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Umn41biB; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h17si15294521pfj.178.2018.04.24.23.35.36; Tue, 24 Apr 2018 23:35:36 -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; dkim=pass header.i=@linaro.org header.s=google header.b=Umn41biB; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751473AbeDYGfe (ORCPT + 29 others); Wed, 25 Apr 2018 02:35:34 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:38341 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751064AbeDYGfb (ORCPT ); Wed, 25 Apr 2018 02:35:31 -0400 Received: by mail-pf0-f195.google.com with SMTP id o76so9619445pfi.5 for ; Tue, 24 Apr 2018 23:35:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=p8uH+fmAFMFnF6qxiSTvqfhTmnNAGO6GGl8TcKsQrhU=; b=Umn41biBIyN8jLjMZBlcoBPYFcwLDG7yTv5aI4+KyLtIW2MYVDZjng81vF/5ab1sT8 UVUiCPg9+2eSoaITaN8qq51l6WSWvoO8fopxRcbyzSucLrXm1w38b84HEmAmBY3LRe2z CyWVKL9P0o4ZiI/fcLqXMAIdUaWawirRzPtms= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=p8uH+fmAFMFnF6qxiSTvqfhTmnNAGO6GGl8TcKsQrhU=; b=roJy6TJBpwdhYmLTNrWD+tcjXd3gGt7Nbd0qYWBaQ6AEuKQ9aaKQ1kpoP/YXZj7RSM oZhDJzrbwfrHGa9yaE5885wXAQU4Fty6aNgTXIyH+TORD3CVHmtqqpd8RTyzxLPLuyLy ktw2VMXWRfAPHYi9ou5KYvQjbZ/rhulva+y3kBAikvxu6RrAEdxqwYZe15Avp0l8wVgx NXZjdHKF7BVQ7FCrzOYdavVjMe8rg545xJwnjPxHEkQYFR002xWJTwIrj65nbxCLqY9y GxVA5gJxdDb/AaSRd+DGGyDejSzGlAk3WY58P4dg1Kv7hLwJGkA5KliamRwkpQPEKRKU JBKw== X-Gm-Message-State: ALQs6tD15AuZ2vRtrB+hKV34wEpbyMX8A/FCd2qsMH8bKm8LtmHtreqh 2fQnuQ/ifLnwrOJQVJ2Jg9AhXw== X-Received: by 10.101.64.201 with SMTP id u9mr23065868pgp.142.1524638131296; Tue, 24 Apr 2018 23:35:31 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id x137sm29934035pfd.162.2018.04.24.23.35.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 23:35:30 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, ard.biesheuvel@linaro.org Cc: bhsharma@redhat.com, dyoung@redhat.com, james.morse@arm.com, al.stone@linaro.org, graeme.gregory@linaro.org, hanjun.guo@linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [RESEND PATCH] arm64: acpi, efi: fix alignment fault in accessing ACPI tables at kdump Date: Wed, 25 Apr 2018 15:35:27 +0900 Message-Id: <20180425063527.29763-1-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.17.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a fix against the issue that crash dump kernel may hang up during booting, which can happen on any ACPI-based system with "ACPI Reclaim Memory." (kernel messages after panic kicked off kdump) (snip...) Bye! (snip...) ACPI: Core revision 20170728 pud=000000002e7d0003, *pmd=000000002e7c0003, *pte=00e8000039710707 Internal error: Oops: 96000021 [#1] SMP Modules linked in: CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.14.0-rc6 #1 task: ffff000008d05180 task.stack: ffff000008cc0000 PC is at acpi_ns_lookup+0x25c/0x3c0 LR is at acpi_ds_load1_begin_op+0xa4/0x294 (snip...) Process swapper/0 (pid: 0, stack limit = 0xffff000008cc0000) Call trace: (snip...) [] acpi_ns_lookup+0x25c/0x3c0 [] acpi_ds_load1_begin_op+0xa4/0x294 [] acpi_ps_build_named_op+0xc4/0x198 [] acpi_ps_create_op+0x14c/0x270 [] acpi_ps_parse_loop+0x188/0x5c8 [] acpi_ps_parse_aml+0xb0/0x2b8 [] acpi_ns_one_complete_parse+0x144/0x184 [] acpi_ns_parse_table+0x48/0x68 [] acpi_ns_load_table+0x4c/0xdc [] acpi_tb_load_namespace+0xe4/0x264 [] acpi_load_tables+0x48/0xc0 [] acpi_early_init+0x9c/0xd0 [] start_kernel+0x3b4/0x43c Code: b9008fb9 2a000318 36380054 32190318 (b94002c0) ---[ end trace c46ed37f9651c58e ]--- Kernel panic - not syncing: Fatal exception Rebooting in 10 seconds.. (diagnosis) * This fault is a data abort, alignment fault (ESR=0x96000021) during reading out ACPI table. * Initial ACPI tables are normally stored in system ram and marked as "ACPI Reclaim memory" by the firmware. * After the commit f56ab9a5b73c ("efi/arm: Don't mark ACPI reclaim memory as MEMBLOCK_NOMAP"), those regions are differently handled as they are "memblock-reserved", without NOMAP bit. * So they are now excluded from device tree's "usable-memory-range" which kexec-tools determines based on a current view of /proc/iomem. * When crash dump kernel boots up, it tries to accesses ACPI tables by mapping them with ioremap(), not ioremap_cache(), in acpi_os_ioremap() since they are no longer part of mapped system ram. * Given that ACPI accessor/helper functions are compiled in without unaligned access support (ACPI_MISALIGNMENT_NOT_SUPPORTED), any unaligned access to ACPI tables can cause a fatal panic. With this patch, acpi_os_ioremap() always honors a memory attribute provided by the firmware (efi). Hence retaining cacheability in said cases allows the kernel safe access to ACPI tables. Please note that arm_enable_runtime_services(), which is renamed to efi_enter_virtual_mode() due to the similarity to x86's, is now called earlier before acpi_early_init() since efi_mem_attributes() relies on efi.memmap being mapped. Signed-off-by: AKASHI Takahiro Suggested-by: James Morse Suggested-by: Ard Biesheuvel Reported-by and Tested-by: Bhupesh Sharma --- arch/arm64/include/asm/acpi.h | 23 ++++++++++++++++------- arch/arm64/kernel/acpi.c | 11 +++-------- drivers/firmware/efi/arm-runtime.c | 15 ++++++--------- init/main.c | 3 +++ 4 files changed, 28 insertions(+), 24 deletions(-) -- 2.17.0 diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 32f465a80e4e..d53c95f4e1a9 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -12,10 +12,12 @@ #ifndef _ASM_ACPI_H #define _ASM_ACPI_H +#include #include #include #include +#include #include #include @@ -29,18 +31,22 @@ /* Basic configuration for ACPI */ #ifdef CONFIG_ACPI +pgprot_t __acpi_get_mem_attribute(phys_addr_t addr); + /* ACPI table mapping after acpi_permanent_mmap is set */ static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) { + /* For normal memory we already have a cacheable mapping. */ + if (memblock_is_map_memory(phys)) + return (void __iomem *)__phys_to_virt(phys); + /* - * EFI's reserve_regions() call adds memory with the WB attribute - * to memblock via early_init_dt_add_memory_arch(). + * We should still honor the memory's attribute here because + * crash dump kernel possibly excludes some ACPI (reclaim) + * regions from memblock list. */ - if (!memblock_is_memory(phys)) - return ioremap(phys, size); - - return ioremap_cache(phys, size); + return __ioremap(phys, size, __acpi_get_mem_attribute(phys)); } #define acpi_os_ioremap acpi_os_ioremap @@ -125,7 +131,10 @@ static inline const char *acpi_get_enable_method(int cpu) * for compatibility. */ #define acpi_disable_cmcff 1 -pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr); +static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) +{ + return __acpi_get_mem_attribute(addr); +} #endif /* CONFIG_ACPI_APEI */ #ifdef CONFIG_ACPI_NUMA diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index 7b09487ff8fb..7880076c1cf0 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -18,6 +18,7 @@ #include #include #include +# include #include #include #include @@ -29,12 +30,8 @@ #include #include -#include - -#ifdef CONFIG_ACPI_APEI -# include # include -#endif +#include int acpi_noirq = 1; /* skip ACPI IRQ initialization */ int acpi_disabled = 1; @@ -239,8 +236,7 @@ void __init acpi_boot_table_init(void) } } -#ifdef CONFIG_ACPI_APEI -pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) +pgprot_t __acpi_get_mem_attribute(phys_addr_t addr) { /* * According to "Table 8 Map: EFI memory types to AArch64 memory @@ -261,4 +257,3 @@ pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) return __pgprot(PROT_NORMAL_NC); return __pgprot(PROT_DEVICE_nGnRnE); } -#endif diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c index 5889cbea60b8..1148ea5a0faa 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c @@ -106,23 +106,23 @@ static bool __init efi_virtmap_init(void) * non-early mapping of the UEFI system table and virtual mappings for all * EFI_MEMORY_RUNTIME regions. */ -static int __init arm_enable_runtime_services(void) +void __init efi_enter_virtual_mode(void) { u64 mapsize; if (!efi_enabled(EFI_BOOT)) { pr_info("EFI services will not be available.\n"); - return 0; + return; } if (efi_runtime_disabled()) { pr_info("EFI runtime services will be disabled.\n"); - return 0; + return; } if (efi_enabled(EFI_RUNTIME_SERVICES)) { pr_info("EFI runtime services access via paravirt.\n"); - return 0; + return; } pr_info("Remapping and enabling EFI services.\n"); @@ -131,21 +131,18 @@ static int __init arm_enable_runtime_services(void) if (efi_memmap_init_late(efi.memmap.phys_map, mapsize)) { pr_err("Failed to remap EFI memory map\n"); - return -ENOMEM; + return; } if (!efi_virtmap_init()) { pr_err("UEFI virtual mapping missing or invalid -- runtime services will not be available\n"); - return -ENOMEM; + return; } /* Set up runtime services function pointers */ efi_native_runtime_setup(); set_bit(EFI_RUNTIME_SERVICES, &efi.flags); - - return 0; } -early_initcall(arm_enable_runtime_services); void efi_virtmap_load(void) { diff --git a/init/main.c b/init/main.c index b795aa341a3a..40d05b63960f 100644 --- a/init/main.c +++ b/init/main.c @@ -693,6 +693,9 @@ asmlinkage __visible void __init start_kernel(void) debug_objects_mem_init(); setup_per_cpu_pageset(); numa_policy_init(); + if (IS_ENABLED(CONFIG_EFI) && + (IS_ENABLED(CONFIG_ARM64) || IS_ENABLED(CONFIG_ARM))) + efi_enter_virtual_mode(); acpi_early_init(); if (late_time_init) late_time_init();