memblock: fix memblock_estimated_nr_free_pages() for soft-reserved memory
PATCH 1/1 memblock: fix memblock_estimated_nr_free_pages() for soft-reserved memory
memblock_estimated_nr_free_pages() returns the difference between the total size of the "memory" memblock type and the "reserved" memblock type.
The "soft-reserved" memory regions are added to the "reserved" memblock type, but not to the "memory" memblock type. Therefore, memblock_estimated_nr_free_pages() may return a smaller value than expected, or if it underflows, an extremely large value.
/proc/sys/kernel/threads-max is determined by the value of memblock_estimated_nr_free_pages(). This issue was discovered on machines with CXL memory because kernel.threads-max was either smaller than expected or extremely large for the installed DRAM size.
This fixes the issue by improving the accuracy of memblock_estimated_nr_free_pages() by subtracting only the overlapping size of regions with "memory" and "reserved" memblock types.
--- mm/memblock.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)
mm/memblock.c +32 -1
@@ -1812,6 +1812,22 @@ phys_addr_t __init_memblock memblock_reserved_kern_size(phys_addr_t limit, int nreturn total; } +static phys_addr_t __init memblock_addrs_overlap_size (phys_addr_t base1,phys_addr_t size1, +phys_addr_t base2,phys_addr_t size2) +{ +phys_addr_t start, end; + +if (!memblock_addrs_overlap (base1, size1, base2, size2)) +return 0 ; + +memblock_cap_size (base1, &size1); +memblock_cap_size (base2, &size2); + start =max (base1, base2); + end =min (base1 + size1, base2 + size2); + +return end - start; +} +/** * memblock_estimated_nr_free_pages - return estimated number of free pages * from memblock point of view
@@ -1826,7 +1842,22 @@ phys_addr_t __init_memblock memblock_reserved_kern_size(phys_addr_t limit, int n*/ unsigned long __init memblock_estimated_nr_free_pages (void ) { -return PHYS_PFN (memblock_phys_mem_size () -memblock_reserved_size ()); +int memory_idx, reserved_idx; +struct memblock_type *memory_type = &memblock.memory; +struct memblock_type *reserved_type = &memblock.reserved; +struct memblock_region *memory_region, *reserved_region; +phys_addr_t phys_mem_size =0 ; + +for_each_memblock_type (memory_idx, memory_type, memory_region) { + phys_mem_size += memory_region->size; +for_each_memblock_type (reserved_idx, reserved_type, reserved_region) { + phys_mem_size -=memblock_addrs_overlap_size (memory_region->base, + memory_region->size, reserved_region->base, + reserved_region->size); + } + } + +return PHYS_PFN (phys_mem_size); }/* lowest address */
Signature · 1 line
2.43.0
Mike Rapoport
maintainer(added Dan Williams)
Hi,
Quoted 5 lines · Akinobu Mita
memblock_estimated_nr_free_pages()returns the difference between the total size of the "memory" memblock type and the "reserved" memblock type.The "soft-reserved" memory regions are added to the "reserved" memblock type, but not to the "memory" memblock type. Therefore,
@Dan, do we really need to memblock_reserve() the E820_TYPE_SOFT_RESERVED ranges?
Quick scan didn't show anything that requires this, but I could easily miss something.
Quoted 21 lines
memblock_estimated_nr_free_pages()may return a smaller value than expected, or if it underflows, an extremely large value.
/proc/sys/kernel/threads-maxis determined by the value ofmemblock_estimated_nr_free_pages(). This issue was discovered on machines with CXL memory because kernel.threads-max was either smaller than expected or extremely large for the installed DRAM size.This fixes the issue by improving the accuracy of
memblock_estimated_nr_free_pages()by subtracting only the overlapping size of regions with "memory" and "reserved" memblock types.Signed-off-by Akinobu Mita <[email protected]>--- mm/memblock.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)mm/memblock.c +0
-0
...
mm/memblock.c phys_addr_t __init_memblock memblock_reserved_kern_size(phys_addr_t limit, int n · line 1829
Quoted 5 lines
mm/memblock.c +0
-1@@ -1826,7 +1842,22 @@ phys_addr_t __init_memblock memblock_reserved_kern_size(phys_addr_t limit, int n*/ unsigned long __init memblock_estimated_nr_free_pages (void ) { -return PHYS_PFN (memblock_phys_mem_size () -memblock_reserved_size ());
We have memblock_reserved_kern_size() that tells how much memory was reserved from the actual RAM. Replacing memblock_reserved_size() with memblock_reserved_kern_size() will omit "soft-reserved" ranges.
Quoted 22 lines
mm/memblock.c +16
-0+int memory_idx, reserved_idx; +struct memblock_type *memory_type = &memblock.memory; +struct memblock_type *reserved_type = &memblock.reserved; +struct memblock_region *memory_region, *reserved_region; +phys_addr_t phys_mem_size =0 ; + +for_each_memblock_type (memory_idx, memory_type, memory_region) { + phys_mem_size += memory_region->size; +for_each_memblock_type (reserved_idx, reserved_type, reserved_region) { + phys_mem_size -=memblock_addrs_overlap_size (memory_region->base, + memory_region->size, reserved_region->base, + reserved_region->size); + } + } + +return PHYS_PFN (phys_mem_size); }/* lowest address */ Signature · 1 line
2.43.0
Signature · 2 lines
Sincerely yours, Mike.
2025年11月5日(水) 2:18 Mike Rapoport <[email protected]>:
Quoted 41 lines
(added Dan Williams)
Hi,
Quoted 5 lines · Akinobu Mita
memblock_estimated_nr_free_pages()returns the difference between the total size of the "memory" memblock type and the "reserved" memblock type.The "soft-reserved" memory regions are added to the "reserved" memblock type, but not to the "memory" memblock type. Therefore,
@Dan, do we really need to
memblock_reserve()theE820_TYPE_SOFT_RESERVEDranges?
Quick scan didn't show anything that requires this, but I could easily miss something.Quoted 21 lines
memblock_estimated_nr_free_pages()may return a smaller value than expected, or if it underflows, an extremely large value.
/proc/sys/kernel/threads-maxis determined by the value ofmemblock_estimated_nr_free_pages(). This issue was discovered on machines with CXL memory because kernel.threads-max was either smaller than expected or extremely large for the installed DRAM size.This fixes the issue by improving the accuracy of
memblock_estimated_nr_free_pages()by subtracting only the overlapping size of regions with "memory" and "reserved" memblock types.Signed-off-by Akinobu Mita <[email protected]>--- mm/memblock.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)mm/memblock.c +0
-0...
Quoted 9 lines
mm/memblock.c phys_addr_t __init_memblock memblock_reserved_kern_size(phys_addr_t limit, int n · line 1829
Quoted 5 lines
mm/memblock.c +0
-1@@ -1826,7 +1842,22 @@ phys_addr_t __init_memblock memblock_reserved_kern_size(phys_addr_t limit, int n*/ unsigned long __init memblock_estimated_nr_free_pages (void ) { -return PHYS_PFN (memblock_phys_mem_size () -memblock_reserved_size ());We have
memblock_reserved_kern_size()that tells how much memory was reserved from the actual RAM. Replacingmemblock_reserved_size()withmemblock_reserved_kern_size()will omit "soft-reserved" ranges.
Replacing memblock_reserved_size() with memblock_reserved_kern_size( MEMBLOCK_ALLOC_ANYWHERE, NUMA_NO_NODE) also fixed the problem. Thank you.
PATCH v2 1/1 memblock: fix memblock_estimated_nr_free_pages() for soft-reserved memory
In reply to Mike Rapoportmemblock_estimated_nr_free_pages() returns the difference between the total size of the "memory" memblock type and the "reserved" memblock type.
The "soft-reserved" memory regions are added to the "reserved" memblock type, but not to the "memory" memblock type. Therefore, memblock_estimated_nr_free_pages() may return a smaller value than expected, or if it underflows, an extremely large value.
/proc/sys/kernel/threads-max is determined by the value of memblock_estimated_nr_free_pages(). This issue was discovered on machines with CXL memory because kernel.threads-max was either smaller than expected or extremely large for the installed DRAM size.
This fixes the issue by replacing memblock_reserved_size() with memblock_reserved_kern_size() that tells how much memory was reserved from the actual RAM.
---
v2: instead of subtracting only the overlapping size,
replace memblock_reserved_size() with memblock_reserved_kern_size()
mm/memblock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/memblock.c +2 -1
@@ -1826,7 +1826,8 @@ phys_addr_t __init_memblock memblock_reserved_kern_size(phys_addr_t limit, int n*/ unsigned long __init memblock_estimated_nr_free_pages (void ) { -return PHYS_PFN (memblock_phys_mem_size () -memblock_reserved_size ()); +return PHYS_PFN (memblock_phys_mem_size () - +memblock_reserved_kern_size (MEMBLOCK_ALLOC_ANYWHERE ,NUMA_NO_NODE )); }/* lowest address */
Signature · 1 line
2.43.0
From: Mike Rapoport (Microsoft) <[email protected]>
Quoted 9 lines · Akinobu Mita
memblock_estimated_nr_free_pages()returns the difference between the total size of the "memory" memblock type and the "reserved" memblock type.The "soft-reserved" memory regions are added to the "reserved" memblock type, but not to the "memory" memblock type. Therefore,
memblock_estimated_nr_free_pages()may return a smaller value than expected, or if it underflows, an extremely large value.[...]
Applied to fixes branch of memblock.git tree, thanks!
[1/1] memblock: fix memblock_estimated_nr_free_pages() for soft-reserved memory
commit: c42af83c59b65d01c0f7a074e450bbbb43b22f0d
tree: https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
branch: fixes
In the future please start a new thread when sending the next version of a patch.
--
Sincerely yours,
Mike.