fix allocation done in get_free_all_memory_range()
PATCH 1/1 fix allocation done in get_free_all_memory_range()
Even when get_max_mapped() returns a value beyond the DMA32 range, this can't be taken to mean an alocation from that range will succeed. Hence, the code should still fall back to an allocation starting at the bottom of memory if the first one failed.
Signed-off-by Jan Beulich <[email protected]>
--- kernel/early_res.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
kernel/early_res.c +5 -5
@@ -387,9 +387,7 @@ static void __init subtract_early_res(stint __init get_free_all_memory_range (struct range **rangep,int nodeid) {int i, count; -u64 start =0 , end; -u64 size; -u64 mem; +u64 end, size, mem =-1ULL ;struct range *range;int nr_range;
@@ -403,9 +401,11 @@ int __init get_free_all_memory_range(str end =get_max_mapped ();#ifdef MAX_DMA32_PFN if (end > (MAX_DMA32_PFN <<PAGE_SHIFT )) - start =MAX_DMA32_PFN <<PAGE_SHIFT ; + mem =find_fw_memmap_area (MAX_DMA32_PFN <<PAGE_SHIFT , end, + size,sizeof (struct range ));#endif - mem =find_fw_memmap_area (start, end, size,sizeof (struct range )); +if (mem ==-1ULL ) + mem =find_fw_memmap_area (0 , end, size,sizeof (struct range ));if (mem ==-1ULL )panic ("can not find more space for range free" );
Quoted 27 lines · Jan Beulich
Even when
get_max_mapped()returns a value beyond the DMA32 range, this can't be taken to mean an alocation from that range will succeed. Hence, the code should still fall back to an allocation starting at the bottom of memory if the first one failed.Signed-off-by Jan Beulich <[email protected]>--- kernel/early_res.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)kernel/early_res.c +1
-3@@ -387,9 +387,7 @@ static void __init subtract_early_res(stint __init get_free_all_memory_range (struct range **rangep,int nodeid) {int i, count; -u64 start =0 , end; -u64 size; -u64 mem; +u64 end, size, mem =-1ULL ;struct range *range;int nr_range;@@ -403,9 +401,11 @@ int __init get_free_all_memory_range(str end =get_max_mapped ();#ifdef MAX_DMA32_PFN
kernel/early_res.c int __init get_free_all_memory_range(str · line 410
Quoted 10 lines
kernel/early_res.c +4
-2if (end > (MAX_DMA32_PFN <<PAGE_SHIFT )) - start =MAX_DMA32_PFN <<PAGE_SHIFT ; + mem =find_fw_memmap_area (MAX_DMA32_PFN <<PAGE_SHIFT , end, + size,sizeof (struct range ));#endif - mem =find_fw_memmap_area (start, end, size,sizeof (struct range )); +if (mem ==-1ULL ) + mem =find_fw_memmap_area (0 , end, size,sizeof (struct range ));if (mem ==-1ULL )panic ("can not find more space for range free" );
Acked-by Yinghai Lu <[email protected]>
Thanks for catching it.
Yinghai