[PATCH v2 1/3] mm: use memblock_alloc_range_nid() and memblock_alloc_range()

[Akinobu Mita]

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.

Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Cc: Sabrina Dubroca <sd@xxxxxxxxxxxxxxx>
Cc: linux-mm@xxxxxxxxx
---
* v2: fix overlapping kmemleak_alloc() calls, reported by Sabrina Dubroca.

 mm/memblock.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/mm/memblock.c b/mm/memblock.c
index 70fad0c..a942f6e 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -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:
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/