x86-64, NUMA: Do not scan two times for setup_node_bootmem()
By the time setup_node_bootmem() is called, all the memblocks are
already registered. As node_data is allocated from these memblocks,
calling it more than once doesn't make any difference. Drop the loop.
tj: Dropped comment referencing to the old behavior as suggested by
David and rephrased the description.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index f6d85e3..6e4ee96 100644
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -480,7 +480,7 @@
static int __init numa_register_memblks(struct numa_meminfo *mi)
{
- int i, j, nid;
+ int i, nid;
/* Account for nodes with cpus and no memory */
node_possible_map = numa_nodes_parsed;
@@ -506,28 +506,20 @@
init_memory_mapping_high();
- /*
- * Finally register nodes. Do it twice in case setup_node_bootmem
- * missed one due to missing bootmem.
- */
- for (i = 0; i < 2; i++) {
- for_each_node_mask(nid, node_possible_map) {
- u64 start = (u64)max_pfn << PAGE_SHIFT;
- u64 end = 0;
+ /* Finally register nodes. */
+ for_each_node_mask(nid, node_possible_map) {
+ u64 start = (u64)max_pfn << PAGE_SHIFT;
+ u64 end = 0;
- if (node_online(nid))
+ for (i = 0; i < mi->nr_blks; i++) {
+ if (nid != mi->blk[i].nid)
continue;
-
- for (j = 0; j < mi->nr_blks; j++) {
- if (nid != mi->blk[j].nid)
- continue;
- start = min(mi->blk[j].start, start);
- end = max(mi->blk[j].end, end);
- }
-
- if (start < end)
- setup_node_bootmem(nid, start, end);
+ start = min(mi->blk[i].start, start);
+ end = max(mi->blk[i].end, end);
}
+
+ if (start < end)
+ setup_node_bootmem(nid, start, end);
}
return 0;