Re: [PATCH v2 2/2] memblock: exclude MEMBLOCK_NOMAP regions from kmemleak

From: Catalin Marinas
Date: Thu Oct 21 2021 - 04:32:23 EST


On Thu, Oct 21, 2021 at 10:09:29AM +0300, Mike Rapoport wrote:
> diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
> index f9383736fa0f..71419eb16e09 100644
> --- a/drivers/acpi/tables.c
> +++ b/drivers/acpi/tables.c
> @@ -21,6 +21,7 @@
> #include <linux/earlycpio.h>
> #include <linux/initrd.h>
> #include <linux/security.h>
> +#include <linux/kmemleak.h>
> #include "internal.h"
>
> #ifdef CONFIG_ACPI_CUSTOM_DSDT
> @@ -601,6 +602,8 @@ void __init acpi_table_upgrade(void)
> */
> arch_reserve_mem_area(acpi_tables_addr, all_tables_size);
>
> + kmemleak_ignore_phys(acpi_tables_addr);
> +
> /*
> * early_ioremap only can remap 256k one time. If we map all
> * tables one time, we will hit the limit. Need to map chunks
> diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
> index 59c1390cdf42..9da8835ba5a5 100644
> --- a/drivers/of/of_reserved_mem.c
> +++ b/drivers/of/of_reserved_mem.c
> @@ -21,6 +21,7 @@
> #include <linux/sort.h>
> #include <linux/slab.h>
> #include <linux/memblock.h>
> +#include <linux/kmemleak.h>
>
> #include "of_private.h"
>
> @@ -46,6 +47,7 @@ static int __init early_init_dt_alloc_reserved_memory_arch(phys_addr_t size,
> err = memblock_mark_nomap(base, size);
> if (err)
> memblock_free(base, size);
> + kmemleak_ignore_phys(base);
> }
>
> return err;

More of a nitpick as there's no kmemleak scanning to race with during
early boot: I'd normally call kmemleak_ignore_phys() before marking it
nomap. Either way:

Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx>