lkml.org 
[lkml]   [2009]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 05/14] kmemleak: Add the slub memory allocation/freeing hooks
    From
    Date
    This patch adds the callbacks to kmemleak_(alloc|free) functions from the
    slub allocator.

    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    Cc: Christoph Lameter <cl@linux-foundation.org>
    Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
    ---
    mm/slub.c | 5 ++++-
    1 files changed, 4 insertions(+), 1 deletions(-)

    diff --git a/mm/slub.c b/mm/slub.c
    index 7ab54ec..93f5fb0 100644
    --- a/mm/slub.c
    +++ b/mm/slub.c
    @@ -19,6 +19,7 @@
    #include <trace/kmemtrace.h>
    #include <linux/cpu.h>
    #include <linux/cpuset.h>
    +#include <linux/kmemleak.h>
    #include <linux/mempolicy.h>
    #include <linux/ctype.h>
    #include <linux/debugobjects.h>
    @@ -142,7 +143,7 @@
    * Set of flags that will prevent slab merging
    */
    #define SLUB_NEVER_MERGE (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER | \
    - SLAB_TRACE | SLAB_DESTROY_BY_RCU)
    + SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE)

    #define SLUB_MERGE_SAME (SLAB_DEBUG_FREE | SLAB_RECLAIM_ACCOUNT | \
    SLAB_CACHE_DMA)
    @@ -1614,6 +1615,7 @@ static __always_inline void *slab_alloc(struct kmem_cache *s,
    if (unlikely((gfpflags & __GFP_ZERO) && object))
    memset(object, 0, objsize);

    + kmemleak_alloc_recursive(object, objsize, 1, s->flags, gfpflags);
    return object;
    }

    @@ -1743,6 +1745,7 @@ static __always_inline void slab_free(struct kmem_cache *s,
    struct kmem_cache_cpu *c;
    unsigned long flags;

    + kmemleak_free_recursive(x, s->flags);
    local_irq_save(flags);
    c = get_cpu_slab(s, smp_processor_id());
    debug_check_no_locks_freed(object, c->objsize);


    \
     
     \ /
      Last update: 2009-04-24 18:51    [W:0.022 / U:0.584 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site