lkml.org 
[lkml]   [2008]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH 04/15] kmemleak: Add the slob memory allocation/freeing hooks
    From
    Date
    On Wed, 2008-12-10 at 18:27 +0000, Catalin Marinas wrote:
    > This patch adds the callbacks to memleak_(alloc|free) functions from the
    > slob allocator.

    Is this different than the last one?

    Acked-by: Matt Mackall <mpm@selenic.com>

    > Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    > Cc: Matt Mackall <mpm@selenic.com>
    > Cc: Pekka Enberg <penberg@cs.helsinki.fi>
    > ---
    > mm/slob.c | 15 +++++++++++----
    > 1 files changed, 11 insertions(+), 4 deletions(-)
    >
    > diff --git a/mm/slob.c b/mm/slob.c
    > index cb675d1..ff5a98d 100644
    > --- a/mm/slob.c
    > +++ b/mm/slob.c
    > @@ -60,6 +60,7 @@
    > #include <linux/kernel.h>
    > #include <linux/slab.h>
    > #include <linux/mm.h>
    > +#include <linux/memleak.h>
    > #include <linux/cache.h>
    > #include <linux/init.h>
    > #include <linux/module.h>
    > @@ -463,6 +464,7 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
    > {
    > unsigned int *m;
    > int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
    > + void *ret;
    >
    > if (size < PAGE_SIZE - align) {
    > if (!size)
    > @@ -472,18 +474,18 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
    > if (!m)
    > return NULL;
    > *m = size;
    > - return (void *)m + align;
    > + ret = (void *)m + align;
    > } else {
    > - void *ret;
    > -
    > ret = slob_new_page(gfp | __GFP_COMP, get_order(size), node);
    > if (ret) {
    > struct page *page;
    > page = virt_to_page(ret);
    > page->private = size;
    > }
    > - return ret;
    > }
    > +
    > + memleak_alloc(ret, size, 1, gfp);
    > + return ret;
    > }
    > EXPORT_SYMBOL(__kmalloc_node);
    >
    > @@ -493,6 +495,7 @@ void kfree(const void *block)
    >
    > if (unlikely(ZERO_OR_NULL_PTR(block)))
    > return;
    > + memleak_free(block);
    >
    > sp = (struct slob_page *)virt_to_page(block);
    > if (slob_page(sp)) {
    > @@ -555,12 +558,14 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
    > } else if (flags & SLAB_PANIC)
    > panic("Cannot create slab cache %s\n", name);
    >
    > + memleak_alloc(c, sizeof(struct kmem_cache), 1, GFP_KERNEL);
    > return c;
    > }
    > EXPORT_SYMBOL(kmem_cache_create);
    >
    > void kmem_cache_destroy(struct kmem_cache *c)
    > {
    > + memleak_free(c);
    > slob_free(c, sizeof(struct kmem_cache));
    > }
    > EXPORT_SYMBOL(kmem_cache_destroy);
    > @@ -577,6 +582,7 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
    > if (c->ctor)
    > c->ctor(b);
    >
    > + memleak_alloc_recursive(b, c->size, 1, c->flags, flags);
    > return b;
    > }
    > EXPORT_SYMBOL(kmem_cache_alloc_node);
    > @@ -599,6 +605,7 @@ static void kmem_rcu_free(struct rcu_head *head)
    >
    > void kmem_cache_free(struct kmem_cache *c, void *b)
    > {
    > + memleak_free_recursive(b, c->flags);
    > if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
    > struct slob_rcu *slob_rcu;
    > slob_rcu = b + (c->size - sizeof(struct slob_rcu));
    --
    Mathematics is the supreme nostalgia of our time.



    \
     
     \ /
      Last update: 2008-12-10 19:39    [W:2.649 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site