Commit 972fa3a7 authored by Calvin Zhang's avatar Calvin Zhang Committed by Linus Torvalds
Browse files

mm: kmemleak: alloc gray object for reserved region with direct map 

Reserved regions with direct mapping may contain references to other
regions.  CMA region with fixed location is reserved without creating
kmemleak_object for it.

So add them as gray kmemleak objects.

Link: https://lkml.kernel.org/r/20211123090641.3654006-1-calvinzhang.cool@gmail.com


Signed-off-by: default avatarCalvin Zhang <calvinzhang.cool@gmail.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Catalin 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 ad1a3e15

drivers/of/fdt.c

+5 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/serial_core.h>

#include <linux/sysfs.h>

#include <linux/random.h>

#include <linux/kmemleak.h>



#include <asm/setup.h>  /* for COMMAND_LINE_SIZE */

#include <asm/page.h>
@@ -522,9 +523,12 @@ static int __init __reserved_mem_reserve_reg(unsigned long node, 
		size = dt_mem_next_cell(dt_root_size_cells, &prop);



		if (size &&

		    early_init_dt_reserve_memory_arch(base, size, nomap) == 0)

		    early_init_dt_reserve_memory_arch(base, size, nomap) == 0) {

			pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %lu MiB\n",

				uname, &base, (unsigned long)(size / SZ_1M));

			if (!nomap)

				kmemleak_alloc_phys(base, size, 0, 0);

		}

		else

			pr_info("Reserved memory: failed to reserve memory for node '%s': base %pa, size %lu MiB\n",

				uname, &base, (unsigned long)(size / SZ_1M));