[RFC PATCH 2/3] powerpc: add support for Kexec HandOver (KHO)
Sourabh Jain <[email protected]>
| Newsgroups | org.infradead.lists.kexec,org.kernel.vger.linux-kernel,org.ozlabs.lists.linuxppc-dev |
|---|---|
| Message-ID | <[email protected]> |
Add the architecture bits needed to enable CONFIG_KEXEC_HANDOVER on powerpc. Set ARCH_SUPPORTS_KEXEC_HANDOVER for PPC64, following the existing pattern used by ARCH_SUPPORTS_KEXEC and ARCH_SUPPORTS_KEXEC_FILE. On the boot path, parse the "linux,kho-fdt" and "linux,kho-scratch" properties from /chosen and pass them to kho_populate(). This lets a kernel booted via KHO kexec recover the FDT and scratch region left behind by the previous kernel. The call is placed early in setup_arch(), before unflatten_device_tree(). Open issues: ============ This patch also adds "depends on !CRASH_DUMP" to ARCH_SUPPORTS_KEXEC_HANDOVER. This is needed because of an ordering conflict between crashkernel reservation and KHO scratch reservation on powerpc. Crashkernel memory is reserved very early in boot, from arch-specific code: head.S -> early_setup() -> early_init_devtree() -> arch_reserve_crashkernel() / fadump_reserve_mem(). KHO's scratch region is reserved later, from generic code: start_kernel() -> mm_core_init() -> kho_memory_init(). So on powerpc, crashkernel memory is always reserved first. This ordering causes a real failure. In the common case, crashkernel reservation on powerpc starts at a 512M offset (the exact offset can vary, but 512M is typical). So with crashkernel=3G, the reservation occupies memory from 512M up to 3.5G -- roughly 75% of the entire low 4G area. Since crashkernel reservation always happens first, that 3G is already committed by the time kho_memory_init() runs. It then tries to reserve a low scratch region sized at 200% of whatever is already reserved below 4G. With ~75% of that 4G area already taken by crashkernel memory, 200% of that easily exceeds the remaining space -- and since the low scratch region is itself capped at 4G, there's no room left to fit it. The reservation fails. To work around this and get KHO working on powerpc, this patch: 1. Makes KHO usable on powerpc only when CRASH_DUMP is disabled. 2. Calls kho_populate() from setup_arch(), so it runs before kho_memory_init() reserves the scratch region. The real fix would be to reserve the KHO scratch region before crashkernel memory instead of after. But scratch reservation happens in generic code (kho_memory_init(), called from mm_core_init()), so this isn't something powerpc can address on its own -- it needs discussion on how to influence the ordering between generic scratch reservation and arch-specific crashkernel reservation. This patch doesn't attempt that; it's meant as a starting point for that discussion. Together with patch 3, this gets CONFIG_TEST_KEXEC_HANDOVER passing on powerpc. Cc: Aditya Gupta <[email protected]> Cc: Alexander Graf <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Baoquan He <[email protected]> Cc: Christophe Leroy (CS GROUP) <[email protected]> Cc: Hari Bathini <[email protected]> Cc: Madhavan Srinivasan <[email protected]> Cc: Mahesh Salgaonkar <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: Nicholas Piggin <[email protected]> Cc: Pasha Tatashin <[email protected]> Cc: Pratyush Yadav <[email protected]> Cc: Ritesh Harjani (IBM) <[email protected]> Cc: Shivang Upadhyay <[email protected]> Cc: Shrikanth Hegde <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Sourabh Jain <[email protected]> --- arch/powerpc/Kconfig | 5 +++++ arch/powerpc/kernel/setup-common.c | 33 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 2580e27e4328..61350d3e7a19 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -716,6 +716,11 @@ config ARCH_SELECTS_CRASH_DUMP depends on CRASH_DUMP select RELOCATABLE if PPC64 || 44x || PPC_85xx +config ARCH_SUPPORTS_KEXEC_HANDOVER + def_bool y + depends on PPC64 + depends on !CRASH_DUMP + config ARCH_SUPPORTS_CRASH_HOTPLUG def_bool y depends on PPC64 diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 4afaba19b586..1fee743abdf2 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -35,6 +35,8 @@ #include <linux/of_irq.h> #include <linux/hugetlb.h> #include <linux/pgtable.h> +#include <linux/libfdt.h> +#include <linux/kexec_handover.h> #include <asm/io.h> #include <asm/paca.h> #include <asm/processor.h> @@ -910,6 +912,33 @@ static void __init smp_setup_pacas(void) } #endif +#ifdef CONFIG_PPC64 +static void __init init_kho(const void *fdt) +{ + unsigned long node; + u64 fdt_start, fdt_size, scratch_start, scratch_size; + + if (!IS_ENABLED(CONFIG_KEXEC_HANDOVER)) + return; + + /* Find and verify the /chosen node, same as early_init_dt_scan_chosen() does */ + node = fdt_path_offset(fdt, "/chosen"); + if ((long)node < 0) + node = fdt_path_offset(fdt, "/chosen@0"); + if ((long)node < 0) + return; + + if (!of_flat_dt_get_addr_size(node, "linux,kho-fdt", + &fdt_start, &fdt_size)) + return; + if (!of_flat_dt_get_addr_size(node, "linux,kho-scratch", + &scratch_start, &scratch_size)) + return; + + kho_populate(fdt_start, fdt_size, scratch_start, scratch_size); +} +#endif + /* * Called into from start_kernel this initializes memblock, which is used * to manage page allocation until mem_init is called. @@ -923,6 +952,10 @@ void __init setup_arch(char **cmdline_p) /* Set a half-reasonable default so udelay does something sensible */ loops_per_jiffy = 500000000 / HZ; +#ifdef CONFIG_PPC64 + init_kho(initial_boot_params); +#endif + /* Unflatten the device-tree passed by prom_init or kexec */ unflatten_device_tree(); -- 2.55.0