Re: [PATCH] kmemleak: Add support for NO_BOOTMEM configurations

Yinghai Lu
2010-07-15T17:21:52Z

should be for 2.6.34 and 2.6.35.

Thanks

Yinghai

On 07/15/2010 07:58 AM, Catalin Marinas wrote:
> 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>
> Cc: Pekka Enberg <penberg@cs.helsinki.fi>
> Cc: Yinghai Lu <yinghai@kernel.org>
> Cc: H. Peter Anvin <hpa@zytor.com>
> ---
> kernel/early_res.c | 6 ++++++
> mm/page_alloc.c | 5 +++++
> 2 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/kernel/early_res.c b/kernel/early_res.c
> index 31aa933..7bfae88 100644
> --- a/kernel/early_res.c
> +++ b/kernel/early_res.c
> @@ -7,6 +7,8 @@
> #include <linux/bootmem.h>
> #include <linux/mm.h>
> #include <linux/early_res.h>
> +#include <linux/slab.h>
> +#include <linux/kmemleak.h>
>
> /*
> * Early reserved memory areas.
> @@ -319,6 +321,8 @@ void __init free_early(u64 start, u64 end)
> struct early_res *r;
> int i;
>
> + kmemleak_free_part(__va(start), end - start);
> +
> i = find_overlapped_early(start, end);
> r = &early_res[i];
> 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;
> int i;
>
> + kmemleak_free_part(__va(start), end - start);
> +
> if (start == end)
> return;
>
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index 431214b..68319dd 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -3659,6 +3659,11 @@ void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,
> ptr = phys_to_virt(addr);
> memset(ptr, 0, size);
> 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;
> }
>