Skip to content

Commit 6e44bd6

Browse files
committed
memblock: exclude 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 Indeed, NOMAP regions don't have linear map entries so an attempt to scan these areas would fault. Prevent such faults by excluding NOMAP regions from kmemleak. Link: https://lore.kernel.org/all/[email protected] Fixes: a7259df ("memblock: make memblock_find_in_range method private") Signed-off-by: Mike Rapoport <[email protected]> Tested-by: Vladimir Zapolskiy <[email protected]>
1 parent 64570fb commit 6e44bd6

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

mm/memblock.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,12 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size)
936936
*/
937937
int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size)
938938
{
939-
return memblock_setclr_flag(base, size, 1, MEMBLOCK_NOMAP);
939+
int ret = memblock_setclr_flag(base, size, 1, MEMBLOCK_NOMAP);
940+
941+
if (!ret)
942+
kmemleak_free_part_phys(base, size);
943+
944+
return ret;
940945
}
941946

942947
/**

0 commit comments

Comments
 (0)