Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aedf95ea authored by Catalin Marinas's avatar Catalin Marinas Committed by Linus Torvalds
Browse files

mm/memblock.c: call kmemleak directly from memblock_(alloc|free) 



Kmemleak could ignore memory blocks allocated via memblock_alloc()
leading to false positives during scanning.  This patch adds the
corresponding callbacks and removes kmemleak_free_* calls in
mm/nobootmem.c to avoid duplication.

The kmemleak_alloc() in mm/nobootmem.c is kept since
__alloc_memory_core_early() does not use memblock_alloc() directly.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 17411962

mm/memblock.c

+8 −2
Original line number Diff line number Diff line
@@ -691,6 +691,7 @@ int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size) 
		     (unsigned long long)base + size - 1,

		     (void *)_RET_IP_);



	kmemleak_free_part(__va(base), size);

	return memblock_remove_range(&memblock.reserved, base, size);

}
@@ -1043,9 +1044,14 @@ static phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size, 
		align = SMP_CACHE_BYTES;



	found = memblock_find_in_range_node(size, align, start, end, nid);

	if (found && !memblock_reserve(found, size))

	if (found && !memblock_reserve(found, size)) {

		/*

		 * The min_count is set to 0 so that memblock allocations are

		 * never reported as leaks.

		 */

		kmemleak_alloc(__va(found), size, 0, 0);

		return found;



	}

	return 0;

}

mm/nobootmem.c

+0 −2
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ unsigned long __init free_all_bootmem(void) 
void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,

			      unsigned long size)

{

	kmemleak_free_part(__va(physaddr), size);

	memblock_free(physaddr, size);

}
@@ -212,7 +211,6 @@ void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, 
 */

void __init free_bootmem(unsigned long addr, unsigned long size)

{

	kmemleak_free_part(__va(addr), size);

	memblock_free(addr, size);

}