mm/memmap: Prevent double scanning of memmap by kmemleak
PATCH v3 1/1 mm/memmap: Prevent double scanning of memmap by kmemleak
kmemleak explicitly scans the mem_map through the valid struct page objects. However, memmap_alloc() was also adding this memory to the gray object list, causing it to be scanned twice. Removes memmap_alloc() from the scan list and adds a comment to clarify the behavior.
---
v1 -> v2: Fix CI: Recover __earlyonly_bootmem_alloc that is marked with __ref to prevent init section mismatch WARNING.
Links: https://lore.kernel.org/oe-kbuild-all/[email protected]/
v2 -> v3: Rebase on latest mm-everything and modified some minor comments.
Links: https://lore.kernel.org/lkml/[email protected]/
--- include/linux/memblock.h | 4 ++++ mm/mm_init.c | 8 ++++++-- mm/sparse-vmemmap.c | 5 +++-- 3 files changed, 13 insertions(+), 4 deletions(-)
include/linux/memblock.h +4 -0
@@ -378,6 +378,10 @@ static inline int memblock_get_region_node(const struct memblock_region *r)/* Flags for memblock allocation APIs */ #define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0)#define MEMBLOCK_ALLOC_ACCESSIBLE 0 +/* +* MEMBLOCK_ALLOC_NOLEAKTRACE avoids kmemleak tracing. It implies +* MEMBLOCK_ALLOC_ACCESSIBLE +*/ #define MEMBLOCK_ALLOC_NOLEAKTRACE 1/* We are using top down, so it is safe to use 0 here */
mm/mm_init.c +6 -2
@@ -1585,13 +1585,17 @@ void __init *memmap_alloc(phys_addr_t size, phys_addr_t align, {void *ptr; +/* +* Kmemleak will explicitly scan mem_map by traversing all valid +* `struct *page`,so memblock does not need to be added to the scan list. +*/ if (exact_nid) ptr =memblock_alloc_exact_nid_raw (size, align, min_addr, -MEMBLOCK_ALLOC_ACCESSIBLE , +MEMBLOCK_ALLOC_NOLEAKTRACE , nid);else ptr =memblock_alloc_try_nid_raw (size, align, min_addr, -MEMBLOCK_ALLOC_ACCESSIBLE , +MEMBLOCK_ALLOC_NOLEAKTRACE , nid);if (ptr && size >0 )
mm/sparse-vmemmap.c +3 -2
@@ -31,6 +31,8 @@#include <asm/dma.h> #include <asm/pgalloc.h> +#include "internal.h" +/* * Allocate a block of memory to be used to back the virtual memory map * or to back the page tables that are used to create the mapping.
@@ -42,8 +44,7 @@ static void * __ref __earlyonly_bootmem_alloc(int node,unsigned long align, unsigned long goal) { - return memblock_alloc_try_nid_raw(size, align, goal, -MEMBLOCK_ALLOC_ACCESSIBLE ,node ); + return memmap_alloc(size, align, goal, node, false); }void *__meminit vmemmap_alloc_block (unsigned long size,int node)
Signature · 1 line
2.25.1
Quoted 8 lines · Guo Weikang
kmemleak explicitly scans the
mem_mapthrough the valid struct page objects. However,memmap_alloc()was also adding this memory to the gray object list, causing it to be scanned twice. Removesmemmap_alloc()from the scan list and adds a comment to clarify the behavior.Signed-off-by Guo Weikang <[email protected]>