Skip to content

Commit e0eec24

Browse files
jbeulichrppt
authored andcommitted
memblock: make memblock_set_node() also warn about use of MAX_NUMNODES
On an (old) x86 system with SRAT just covering space above 4Gb: ACPI: SRAT: Node 0 PXM 0 [mem 0x100000000-0xfffffffff] hotplug the commit referenced below leads to this NUMA configuration no longer being refused by a CONFIG_NUMA=y kernel (previously NUMA: nodes only cover 6144MB of your 8185MB e820 RAM. Not used. No NUMA configuration found Faking a node at [mem 0x0000000000000000-0x000000027fffffff] was seen in the log directly after the message quoted above), because of memblock_validate_numa_coverage() checking for NUMA_NO_NODE (only). This in turn led to memblock_alloc_range_nid()'s warning about MAX_NUMNODES triggering, followed by a NULL deref in memmap_init() when trying to access node 64's (NODE_SHIFT=6) node data. To compensate said change, make memblock_set_node() warn on and adjust a passed in value of MAX_NUMNODES, just like various other functions already do. Fixes: ff6c3d8 ("NUMA: optimize detection of memory with no node id assigned by firmware") Signed-off-by: Jan Beulich <jbeulich@suse.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/1c8a058c-5365-4f27-a9f1-3aeb7fb3e7b2@suse.com Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
1 parent 1613e60 commit e0eec24

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

mm/memblock.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,6 +1339,10 @@ int __init_memblock memblock_set_node(phys_addr_t base, phys_addr_t size,
13391339
int start_rgn, end_rgn;
13401340
int i, ret;
13411341

1342+
if (WARN_ONCE(nid == MAX_NUMNODES,
1343+
"Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))
1344+
nid = NUMA_NO_NODE;
1345+
13421346
ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn);
13431347
if (ret)
13441348
return ret;

0 commit comments

Comments
 (0)