From patchwork Thu Feb 1 09:04:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 126436 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1518817ljc; Thu, 1 Feb 2018 01:06:04 -0800 (PST) X-Google-Smtp-Source: AH8x225nIFOAy2CFNri/LaCXsZkU1TSrr4IHE09UPQiLlZGxVT3C2zc5Hk06ov7FeU51HdsuKl6J X-Received: by 10.98.7.207 with SMTP id 76mr35632068pfh.130.1517475964805; Thu, 01 Feb 2018 01:06:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517475964; cv=none; d=google.com; s=arc-20160816; b=WoRfA1q0s1+qnv9rD2UuQk/3lOykH5RovmveQMZi0eIeTORrg/4RkZW+8QcgqWj02g K9QtBKyuFd+OId5O8v7M6YJE5u2xG6fCI8zIH0foVplHTF5R1sLuLqnrSEoYQbi4YOIB IFT+kanZLoY8MiFcOHfelJ+xXkLBIcN6vj97OzqkjOvui+/QGXRV3BYT+rHHmRUVX8xM UndFraktAj2IcMzEEvuPy15QFCVkP2kVdroedwj4x33tcHZ41LD2OIq1tqW6StcqsSSb Qc5b0bjP08Jor/eou4o81Ymu/bI87ZSbBmcsRUcMNPhLu0vvgg7OdyFKKwSwXa3S11pD WDVQ== 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=LBUPj+2bHDUoLEXtVJO3zjE96dHhQZv8bCXwK9AZPdc=; b=SmJozh5zbMmmFmCqv2G+R5PGhymqMFz7gHIR/Vh0zV0rWh8bVQ80ye5LDWErpH8ko5 pwSjK0H08NgzFfPVCSlWg9jnc+i+GTLVHy0gzkkHwvkmWinQnFRe2c5jUDP4W9JM2Frn AnKJNm5B2xIV48/+d0caPPrswCHEkV5lYPyI5Tk7a2kIo0RHhr8080X5e/TXfegHd/mJ /RxDqAw2Q4lxsmwewD3itzbLAIoXNGT7IccA7moXrfdvUvKq9Jy4E5BPZYpT4D0iqbPf uMdGAmLXLgAfEXbZgJZ9tOOjA/Zslby8ojgjDTgLvlMx1344NmYwi5aceQYWmzdA0J69 THDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EmG07eup; 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 h7si1147063pgv.172.2018.02.01.01.06.04; Thu, 01 Feb 2018 01:06:04 -0800 (PST) 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=EmG07eup; 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 S1751849AbeBAJGC (ORCPT + 24 others); Thu, 1 Feb 2018 04:06:02 -0500 Received: from mail-pl0-f65.google.com ([209.85.160.65]:44309 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751405AbeBAJF5 (ORCPT ); Thu, 1 Feb 2018 04:05:57 -0500 Received: by mail-pl0-f65.google.com with SMTP id f8so3017428plk.11 for ; Thu, 01 Feb 2018 01:05:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=LBUPj+2bHDUoLEXtVJO3zjE96dHhQZv8bCXwK9AZPdc=; b=EmG07eupKflxaM+VoPKmuPQ4UVi/rOjJ3H9wR0JsLlkp6b20Bi4aGq8LcrtiXMJSu3 IynV+iEo4y9Kuv+Ln7ftYtimgW2XJQKVojbr4yDLaKdgrOskCSZsCL/VvV2PhiZolFCt CeJaNlkovpwT/HN8aOvixSAORfROZkGmTDccM= 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=LBUPj+2bHDUoLEXtVJO3zjE96dHhQZv8bCXwK9AZPdc=; b=RK6FnDKb8ItkJ0W/xgxq11NAvRCnM6vvsN1hzZXJb5I7hMa8tuoWzsd4LjSx/IMinc +dOsG5BTkQ3CcH6Vpao+KXSyERqoMy7JlZpAD1wUypg4E7cSfHaRmCM5lmKKl8qcUZdO wMT+X0T8SWto6nRsNf5AUHuOT+gK4w0+4x9Y3GmMUXb0EuqPoKlWB8TFKxHBkpNd/2TO g6iIvsxpJ0MOgERZLAelRIhVbVVBasChrYdOZdQ9gZhQLpYwupQYolW9ddotpbZkn6cn BMdwsK1XaFHR3zBkX/LoHoY2sNZs2NOYrUVOQ3WgVCYPx0p2b79GEcCRhAqZqu4OJLZV rU2A== X-Gm-Message-State: AKwxytfPLs7Ip6XNTckR96weNuyFenHHbEmtL/djq/Ds3B6ysmS6Zfgs qO6m4Z12IVeOfy+hJVxeIw8EbA== X-Received: by 2002:a17:902:7402:: with SMTP id g2-v6mr1034173pll.170.1517475957150; Thu, 01 Feb 2018 01:05:57 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id b11sm26881465pgu.25.2018.02.01.01.05.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 01:05:56 -0800 (PST) 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: [PATCH] arm64: acpi, efi: fix alignment fault in accessing ACPI tables at kdump Date: Thu, 1 Feb 2018 18:04:49 +0900 Message-Id: <20180201090449.19514-1-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.15.1 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.15.1 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 b3162715ed78..35702c5e58d2 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 1cc41c3d6315..16dd8a2d0237 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c @@ -115,23 +115,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"); @@ -140,21 +140,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 a8100b954839..2d0927768e2d 100644 --- a/init/main.c +++ b/init/main.c @@ -674,6 +674,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();