riscv: kexec_file: Constrain segment placement to direct map
PATCH 1/1 riscv: kexec_file: Constrain segment placement to direct map
When kexec_file_load places segments with buf_max=ULONG_MAX and top_down=true, they land at the highest available physical addresses. On RISC-V the size of the linear mapping is determined by the active VM mode: SV39 caps the direct map at roughly 128GB, while SV48/SV57 extend the range substantially further. When the installed physical memory exceeds the direct map size of the active mode, top-down placement puts DTB/initrd at physical addresses outside the linearly mapped region. The kexec'd kernel cannot reach them during early boot, triggering a page fault at memcmp in start_kernel.
Fix by constraining buf_max to PFN_PHYS(max_low_pfn), which reflects the runtime direct map boundary for the active VM mode (SV39/SV48/ SV57). This keeps all kexec segments within the linearly mapped region while preserving the upstream top_down allocation strategy.
--- arch/riscv/kernel/machine_kexec_file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/riscv/kernel/machine_kexec_file.c +2 -1
@@ -13,6 +13,7 @@#include <linux/libfdt.h> #include <linux/types.h> #include <linux/memblock.h> +#include <linux/pfn.h> #include <linux/vmalloc.h> #include <asm/setup.h> #include <asm/insn.h>
@@ -266,7 +267,7 @@ int load_extra_segments(struct kimage *image, unsigned long kernel_start, kbuf.image = image; kbuf.buf_min = kernel_start + kernel_len; - kbuf.buf_max =ULONG_MAX ; + kbuf.buf_max =PFN_PHYS (max_low_pfn);#ifdef CONFIG_CRASH_DUMP /* Add elfcorehdr */
Signature · 1 line
2.47.3
Paul Walmsley
maintainerQuoted 10 lines · Han Gao
When
kexec_file_loadplaces segments with buf_max=ULONG_MAX and top_down=true, they land at the highest available physical addresses. On RISC-V the size of the linear mapping is determined by the active VM mode: SV39 caps the direct map at roughly 128GB, while SV48/SV57 extend the range substantially further. When the installed physical memory exceeds the direct map size of the active mode, top-down placement puts DTB/initrd at physical addresses outside the linearly mapped region. The kexec'd kernel cannot reach them during early boot, triggering a page fault at memcmp instart_kernel.
Quoted 6 lines
Fix by constraining
buf_maxtoPFN_PHYS(max_low_pfn), which reflects the runtime direct map boundary for the active VM mode (SV39/SV48/ SV57). This keeps all kexec segments within the linearly mapped region while preserving the upstreamtop_downallocation strategy.Signed-off-by Han Gao <[email protected]>
Thanks, queued for v7.1-rc.
- Paul