From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793706602; b=WPgJNXegf0T24TdzriwAPdFKQ8QVOPfRL1fu0wHnh9WJAk/zPOL3nRmblCJjIf9sUCal 34XZw0cDub5bn4yaWqApcoYHsIbfhv9WH8RscMnNGybPUVRjq14+Q2hAlSyEbHMPZqRur wGP5krD2yUXeMbUHuIFbILQqk0sTMyAa2JD126j7DLn/tGL6bq1XTzi4uC/IqAwH/tKTP qgJ3NHwn12Ef2uKYF43liXTAlOYSzmKb5DBWde30l/HtJup5k1Ru+EQYor8S6CDn26s0E B46W5+z7FFjdMn0PuiThUycve3RLB1f4GlfgkkvzIS1KtGA/W/JqQpZW+4ZLXmt4fSQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793706602; h=Received:DKIM-Signature:From:Date:Subject:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-Id:References:In-Reply-To:To:Cc: X-Mailer; bh=FfTQknGJpSI2GICiIF+kAXKtTCGL4b3ApztibrZw2ss=; b=zNob/ore9WJKxtXc9EpL3J7hW4iKsigSQtwY8zCFPbQvuMl+QJ+JSYYZGvBiTjquaoBi mcMGNz7r78mRxakKPEnQovoFQRRVmV7TtydQh/gjo24sumgiwpguuzCjyReg1I9d38JYo LC/1USmjyniDD3oh1Y7cz3OW49vjxWsCPgnl2ns1XyZq5WDCV0Ez1UuCZd2GXjnoojgbO /azFFy2A77UwgIyEX7xv1B9vF3wTe3uhXwfEzvzHYsdHsY3OdN3BDzz0boFNKgQECFry+ FiLqc03yB8k8JCymbFyRfauIdJXJ6mImWMUWvACaqg5Dd4LjwmNd3EOvctOPwljXUkQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=aqOPHRez; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 67035606D83D for ; Tue, 3 Nov 2026 11:50:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=aqOPHRez Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5092D1F00A1E; Tue, 3 Nov 2026 11:49:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793706602; bh=FfTQknGJpSI2GICiIF+kAXKtTCGL4b3ApztibrZw2ss=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=aqOPHRez7HNXUMU/E7nN4gHuptx/8+GgRVpmK73me7CuY054WSzDoHjTdaG2VE3wu gB6Z/HAkRlwDuDx+TXxujjnY5IMaeFOjiO4WcpLDPm1YCnmg/pe7ZWM8i08/QtfwxF pATBtmHmzKNnSSlanHTVwJdRbk5VaPL/eQEoLxUMepXrl0zpeN2BIX5SUOOOjUjy0O NCHTBS4n7FB3nmGKoajrhIZfuIk4Qj3uZE2F1HvU2rUZ0rH56RTIikNDOkisk+NlJ5 K2whdi0pPpiOygQkIKKIxKEQIM62Wks29qQWzH9gQ7aJJFvJsiuDyQSp5UFy8kIpjH e/bVcJVee77MQ== From: "Mike Rapoport (Microsoft)" Date: Tue, 03 Nov 2026 13:49:50 +0200 Subject: [PATCH 2/2] kho: fix bootmem sizing X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261103-kho-bootmem-sizing-v1-2-45aa74098f34@kernel.org> References: <20261103-kho-bootmem-sizing-v1-0-45aa74098f34@kernel.org> In-Reply-To: <20261103-kho-bootmem-sizing-v1-0-45aa74098f34@kernel.org> To: Mike Rapoport , Pasha Tatashin , Pratyush Yadav Cc: Alexander Graf , Andrew Morton , Chen Pei , George Guo , Kexin Liu , Sourabh Jain , kexec@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org X-Mailer: b4 0.16.1-dev 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. 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 Reported-by: George Guo Closes: https://lore.kernel.org/all/20260904025101.9959-1-dongtai.guo@linux.dev Reported-by: Sourabh Jain Closes: https://lore.kernel.org/all/20260922131217.698809-1-sourabhjain@linux.ibm.com Signed-off-by: Mike Rapoport (Microsoft) --- kernel/liveupdate/kexec_handover.c | 83 ++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 39 deletions(-) diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c index f268c57413a7e..eaeb895bb7595 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -684,6 +684,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) { @@ -753,29 +754,48 @@ 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. + * + * 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 lowmem, global, size; + + lowmem = reserved_mem_size(ARCH_LOW_ADDRESS_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(ARCH_LOW_ADDRESS_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; } /* @@ -784,24 +804,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) @@ -891,7 +896,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(&i, bootmem_size_node(nid), + if (kho_reserve_bootmem_area(&i, bootmem_size_node[nid], MEMBLOCK_ALLOC_ACCESSIBLE, nid)) { pr_err("Failed to reserve nid %d bootmem\n", nid); goto err_free_bootmem_areas; -- 2.53.0