lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kmemleak: Add support for NO_BOOTMEM configurations

Browse Source 
With commits 08677214 and 59be5a8e, alloc_bootmem()/free_bootmem() and
friends use the early_res functions for memory management when
NO_BOOTMEM is enabled. This patch adds the kmemleak calls in the
corresponding code paths for bootmem allocations.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: stable@kernel.org
This commit is contained in:
Catalin Marinas
2010-07-19 11:54:15 +01:00
parent 7952f98818
commit 9078370c0d
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/early_res.c
View File

@@ -7,6 +7,8 @@
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/early_res.h> #include <linux/early_res.h>
#include <linux/slab.h>
#include <linux/kmemleak.h>
/* /*
* Early reserved memory areas. * Early reserved memory areas.
@@ -319,6 +321,8 @@ void __init free_early(u64 start, u64 end)
struct early_res *r; struct early_res *r;
int i; int i;
kmemleak_free_part(__va(start), end - start);
i = find_overlapped_early(start, end); i = find_overlapped_early(start, end);
r = &early_res[i]; r = &early_res[i];
if (i >= max_early_res || r->end != end || r->start != start) if (i >= max_early_res || r->end != end || r->start != start)
@@ -333,6 +337,8 @@ void __init free_early_partial(u64 start, u64 end)
struct early_res *r; struct early_res *r;
int i; int i;
kmemleak_free_part(__va(start), end - start);
if (start == end) if (start == end)
return; return;

5
mm/page_alloc.c
View File

@@ -3659,6 +3659,11 @@ void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,
ptr = phys_to_virt(addr); ptr = phys_to_virt(addr);
memset(ptr, 0, size); memset(ptr, 0, size);
reserve_early_without_check(addr, addr + size, "BOOTMEM"); reserve_early_without_check(addr, addr + size, "BOOTMEM");
/*
* The min_count is set to 0 so that bootmem allocated blocks
* are never reported as leaks.
*/
kmemleak_alloc(ptr, size, 0, 0);
return ptr; return ptr;
} }