lkml.org 
[lkml]   [2009]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/2] tracing: Fix no callsite ifndef CONFIG_KMEMTRACE
    For slab, if CONFIG_KMEMTRACE and CONFIG_DEBUG_SLAB are not set,
    __do_kmalloc() will not track callers:

    # ./perf record -f -a -R -e kmem:kmalloc
    ^C
    # ./perf trace
    ...
    perf-2204 [000] 147.376774: kmalloc: call_site=c0529d2d ...
    perf-2204 [000] 147.400997: kmalloc: call_site=c0529d2d ...
    Xorg-1461 [001] 147.405413: kmalloc: call_site=0 ...
    Xorg-1461 [001] 147.405609: kmalloc: call_site=0 ...
    konsole-1776 [001] 147.405786: kmalloc: call_site=0 ...

    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    ---
    mm/slab.c | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/mm/slab.c b/mm/slab.c
    index e556380..eacf7f0 100644
    --- a/mm/slab.c
    +++ b/mm/slab.c
    @@ -3637,7 +3637,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, void *caller)
    return ret;
    }

    -#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_KMEMTRACE)
    +#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)
    void *__kmalloc_node(size_t size, gfp_t flags, int node)
    {
    return __do_kmalloc_node(size, flags, node,
    @@ -3657,7 +3657,7 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
    return __do_kmalloc_node(size, flags, node, NULL);
    }
    EXPORT_SYMBOL(__kmalloc_node);
    -#endif /* CONFIG_DEBUG_SLAB */
    +#endif /* CONFIG_DEBUG_SLAB || CONFIG_TRACING */
    #endif /* CONFIG_NUMA */

    /**
    @@ -3689,7 +3689,7 @@ static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
    }


    -#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_KMEMTRACE)
    +#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)
    void *__kmalloc(size_t size, gfp_t flags)
    {
    return __do_kmalloc(size, flags, __builtin_return_address(0));
    --
    1.6.3


    \
     
     \ /
      Last update: 2009-12-11 06:53    [W:0.023 / U:0.876 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site