mm: use memblock_alloc_range_nid() and memblock_alloc_range()
PATCH v2 1/3 mm: use memblock_alloc_range_nid() and memblock_alloc_range()
memblock_alloc_range_nid() is equivalent to memblock_find_in_range_node() followed by memblock_reserve(). memblock_alloc_range() is equivalent to memblock_alloc_range_nid() with NUMA_NO_NODE for any node.
Convert to use these functions and remove subsequent kmemleak_alloc() call as it is already called in memblock_alloc() and its variants.
This is just a cleanup.
---
* v2: fix overlapping kmemleak_alloc() calls, reported by Sabrina Dubroca.
mm/memblock.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
mm/memblock.c +2 -16
@@ -1150,21 +1150,16 @@ static void * __init memblock_virt_alloc_internal(if (WARN_ON_ONCE (slab_is_available ()))return kzalloc_node (size,GFP_NOWAIT , nid); -if (!align) - align =SMP_CACHE_BYTES ; -if (max_addr > memblock.current_limit) max_addr = memblock.current_limit; again: - alloc =memblock_find_in_range_node (size, align, min_addr, max_addr, - nid); + alloc =memblock_alloc_range_nid (size, align, min_addr, max_addr, nid);if (alloc) goto done;if (nid !=NUMA_NO_NODE ) { - alloc =memblock_find_in_range_node (size, align, min_addr, - max_addr,NUMA_NO_NODE ); + alloc =memblock_alloc_range (size, align, min_addr, max_addr);if (alloc) goto done; }
@@ -1177,18 +1172,9 @@ again: } done: -memblock_reserve (alloc, size); ptr =phys_to_virt (alloc);memset (ptr,0 , size); -/* -* The min_count is set to 0 so that bootmem allocated blocks -* are never reported as leaks. This is because many of these blocks -* are only referred via the physical address which is not -* looked up by kmemleak. -*/ -kmemleak_alloc (ptr, size,0 ,0 ); -return ptr; error:
Signature · 7 lines
1.9.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH v2 2/3 x86: use memblock_alloc_range()
memblock_alloc_range() is equivalent to memblock_find_in_range() followed by memblock_reserve(). Convert to use it where possible.
This is mainly a cleanup. Also, memblock_alloc_range() calls kmemleak_alloc() for allocated memory block with min_count of 0, so that it is never reported as leaks.
---
* v2: split from membloc_alloc_base() conversions.
arch/x86/kernel/aperture_64.c | 6 +++--- arch/x86/kernel/setup.c | 17 ++++++++--------- arch/x86/mm/init.c | 7 +++---- 3 files changed, 14 insertions(+), 16 deletions(-)
arch/x86/kernel/aperture_64.c +3 -3
@@ -74,14 +74,14 @@ static u32 __init allocate_aperture(void)* memory. Unfortunately we cannot move it up because that would * make the IOMMU useless. */ - addr =memblock_find_in_range (GART_MIN_ADDR ,GART_MAX_ADDR , - aper_size, aper_size); + addr =memblock_alloc_range (aper_size, aper_size, +GART_MIN_ADDR ,GART_MAX_ADDR ); +if (!addr) {pr_err ("Cannot allocate aperture memory hole [mem %#010lx-%#010lx] (%uKB)\n" , addr, addr + aper_size -1 , aper_size >>10 );return 0 ; } -memblock_reserve (addr, aper_size);pr_info ("Mapping aperture over RAM [mem %#010lx-%#010lx] (%uKB)\n" , addr, addr + aper_size -1 , aper_size >>10 ); register_nosave_region(addr >> PAGE_SHIFT,
arch/x86/kernel/setup.c +8 -9
@@ -545,8 +545,8 @@ static void __init reserve_crashkernel_low(void)return ; } - low_base =memblock_find_in_range (low_size, (1ULL <<32 ), - low_size, alignment); + low_base =memblock_alloc_range (low_size, alignment, + low_size,1ULL <<32 );if (!low_base) {if (!auto_set)
@@ -555,7 +555,6 @@ static void __init reserve_crashkernel_low(void)return ; } -memblock_reserve (low_base, low_size); pr_info("Reserving %ldMB of low memory at %ldMB for crashkernel (System low RAM: %ldMB)\n", (unsigned long)(low_size >> 20), (unsigned long)(low_base >> 20),
@@ -593,10 +592,10 @@ static void __init reserve_crashkernel(void)/* * kexec want bzImage is below CRASH_KERNEL_ADDR_MAX */ - crash_base =memblock_find_in_range (alignment, + crash_base =memblock_alloc_range (crash_size, alignment, + alignment, high ?CRASH_KERNEL_ADDR_HIGH_MAX : -CRASH_KERNEL_ADDR_LOW_MAX , - crash_size, alignment); +CRASH_KERNEL_ADDR_LOW_MAX );if (!crash_base) {pr_info ("crashkernel reservation failed - No suitable area found.\n" );
@@ -606,14 +605,14 @@ static void __init reserve_crashkernel(void) }else {unsigned long long start; - start =memblock_find_in_range (crash_base, - crash_base + crash_size, crash_size,1 <<20 ); + start =memblock_alloc_range (crash_size,1 <<20 , + crash_base, + crash_base + crash_size);if (start != crash_base) {pr_info ("crashkernel reservation failed - memory is in use.\n" );return ; } } -memblock_reserve (crash_base, crash_size); printk(KERN_INFO "Reserving %ldMB of memory at %ldMB " "for crashkernel (System RAM: %ldMB)\n",
arch/x86/mm/init.c +3 -4
@@ -61,12 +61,11 @@ __ref void *alloc_low_pages(unsigned int num)unsigned long ret;if (min_pfn_mapped >= max_pfn_mapped)panic ("alloc_low_pages: ran out of memory" ); - ret =memblock_find_in_range (min_pfn_mapped <<PAGE_SHIFT , - max_pfn_mapped <<PAGE_SHIFT , -PAGE_SIZE * num ,PAGE_SIZE ); + ret =memblock_alloc_range (PAGE_SIZE * num,PAGE_SIZE , + min_pfn_mapped <<PAGE_SHIFT , + max_pfn_mapped <<PAGE_SHIFT );if (!ret)panic ("alloc_low_pages: can not alloc memory" ); -memblock_reserve (ret,PAGE_SIZE * num); pfn = ret >>PAGE_SHIFT ; }else { pfn = pgt_buf_end;
Signature · 7 lines
1.9.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH v2 3/3 x86: use __memblock_alloc_base() and memblock_alloc_base()
In reply to Akinobu Mita__memblock_alloc_base() is equivalent to memblock_find_in_range() with the range starting from 0 and subsequent memblock_reserve() call. memblock_alloc_base() is similar to __memblock_alloc_base(), but it calls panic if the allocation fails. Convert to use these functions where possible.
This is mainly a cleanup. Also, memblock_alloc_base() and its variants call kmemleak_alloc() for allocated memory block with min_count of 0, so that it is never reported as leaks.
---
* v2: split from membloc_alloc_range() conversions, and avoid unexpected panic on allocation failure.
arch/x86/kernel/setup.c | 9 ++------- arch/x86/mm/numa.c | 4 +--- arch/x86/mm/numa_emulation.c | 5 ++--- arch/x86/realmode/init.c | 5 +---- 4 files changed, 6 insertions(+), 17 deletions(-)
arch/x86/kernel/setup.c +2 -7
@@ -327,16 +327,11 @@ static void __init relocate_initrd(void)char *p, *q;/* We need to move the initrd down into directly mapped mem */ - relocated_ramdisk =memblock_find_in_range (0 ,PFN_PHYS (max_pfn_mapped), - area_size,PAGE_SIZE ); - -if (!relocated_ramdisk) -panic ("Cannot find place for new RAMDISK of size %lld\n" , - ramdisk_size); + relocated_ramdisk =memblock_alloc_base (area_size,PAGE_SIZE , +PFN_PHYS (max_pfn_mapped));/* Note: this includes all the mem currently occupied by the initrd, we rely on that fact to keep the data intact. */ -memblock_reserve (relocated_ramdisk, area_size); initrd_start = relocated_ramdisk +PAGE_OFFSET ; initrd_end = initrd_start + ramdisk_size; printk(KERN_INFO "Allocated new RAMDISK: [mem %#010llx-%#010llx]\n",
arch/x86/mm/numa.c +1 -3
@@ -375,15 +375,13 @@ static int __init numa_alloc_distance(void) cnt++; size = cnt * cnt *sizeof (numa_distance[0 ]); - phys =memblock_find_in_range (0 ,PFN_PHYS (max_pfn_mapped), - size,PAGE_SIZE ); + phys =__memblock_alloc_base (size,PAGE_SIZE ,PFN_PHYS (max_pfn_mapped));if (!phys) {pr_warning ("NUMA: Warning: can't allocate distance table!\n" );/* don't retry until explicitly reset */ numa_distance = (void *)1LU ;return -ENOMEM ; } -memblock_reserve (phys, size); numa_distance =__va (phys); numa_distance_cnt = cnt;
arch/x86/mm/numa_emulation.c +2 -3
@@ -357,13 +357,12 @@ void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt)if (numa_dist_cnt) {u64 phys; - phys =memblock_find_in_range (0 ,PFN_PHYS (max_pfn_mapped), - phys_size,PAGE_SIZE ); + phys =__memblock_alloc_base (phys_size,PAGE_SIZE , +PFN_PHYS (max_pfn_mapped));if (!phys) {pr_warning ("NUMA: Warning: can't allocate copy of distance table, disabling emulation\n" ); goto no_emu; } -memblock_reserve (phys, phys_size); phys_dist =__va (phys);for (i =0 ; i < numa_dist_cnt; i++)
arch/x86/realmode/init.c +1 -4
@@ -15,12 +15,9 @@ void __init reserve_real_mode(void)size_t size =PAGE_ALIGN (real_mode_blob_end - real_mode_blob);/* Has to be under 1M so we can execute real-mode AP code. */ - mem =memblock_find_in_range (0 ,1 <<20 , size,PAGE_SIZE ); -if (!mem) -panic ("Cannot allocate trampoline\n" ); + mem =memblock_alloc_base (size,PAGE_SIZE ,1 <<20 ); base =__va (mem); -memblock_reserve (mem, size); real_mode_header = (struct real_mode_header *) base;printk (KERN_DEBUG "Base memory trampoline at [%p] %llx size %zu\n" , base, (unsigned long long )mem, size);
Signature · 7 lines
1.9.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>