Skip to content

Commit 2cec2d9

Browse files
rpptgregkh
authored andcommitted
memblock: allow zero threshold in validate_numa_converage()
commit 9cdc642 upstream. Currently memblock validate_numa_converage() returns false negative when threshold set to zero. Make the check if the memory size with invalid node ID is greater than the threshold exclusive to fix that. Link: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Mike Rapoport (Microsoft) <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5c63e24 commit 2cec2d9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mm/memblock.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)
735735
/**
736736
* memblock_validate_numa_coverage - check if amount of memory with
737737
* no node ID assigned is less than a threshold
738-
* @threshold_bytes: maximal number of pages that can have unassigned node
738+
* @threshold_bytes: maximal memory size that can have unassigned node
739739
* ID (in bytes).
740740
*
741741
* A buggy firmware may report memory that does not belong to any node.
@@ -755,7 +755,7 @@ bool __init_memblock memblock_validate_numa_coverage(unsigned long threshold_byt
755755
nr_pages += end_pfn - start_pfn;
756756
}
757757

758-
if ((nr_pages << PAGE_SHIFT) >= threshold_bytes) {
758+
if ((nr_pages << PAGE_SHIFT) > threshold_bytes) {
759759
mem_size_mb = memblock_phys_mem_size() >> 20;
760760
pr_err("NUMA: no nodes coverage for %luMB of %luMB RAM\n",
761761
(nr_pages << PAGE_SHIFT) >> 20, mem_size_mb);

0 commit comments

Comments
 (0)