[PATCH v2 3/3] kho: fix bootmem sizing
Mukesh Pilaniya
mpilaniy at redhat.com
Wed Nov 11 23:21:38 PST 2026
Hi Mike,
On 04/11/26 10:20 pm, Mike Rapoport (Microsoft) wrote:
> Bootmem areas are sized from overlapping views of the memory reserved in
> memblock:
>
> * the global area is sized from all reserved memory, including memory
> allocated on specific nodes, so on NUMA systems everything allocated
> on a node is accounted in both the global area and the area of that
> node.
> * per-node sizes are calculated after the lowmem and the global areas
> are reserved. With CONFIG_NUMA=n all memblock regions belong to node 0,
> so the lowmem and the global areas are accounted in the size of node 0
> area and scaled once again.
>
> As a result, bootmem is about twice bigger than it should be on NUMA
> systems and about four times bigger with CONFIG_NUMA=n. On small systems
> reservation of the bootmem may fail and then KHO gets disabled.
>
> Make the areas cover separate parts of the reserved memory: the lowmem
> area covers allocations below ARCH_LOW_ADDRESS_LIMIT, per-node areas
> cover allocations above it on each node and the global area covers
> allocations that are not bound to any node. Calculate all sizes before
> reserving any of the areas.
>
> With CONFIG_NUMA=n the global area becomes empty and it is not reserved.
>
> If ARCH_LOW_ADDRESS_LIMIT covers all memory, as may happen on arm64, any
> area can serve lowmem allocations, so don't reserve the lowmem area.
The documentation still describes the old layout says __there is always
a boot memory region per node plus one for node-less allocations__,
which stops being true as soon as the global or the lowmem area is
empty, and the lowmem area is not mentioned at all. So please update the
documentation as well.
Reviewed-by: Mukesh Pilaniya <mpilaniy at redhat.com>
>
> Bootmem sizes in MiB in x86 QEMU VMs, before -> after:
>
> CONFIG_NUMA=y CONFIG_NUMA=n
> 1G, 1 node 176 -> 92 320 -> 80
> 4G, 1 node 508 -> 332 1264 -> 316
> 16G, 2 nodes 1268 -> 704 2944 -> 736
> 32G, 4 nodes 2296 -> 1224 5196 -> 1300
> 64G, 4 nodes 4344 -> 2248 9664 -> 2420
>
> Fixes: 3dc92c311498 ("kexec: add Kexec HandOver (KHO) generation helpers")
> Reported-by: Kexin Liu <liukexin at kylinos.cn>
> Reported-by: George Guo <guodongtai at kylinos.cn>
> Closes: https://lore.kernel.org/all/20260904025101.9959-1-dongtai.guo@linux.dev
> Reported-by: Sourabh Jain <sourabhjain at linux.ibm.com>
> Closes: https://lore.kernel.org/all/20260922131217.698809-1-sourabhjain@linux.ibm.com
> Signed-off-by: Mike Rapoport (Microsoft) <rppt at kernel.org>
> ---
> kernel/liveupdate/kexec_handover.c | 93 ++++++++++++++++++++++----------------
> 1 file changed, 54 insertions(+), 39 deletions(-)
>
> diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c
> index 5b1797d1289c8..c4b697a612f67 100644
> --- a/kernel/liveupdate/kexec_handover.c
> +++ b/kernel/liveupdate/kexec_handover.c
> @@ -685,6 +685,7 @@ static unsigned int bootmem_scale __initdata = 200;
> static phys_addr_t bootmem_size_global __initdata;
> static phys_addr_t bootmem_size_pernode __initdata;
> static phys_addr_t bootmem_size_lowmem __initdata;
> +static phys_addr_t bootmem_size_node[MAX_NUMNODES] __initdata;
>
> static int __init kho_parse_bootmem_size(char *p)
> {
> @@ -754,29 +755,58 @@ static int __init kho_parse_bootmem_size(char *p)
> }
> early_param("kho_bootmem", kho_parse_bootmem_size);
>
> +static phys_addr_t __init reserved_mem_size(phys_addr_t limit, int nid)
> +{
> + return memblock_reserved_kern_size(limit, nid) -
> + memblock_reserved_hugetlb_size(limit, nid);
> +}
> +
> +static phys_addr_t __init bootmem_scale_size(phys_addr_t size)
> +{
> + return size * bootmem_scale / 100;
> +}
> +
> +/*
> + * The lowmem area covers allocations below ARCH_LOW_ADDRESS_LIMIT, per-node
> + * areas cover allocations above it on each node and the global area covers
> + * allocations that are not bound to any node.
> + *
> + * The reserved memory on a node and the total reserved memory include
> + * lowmem, so it is subtracted from both.
> + *
> + * If ARCH_LOW_ADDRESS_LIMIT covers all memory, any area can serve lowmem
> + * allocations and there is no lowmem area.
> + *
> + * All sizes must be calculated before any area is reserved, otherwise the
> + * areas reserved first will be accounted in the sizes of the others.
> + */
> static void __init bootmem_size_update(void)
> {
> - /*
> - * If fixed sizes are not provided via command line, calculate them now.
> - * Remove HugeTLB allocations from it because they never get allocated
> - * from bootmem.
> - */
> + int nid;
> +
> if (bootmem_scale) {
> - phys_addr_t size;
> -
> - size = memblock_reserved_kern_size(ARCH_LOW_ADDRESS_LIMIT,
> - NUMA_NO_NODE);
> - size -= memblock_reserved_hugetlb_size(ARCH_LOW_ADDRESS_LIMIT,
> - NUMA_NO_NODE);
> - size = size * bootmem_scale / 100;
> - bootmem_size_lowmem = size;
> -
> - size = memblock_reserved_kern_size(MEMBLOCK_ALLOC_ANYWHERE,
> - NUMA_NO_NODE);
> - size -= memblock_reserved_hugetlb_size(MEMBLOCK_ALLOC_ANYWHERE,
> - NUMA_NO_NODE);
> - size = size * bootmem_scale / 100 - bootmem_size_lowmem;
> - bootmem_size_global = size;
> + phys_addr_t low_limit = ARCH_LOW_ADDRESS_LIMIT;
> + phys_addr_t lowmem, global, size;
> +
> + if (low_limit >= memblock_end_of_DRAM() - 1)
> + low_limit = 0;
> +
> + lowmem = reserved_mem_size(low_limit, NUMA_NO_NODE);
> + global = reserved_mem_size(MEMBLOCK_ALLOC_ANYWHERE, NUMA_NO_NODE);
> + global -= lowmem;
> +
> + for_each_node_state(nid, N_MEMORY) {
> + size = reserved_mem_size(MEMBLOCK_ALLOC_ANYWHERE, nid) -
> + reserved_mem_size(low_limit, nid);
> + bootmem_size_node[nid] = bootmem_scale_size(size);
> + global -= size;
> + }
> +
> + bootmem_size_lowmem = bootmem_scale_size(lowmem);
> + bootmem_size_global = bootmem_scale_size(global);
> + } else {
> + for_each_node_state(nid, N_MEMORY)
> + bootmem_size_node[nid] = bootmem_size_pernode;
> }
>
> /*
> @@ -785,24 +815,9 @@ static void __init bootmem_size_update(void)
> */
> bootmem_size_lowmem = round_up(bootmem_size_lowmem, BOOTMEM_ALIGNMENT_BYTES);
> bootmem_size_global = round_up(bootmem_size_global, BOOTMEM_ALIGNMENT_BYTES);
> -}
> -
> -static phys_addr_t __init bootmem_size_node(int nid)
> -{
> - phys_addr_t size;
> -
> - if (bootmem_scale) {
> - size = memblock_reserved_kern_size(MEMBLOCK_ALLOC_ANYWHERE,
> - nid);
> - /* Do not count HugeTLB pages. */
> - size -= memblock_reserved_hugetlb_size(MEMBLOCK_ALLOC_ANYWHERE,
> - nid);
> - size = size * bootmem_scale / 100;
> - } else {
> - size = bootmem_size_pernode;
> - }
> -
> - return round_up(size, BOOTMEM_ALIGNMENT_BYTES);
> + for_each_node_state(nid, N_MEMORY)
> + bootmem_size_node[nid] = round_up(bootmem_size_node[nid],
> + BOOTMEM_ALIGNMENT_BYTES);
> }
>
> bool kho_bootmem_overlap(phys_addr_t phys, size_t size)
> @@ -899,7 +914,7 @@ static void __init kho_reserve_bootmem(void)
> * memoryless nodes, as we can not allocate bootmem areas there.
> */
> for_each_node_state(nid, N_MEMORY) {
> - if (kho_reserve_bootmem_area(bootmem_size_node(nid),
> + if (kho_reserve_bootmem_area(bootmem_size_node[nid],
> MEMBLOCK_ALLOC_ACCESSIBLE, nid)) {
> pr_err("Failed to reserve nid %d bootmem\n", nid);
> goto err_free_bootmem_areas;
>
--
Regards,
Mukesh Pilaniya
More information about the kexec
mailing list