Skip to content

Commit 658aafc

Browse files
rppttorvalds
authored andcommitted
memblock: exclude MEMBLOCK_NOMAP regions from kmemleak
Vladimir Zapolskiy reports: Commit a7259df ("memblock: make memblock_find_in_range method private") invokes a kernel panic while running kmemleak on OF platforms with nomaped regions: Unable to handle kernel paging request at virtual address fff000021e00000 [...] scan_block+0x64/0x170 scan_gray_list+0xe8/0x17c kmemleak_scan+0x270/0x514 kmemleak_write+0x34c/0x4ac The memory allocated from memblock is registered with kmemleak, but if it is marked MEMBLOCK_NOMAP it won't have linear map entries so an attempt to scan such areas will fault. Ideally, memblock_mark_nomap() would inform kmemleak to ignore MEMBLOCK_NOMAP memory, but it can be called before kmemleak interfaces operating on physical addresses can use __va() conversion. Make sure that functions that mark allocated memory as MEMBLOCK_NOMAP take care of informing kmemleak to ignore such memory. Link: https://lore.kernel.org/all/[email protected] Link: https://lore.kernel.org/all/[email protected] Fixes: a7259df ("memblock: make memblock_find_in_range method private") Reported-by: Vladimir Zapolskiy <[email protected]> Signed-off-by: Mike Rapoport <[email protected]> Reviewed-by: Catalin Marinas <[email protected]> Tested-by: Vladimir Zapolskiy <[email protected]> Tested-by: Qian Cai <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 6c9a545 commit 658aafc

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

drivers/acpi/tables.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <linux/earlycpio.h>
2222
#include <linux/initrd.h>
2323
#include <linux/security.h>
24+
#include <linux/kmemleak.h>
2425
#include "internal.h"
2526

2627
#ifdef CONFIG_ACPI_CUSTOM_DSDT
@@ -601,6 +602,8 @@ void __init acpi_table_upgrade(void)
601602
*/
602603
arch_reserve_mem_area(acpi_tables_addr, all_tables_size);
603604

605+
kmemleak_ignore_phys(acpi_tables_addr);
606+
604607
/*
605608
* early_ioremap only can remap 256k one time. If we map all
606609
* tables one time, we will hit the limit. Need to map chunks

drivers/of/of_reserved_mem.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <linux/sort.h>
2222
#include <linux/slab.h>
2323
#include <linux/memblock.h>
24+
#include <linux/kmemleak.h>
2425

2526
#include "of_private.h"
2627

@@ -46,6 +47,7 @@ static int __init early_init_dt_alloc_reserved_memory_arch(phys_addr_t size,
4647
err = memblock_mark_nomap(base, size);
4748
if (err)
4849
memblock_free(base, size);
50+
kmemleak_ignore_phys(base);
4951
}
5052

5153
return err;

mm/memblock.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -932,6 +932,9 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size)
932932
* covered by the memory map. The struct page representing NOMAP memory
933933
* frames in the memory map will be PageReserved()
934934
*
935+
* Note: if the memory being marked %MEMBLOCK_NOMAP was allocated from
936+
* memblock, the caller must inform kmemleak to ignore that memory
937+
*
935938
* Return: 0 on success, -errno on failure.
936939
*/
937940
int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size)

0 commit comments

Comments
 (0)