summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorMike Rapoport (Microsoft) <rppt@kernel.org>2024-11-29 11:13:47 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-01-09 13:31:40 +0100
commit1864d4712c4b3b46a23ddddfbf5d3399b50ae161 (patch)
tree8dc340a02d38d2b1d92b5498e788dc5d6819fb17 /mm
parent6fdc770506eb8379bf68a49d4e193c8364ac64e0 (diff)
downloadlinux-1864d4712c4b3b46a23ddddfbf5d3399b50ae161.tar.gz
linux-1864d4712c4b3b46a23ddddfbf5d3399b50ae161.tar.bz2
linux-1864d4712c4b3b46a23ddddfbf5d3399b50ae161.zip
memblock: allow zero threshold in validate_numa_converage()
[ Upstream commit 9cdc6423acb49055efb444ecd895d853a70ef931 ] 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/Z0mIDBD4KLyxyOCm@kernel.org/ Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memblock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memblock.c b/mm/memblock.c
index 3a3ab73546f5..87a2b4340ce4 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -738,7 +738,7 @@ int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)
/**
* memblock_validate_numa_coverage - check if amount of memory with
* no node ID assigned is less than a threshold
- * @threshold_bytes: maximal number of pages that can have unassigned node
+ * @threshold_bytes: maximal memory size that can have unassigned node
* ID (in bytes).
*
* A buggy firmware may report memory that does not belong to any node.
@@ -758,7 +758,7 @@ bool __init_memblock memblock_validate_numa_coverage(unsigned long threshold_byt
nr_pages += end_pfn - start_pfn;
}
- if ((nr_pages << PAGE_SHIFT) >= threshold_bytes) {
+ if ((nr_pages << PAGE_SHIFT) > threshold_bytes) {
mem_size_mb = memblock_phys_mem_size() >> 20;
pr_err("NUMA: no nodes coverage for %luMB of %luMB RAM\n",
(nr_pages << PAGE_SHIFT) >> 20, mem_size_mb);