From: Pekka Enberg <penberg@cs.helsinki.fi>
To: Catalin Marinas <catalin.marinas@arm.com>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Ingo Molnar <mingo@elte.hu>,
hannes@cmpxchg.org
Subject: Re: [RFC PATCH 2/3] kmemleak: Add callbacks to the bootmem allocator
Date: Tue, 07 Jul 2009 10:08:50 +0300 [thread overview]
Message-ID: <1246950530.24285.7.camel@penberg-laptop> (raw)
In-Reply-To: <20090706105155.16051.59597.stgit@pc1117.cambridge.arm.com>
On Mon, 2009-07-06 at 11:51 +0100, Catalin Marinas wrote:
> This patch adds kmemleak_alloc/free callbacks to the bootmem allocator.
> This would allow scanning of such blocks and help avoiding a whole class
> of false positives and more kmemleak annotations.
>
> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Ingo Molnar <mingo@elte.hu>
> Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Looks good to me!
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
But lets cc Johannes on this too.
> ---
> mm/bootmem.c | 36 +++++++++++++++++++++++++++++-------
> 1 files changed, 29 insertions(+), 7 deletions(-)
>
> diff --git a/mm/bootmem.c b/mm/bootmem.c
> index d2a9ce9..18858ad 100644
> --- a/mm/bootmem.c
> +++ b/mm/bootmem.c
> @@ -335,6 +335,8 @@ void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
> {
> unsigned long start, end;
>
> + kmemleak_free(__va(physaddr));
> +
> start = PFN_UP(physaddr);
> end = PFN_DOWN(physaddr + size);
>
> @@ -354,6 +356,8 @@ void __init free_bootmem(unsigned long addr, unsigned long size)
> {
> unsigned long start, end;
>
> + kmemleak_free_part(__va(addr), size);
> +
> start = PFN_UP(addr);
> end = PFN_DOWN(addr + size);
>
> @@ -597,7 +601,9 @@ restart:
> void * __init __alloc_bootmem_nopanic(unsigned long size, unsigned long align,
> unsigned long goal)
> {
> - return ___alloc_bootmem_nopanic(size, align, goal, 0);
> + void *ptr = ___alloc_bootmem_nopanic(size, align, goal, 0);
> + kmemleak_alloc(ptr, size, 1, GFP_KERNEL);
> + return ptr;
> }
>
> static void * __init ___alloc_bootmem(unsigned long size, unsigned long align,
> @@ -631,7 +637,9 @@ static void * __init ___alloc_bootmem(unsigned long size, unsigned long align,
> void * __init __alloc_bootmem(unsigned long size, unsigned long align,
> unsigned long goal)
> {
> - return ___alloc_bootmem(size, align, goal, 0);
> + void *ptr = ___alloc_bootmem(size, align, goal, 0);
> + kmemleak_alloc(ptr, size, 1, GFP_KERNEL);
> + return ptr;
> }
>
> static void * __init ___alloc_bootmem_node(bootmem_data_t *bdata,
> @@ -669,10 +677,14 @@ static void * __init ___alloc_bootmem_node(bootmem_data_t *bdata,
> void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size,
> unsigned long align, unsigned long goal)
> {
> + void *ptr;
> +
> if (WARN_ON_ONCE(slab_is_available()))
> return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id);
>
> - return ___alloc_bootmem_node(pgdat->bdata, size, align, goal, 0);
> + ptr = ___alloc_bootmem_node(pgdat->bdata, size, align, goal, 0);
> + kmemleak_alloc(ptr, size, 1, GFP_KERNEL);
> + return ptr;
> }
>
> #ifdef CONFIG_SPARSEMEM
> @@ -707,14 +719,18 @@ void * __init __alloc_bootmem_node_nopanic(pg_data_t *pgdat, unsigned long size,
> return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id);
>
> ptr = alloc_arch_preferred_bootmem(pgdat->bdata, size, align, goal, 0);
> + kmemleak_alloc(ptr, size, 1, GFP_KERNEL);
> if (ptr)
> return ptr;
>
> ptr = alloc_bootmem_core(pgdat->bdata, size, align, goal, 0);
> + kmemleak_alloc(ptr, size, 1, GFP_KERNEL);
> if (ptr)
> return ptr;
>
> - return __alloc_bootmem_nopanic(size, align, goal);
> + ptr = __alloc_bootmem_nopanic(size, align, goal);
> + kmemleak_alloc(ptr, size, 1, GFP_KERNEL);
> + return ptr;
> }
>
> #ifndef ARCH_LOW_ADDRESS_LIMIT
> @@ -737,7 +753,9 @@ void * __init __alloc_bootmem_node_nopanic(pg_data_t *pgdat, unsigned long size,
> void * __init __alloc_bootmem_low(unsigned long size, unsigned long align,
> unsigned long goal)
> {
> - return ___alloc_bootmem(size, align, goal, ARCH_LOW_ADDRESS_LIMIT);
> + void *ptr = ___alloc_bootmem(size, align, goal, ARCH_LOW_ADDRESS_LIMIT);
> + kmemleak_alloc(ptr, size, 1, GFP_KERNEL);
> + return ptr;
> }
>
> /**
> @@ -758,9 +776,13 @@ void * __init __alloc_bootmem_low(unsigned long size, unsigned long align,
> void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, unsigned long size,
> unsigned long align, unsigned long goal)
> {
> + void *ptr;
> +
> if (WARN_ON_ONCE(slab_is_available()))
> return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id);
>
> - return ___alloc_bootmem_node(pgdat->bdata, size, align,
> - goal, ARCH_LOW_ADDRESS_LIMIT);
> + ptr = ___alloc_bootmem_node(pgdat->bdata, size, align,
> + goal, ARCH_LOW_ADDRESS_LIMIT);
> + kmemleak_alloc(ptr, size, 1, GFP_KERNEL);
> + return ptr;
> }
>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2009-07-07 6:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-06 10:51 [RFC PATCH 0/3] kmemleak: Add support for " Catalin Marinas
2009-07-06 10:51 ` [RFC PATCH 1/3] kmemleak: Allow partial freeing of memory blocks Catalin Marinas
2009-07-07 7:12 ` Pekka Enberg
2009-07-07 8:42 ` Catalin Marinas
2009-07-07 13:39 ` Catalin Marinas
2009-07-08 6:40 ` Pekka Enberg
2009-07-08 9:42 ` Catalin Marinas
2009-07-08 9:45 ` Pekka Enberg
2009-07-06 10:51 ` [RFC PATCH 2/3] kmemleak: Add callbacks to the bootmem allocator Catalin Marinas
2009-07-06 10:58 ` Catalin Marinas
2009-07-07 7:08 ` Pekka Enberg [this message]
2009-07-07 16:53 ` Johannes Weiner
2009-07-07 22:09 ` Catalin Marinas
2009-07-08 6:48 ` Pekka Enberg
2009-07-08 9:43 ` Catalin Marinas
2009-07-08 11:46 ` Johannes Weiner
2009-07-08 9:46 ` Johannes Weiner
2009-07-08 10:02 ` Catalin Marinas
2009-07-08 10:03 ` Pekka Enberg
2009-07-06 10:52 ` [RFC PATCH 3/3] kmemleak: Remove alloc_bootmem annotations introduced in the past Catalin Marinas
2009-07-07 7:12 ` Pekka Enberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1246950530.24285.7.camel@penberg-laptop \
--to=penberg@cs.helsinki.fi \
--cc=catalin.marinas@arm.com \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox