Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arm64: acpi: fix alignment fault in accessing ACPI

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...)
[<ffff0000084a6764>] acpi_ns_lookup+0x25c/0x3c0
[<ffff00000849b4f8>] acpi_ds_load1_begin_op+0xa4/0x294
[<ffff0000084ad4ac>] acpi_ps_build_named_op+0xc4/0x198
[<ffff0000084ad6cc>] acpi_ps_create_op+0x14c/0x270
[<ffff0000084acfa8>] acpi_ps_parse_loop+0x188/0x5c8
[<ffff0000084ae048>] acpi_ps_parse_aml+0xb0/0x2b8
[<ffff0000084a8e10>] acpi_ns_one_complete_parse+0x144/0x184
[<ffff0000084a8e98>] acpi_ns_parse_table+0x48/0x68
[<ffff0000084a82cc>] acpi_ns_load_table+0x4c/0xdc
[<ffff0000084b32f8>] acpi_tb_load_namespace+0xe4/0x264
[<ffff000008baf9b4>] acpi_load_tables+0x48/0xc0
[<ffff000008badc20>] acpi_early_init+0x9c/0xd0
[<ffff000008b70d50>] 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 memory attribute
information provided by the firmware (EFI) and retaining cacheability
allows the kernel safe access to ACPI tables.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: James Morse <james.morse@arm.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reported-by and Tested-by: Bhupesh Sharma <bhsharma@redhat.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

authored by

AKASHI Takahiro and committed by
Will Deacon
09ffcb0d 20d12cf9

+20 -16
+17 -8
arch/arm64/include/asm/acpi.h
··· 12 12 #ifndef _ASM_ACPI_H 13 13 #define _ASM_ACPI_H 14 14 15 + #include <linux/efi.h> 15 16 #include <linux/memblock.h> 16 17 #include <linux/psci.h> 17 18 18 19 #include <asm/cputype.h> 20 + #include <asm/io.h> 19 21 #include <asm/smp_plat.h> 20 22 #include <asm/tlbflush.h> 21 23 ··· 31 29 32 30 /* Basic configuration for ACPI */ 33 31 #ifdef CONFIG_ACPI 32 + pgprot_t __acpi_get_mem_attribute(phys_addr_t addr); 33 + 34 34 /* ACPI table mapping after acpi_permanent_mmap is set */ 35 35 static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, 36 36 acpi_size size) 37 37 { 38 - /* 39 - * EFI's reserve_regions() call adds memory with the WB attribute 40 - * to memblock via early_init_dt_add_memory_arch(). 41 - */ 42 - if (!memblock_is_memory(phys)) 43 - return ioremap(phys, size); 38 + /* For normal memory we already have a cacheable mapping. */ 39 + if (memblock_is_map_memory(phys)) 40 + return (void __iomem *)__phys_to_virt(phys); 44 41 45 - return ioremap_cache(phys, size); 42 + /* 43 + * We should still honor the memory's attribute here because 44 + * crash dump kernel possibly excludes some ACPI (reclaim) 45 + * regions from memblock list. 46 + */ 47 + return __ioremap(phys, size, __acpi_get_mem_attribute(phys)); 46 48 } 47 49 #define acpi_os_ioremap acpi_os_ioremap 48 50 ··· 135 129 * for compatibility. 136 130 */ 137 131 #define acpi_disable_cmcff 1 138 - pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr); 132 + static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) 133 + { 134 + return __acpi_get_mem_attribute(addr); 135 + } 139 136 #endif /* CONFIG_ACPI_APEI */ 140 137 141 138 #ifdef CONFIG_ACPI_NUMA
+3 -8
arch/arm64/kernel/acpi.c
··· 18 18 #include <linux/acpi.h> 19 19 #include <linux/bootmem.h> 20 20 #include <linux/cpumask.h> 21 + #include <linux/efi.h> 21 22 #include <linux/efi-bgrt.h> 22 23 #include <linux/init.h> 23 24 #include <linux/irq.h> ··· 30 29 31 30 #include <asm/cputype.h> 32 31 #include <asm/cpu_ops.h> 32 + #include <asm/pgtable.h> 33 33 #include <asm/smp_plat.h> 34 - 35 - #ifdef CONFIG_ACPI_APEI 36 - # include <linux/efi.h> 37 - # include <asm/pgtable.h> 38 - #endif 39 34 40 35 int acpi_noirq = 1; /* skip ACPI IRQ initialization */ 41 36 int acpi_disabled = 1; ··· 236 239 } 237 240 } 238 241 239 - #ifdef CONFIG_ACPI_APEI 240 - pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) 242 + pgprot_t __acpi_get_mem_attribute(phys_addr_t addr) 241 243 { 242 244 /* 243 245 * According to "Table 8 Map: EFI memory types to AArch64 memory ··· 257 261 return __pgprot(PROT_NORMAL_NC); 258 262 return __pgprot(PROT_DEVICE_nGnRnE); 259 263 } 260 - #endif