mm: Remove unused exact_nid parameter from memmap_alloc()
PATCH 1/1 mm: Remove unused exact_nid parameter from memmap_alloc()
From: Kaitao Cheng <[email protected]>
Commit ffe55393137c ("mm/sparse: remove sparse buffer pre-allocation mechanism") removed sparse_buffer_init(), which was the only caller of memmap_alloc() that passed true for exact_nid.
All remaining callers pass false, leaving the exact-node allocation branch unreachable. Remove the exact_nid parameter and unconditionally use memblock_alloc_try_nid_raw().
This has no functional impact.
--- mm/mm_init.c | 14 ++++---------- mm/mm_init.h | 4 ++-- mm/sparse-vmemmap.c | 2 +- mm/sparse.c | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-)
mm/mm_init.c +4 -10
@@ -1601,7 +1601,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat) }void __init *memmap_alloc (phys_addr_t size,phys_addr_t align, -phys_addr_t min_addr,int nid,bool exact_nid) +phys_addr_t min_addr,int nid) {void *ptr;
@@ -1609,14 +1609,8 @@ void __init *memmap_alloc(phys_addr_t size, phys_addr_t align,* Kmemleak will explicitly scan mem_map by traversing all valid * `struct *page`,so memblock does not need to be added to the scan list. */ -if (exact_nid) - ptr =memblock_alloc_exact_nid_raw (size, align, min_addr, -MEMBLOCK_ALLOC_NOLEAKTRACE , - nid); -else - ptr =memblock_alloc_try_nid_raw (size, align, min_addr, -MEMBLOCK_ALLOC_NOLEAKTRACE , - nid); + ptr =memblock_alloc_try_nid_raw (size, align, min_addr, +MEMBLOCK_ALLOC_NOLEAKTRACE , nid);if (ptr && size >0 )page_init_poison (ptr, size);
@@ -1644,7 +1638,7 @@ static void __init alloc_node_mem_map(struct pglist_data *pgdat) end =ALIGN (pgdat_end_pfn (pgdat),MAX_ORDER_NR_PAGES ); size = (end - start) *sizeof (struct page ); map =memmap_alloc (size,SMP_CACHE_BYTES ,MEMBLOCK_LOW_LIMIT , - pgdat->node_id, false); + pgdat->node_id);if (!map)panic ("Failed to allocate %ld bytes for node %d memory map\n" , size, pgdat->node_id);
mm/mm_init.h +2 -2
@@ -31,8 +31,8 @@ static inline void clear_zone_contiguous(struct zone *zone)void memblock_free_pages (unsigned long pfn,unsigned int order); -void *memmap_alloc (phys_addr_t size,phys_addr_t align,phys_addr_t min_addr, -int nid,bool exact_nid); +void *memmap_alloc (phys_addr_t size,phys_addr_t align, +phys_addr_t min_addr,int nid); void memmap_init_range(unsigned long size, int nid, unsigned long zone, unsigned long start_pfn, unsigned long zone_end_pfn,
mm/sparse-vmemmap.c +1 -1
@@ -53,7 +53,7 @@ static void * __ref __earlyonly_bootmem_alloc(int node,unsigned long align, unsigned long goal) { - return memmap_alloc(size, align, goal, node, false); + return memmap_alloc(size, align, goal, node); }void *__meminit vmemmap_alloc_block (unsigned long size,int node)
mm/sparse.c +1 -1
@@ -215,7 +215,7 @@ struct page __init *__populate_section_memmap(unsigned long pfn, {const unsigned long size =PAGE_ALIGN (sizeof (struct page ) *PAGES_PER_SECTION ); -return memmap_alloc (size, size,__pa (MAX_DMA_ADDRESS ), nid, false); +return memmap_alloc (size, size,__pa (MAX_DMA_ADDRESS ), nid); }#endif /* !CONFIG_SPARSEMEM_VMEMMAP */
Signature · 1 line
2.54.0 (Apple Git-157)
Quoted 10 lines · Kaitao Cheng
From: Kaitao Cheng <[email protected]>
Commit
ffe55393137c("mm/sparse: remove sparse buffer pre-allocation mechanism") removedsparse_buffer_init(), which was the only caller ofmemmap_alloc()that passed true forexact_nid.
Quoted 7 lines
All remaining callers pass false, leaving the exact-node allocation branch unreachable. Remove the
exact_nidparameter and unconditionally usememblock_alloc_try_nid_raw().This has no functional impact.
Signed-off-by Kaitao Cheng <[email protected]>
Thanks.
Andrew Morton
maintainerQuoted 6 lines · On Mon, 14 Sep 2026 13:51:30 +0800 Kaitao Cheng <[email protected]> wrote:
From: Kaitao Cheng <[email protected]>
Commit
ffe55393137c("mm/sparse: remove sparse buffer pre-allocation mechanism") removedsparse_buffer_init(), which was the only caller ofmemmap_alloc()that passed true forexact_nid.
Quoted 6 lines
All remaining callers pass false, leaving the exact-node allocation branch unreachable. Remove the
exact_nidparameter and unconditionally usememblock_alloc_try_nid_raw().This has no functional impact.
Latest development code has changed quite lot, but this was an easy reject to fix:
mm/sparse-vmemmap.c static void * __ref __earlyonly_bootmem_alloc(int node, · line 59
Quoted 11 lines
mm/sparse-vmemmap.c +1
-1@@ -53,7 +53,7 @@ static void * __ref __earlyonly_bootmem_alloc(int node,unsigned long align, unsigned long goal) { - return memmap_alloc(size, align, goal, node, false); + return memmap_alloc(size, align, goal, node); }void *__meminit vmemmap_alloc_block (unsigned long size,int node)
mm/sparse.c renamed from mm/sparse.c~mm-remove-unused-exact_nid-parameter-from-memmap_alloc +1 -1
@@ -215,7 +215,7 @@ struct page __init *__populate_section_m {const unsigned long size =PAGE_ALIGN (sizeof (struct page ) *PAGES_PER_SECTION ); -return memmap_alloc (size, size,__pa (MAX_DMA_ADDRESS ), nid, false); +return memmap_alloc (size, size,__pa (MAX_DMA_ADDRESS ), nid); }#endif /* !CONFIG_SPARSEMEM_VMEMMAP */
Quoted 12 lines · Andrew Morton
Quoted 10 lines · On Mon, 14 Sep 2026 13:51:30 +0800 Kaitao Cheng <[email protected]> wrote:
From: Kaitao Cheng <[email protected]>
Commit
ffe55393137c("mm/sparse: remove sparse buffer pre-allocation mechanism") removedsparse_buffer_init(), which was the only caller ofmemmap_alloc()that passed true forexact_nid.All remaining callers pass false, leaving the exact-node allocation branch unreachable. Remove the
exact_nidparameter and unconditionally usememblock_alloc_try_nid_raw().
Quoted 5 lines
Quoted 2 lines
This has no functional impact.
Latest development code has changed quite lot, but this was an easy reject to fix:
Thank you very much for helping me fix this issue!
Quoted 26 lines
Quoted 12 lines
mm/sparse-vmemmap.c +1
-1@@ -53,7 +53,7 @@ static void * __ref __earlyonly_bootmem_alloc(int node,unsigned long align, unsigned long goal) { - return memmap_alloc(size, align, goal, node, false); + return memmap_alloc(size, align, goal, node); }void *__meminit vmemmap_alloc_block (unsigned long size,int node)mm/sparse.c renamed from mm/sparse.c~mm-remove-unused-exact_nid-parameter-from-memmap_alloc +1
-1@@ -215,7 +215,7 @@ struct page __init *__populate_section_m {const unsigned long size =PAGE_ALIGN (sizeof (struct page ) *PAGES_PER_SECTION ); -return memmap_alloc (size, size,__pa (MAX_DMA_ADDRESS ), nid, false); +return memmap_alloc (size, size,__pa (MAX_DMA_ADDRESS ), nid); }#endif /* !CONFIG_SPARSEMEM_VMEMMAP */
Signature · 2 lines
Thanks Kaitao Cheng
Lorenzo Stoakes (ARM)
reviewerQuoted 34 lines · Kaitao Cheng
From: Kaitao Cheng <[email protected]>
Commit
ffe55393137c("mm/sparse: remove sparse buffer pre-allocation mechanism") removedsparse_buffer_init(), which was the only caller ofmemmap_alloc()that passed true forexact_nid.All remaining callers pass false, leaving the exact-node allocation branch unreachable. Remove the
exact_nidparameter and unconditionally usememblock_alloc_try_nid_raw().This has no functional impact.
Signed-off-by Kaitao Cheng <[email protected]>--- mm/mm_init.c | 14 ++++---------- mm/mm_init.h | 4 ++-- mm/sparse-vmemmap.c | 2 +- mm/sparse.c | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-)mm/mm_init.c +1
-1@@ -1601,7 +1601,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat) }void __init *memmap_alloc (phys_addr_t size,phys_addr_t align, -phys_addr_t min_addr,int nid,bool exact_nid) +phys_addr_t min_addr,int nid) {void *ptr;
mm/mm_init.c void __init *memmap_alloc(phys_addr_t size, phys_addr_t align, · line 1615
Quoted 7 lines
mm/mm_init.c +0
-4@@ -1609,14 +1609,8 @@ void __init *memmap_alloc(phys_addr_t size, phys_addr_t align,* Kmemleak will explicitly scan mem_map by traversing all valid * `struct *page`,so memblock does not need to be added to the scan list. */ -if (exact_nid) - ptr =memblock_alloc_exact_nid_raw (size, align, min_addr, -MEMBLOCK_ALLOC_NOLEAKTRACE , - nid);
I don't see anything else _in the kernel_ reference memblock_alloc_exact_nid_raw(), though I do see some stuff in tools/testing/memblock/tests/alloc_exact_nid_api.c.
So I suggest removing memblock_alloc_exact_nid_raw() and tools/testing/memblock/tests/alloc_exact_nid_api.c (and updating the testing to account for it as necessary) too.
Also I see both memblock_alloc_try_nid_raw(), memblock_alloc_exact_nid_raw() and memblock_alloc_try_nid() call memblock_alloc_internal() with an exact_nid last parameter too.
Only memblock_alloc_exact_nid_raw(), which you should delete, passes this parameter as true, so you should drop this parameter too.
AND THEN :) it passes exact_nid to memblock_alloc_range_nid() and... I leave it to you to go investigate if that ever has exact_nid=true passed there.
Let's clean this up all the way please!
Quoted 60 lines
mm/mm_init.c +3
-5-else - ptr =memblock_alloc_try_nid_raw (size, align, min_addr, -MEMBLOCK_ALLOC_NOLEAKTRACE , - nid); + ptr =memblock_alloc_try_nid_raw (size, align, min_addr, +MEMBLOCK_ALLOC_NOLEAKTRACE , nid);if (ptr && size >0 )page_init_poison (ptr, size);@@ -1644,7 +1638,7 @@ static void __init alloc_node_mem_map(struct pglist_data *pgdat) end =ALIGN (pgdat_end_pfn (pgdat),MAX_ORDER_NR_PAGES ); size = (end - start) *sizeof (struct page ); map =memmap_alloc (size,SMP_CACHE_BYTES ,MEMBLOCK_LOW_LIMIT , - pgdat->node_id, false); + pgdat->node_id);if (!map)panic ("Failed to allocate %ld bytes for node %d memory map\n" , size, pgdat->node_id);mm/mm_init.h +2
-2@@ -31,8 +31,8 @@ static inline void clear_zone_contiguous(struct zone *zone)void memblock_free_pages (unsigned long pfn,unsigned int order); -void *memmap_alloc (phys_addr_t size,phys_addr_t align,phys_addr_t min_addr, -int nid,bool exact_nid); +void *memmap_alloc (phys_addr_t size,phys_addr_t align, +phys_addr_t min_addr,int nid); void memmap_init_range(unsigned long size, int nid, unsigned long zone, unsigned long start_pfn, unsigned long zone_end_pfn,mm/sparse-vmemmap.c +1
-1@@ -53,7 +53,7 @@ static void * __ref __earlyonly_bootmem_alloc(int node,unsigned long align, unsigned long goal) { - return memmap_alloc(size, align, goal, node, false); + return memmap_alloc(size, align, goal, node); }void *__meminit vmemmap_alloc_block (unsigned long size,int node)mm/sparse.c +1
-2@@ -215,7 +215,7 @@ struct page __init *__populate_section_memmap(unsigned long pfn, {const unsigned long size =PAGE_ALIGN (sizeof (struct page ) *PAGES_PER_SECTION ); -return memmap_alloc (size, size,__pa (MAX_DMA_ADDRESS ), nid, false); +return memmap_alloc (size, size,__pa (MAX_DMA_ADDRESS ), nid); }#endif /* !CONFIG_SPARSEMEM_VMEMMAP */ --
Quoted 2 lines
2.54.0 (Apple Git-157)
--
Cheers, Lorenzo