Re: [PATCH 06/22] tools lib traceevent: Add kmem plugin
From: Steven Rostedt
Date: Thu Nov 21 2013 - 08:14:35 EST
On Thu, 21 Nov 2013 12:01:04 +0100
Jiri Olsa <jolsa@xxxxxxxxxx> wrote:
> Backporting kmem plugin.
>
> Backported from Steven Rostedt's trace-cmd repo (HEAD 0f2c2fb):
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
>
> This plugin adds call_site field resolving for following
> tracepoint events:
> kmem:kfree
> kmem:kmalloc
> kmem:kmalloc_node
> kmem:kmem_cache_alloc
> kmem:kmem_cache_alloc_node
> kmem:kmem_cache_free
>
> The diff of 'perf script' output generated by old and new code:
> (data was generated by 'perf record -e 'kmem:*' -a')
>
> --- script.kmem.old
> +++ script.kmem.new
> - perf 27846 [001] 29643.403319: kmem:kfree: call_site=ffffffff810e64f6 ptr=(nil)
> + perf 27846 [001] 29643.403238: kmem:kfree: (__audit_syscall_exit+0x1f6) call_site=ffffffff810e64f6 ptr=(nil)
> - perf 27846 [001] 29643.403337: kmem:kmem_cache_alloc: call_site=ffffffff812ff0c5 ptr=0xffff88020e155630 bytes_req=560 bytes_alloc=568 gfp_flags=GFP_KERNEL
> + perf 27846 [001] 29643.403337: kmem:kmem_cache_alloc: (radix_tree_preload+0x35) call_site=ffffffff812ff0c5 ptr=0xffff88020e155630 bytes_req=560 bytes_alloc=568 gfp_flags=GFP_KERNEL
> - perf 27846 [001] 29643.403342: kmem:kmem_cache_free: call_site=ffffffff8126ec61 ptr=0xffff88020dffe750
> + perf 27846 [001] 29643.403342: kmem:kmem_cache_free: (jbd2_journal_stop+0x221) call_site=ffffffff8126ec61 ptr=0xffff88020dffe750
> - firefox 954 [000] 29643.445477: kmem:kmem_cache_alloc_node: call_site=ffffffff8153c64e ptr=0xffff8801cecb4000 bytes_req=256 bytes_alloc=256 gfp_flags=GFP_KERNEL|GFP_REPEAT node=-1
> + firefox 954 [000] 29643.445477: kmem:kmem_cache_alloc_node: (__alloc_skb+0x4e) call_site=ffffffff8153c64e ptr=0xffff8801cecb4000 bytes_req=256 bytes_alloc=256 gfp_flags=GFP_KERNEL|GFP_REPEAT node=-1
> - perf 27846 [001] 29643.445510: kmem:kmalloc: call_site=ffffffff81250642 ptr=0xffff88020fd6c300 bytes_req=96 bytes_alloc=96 gfp_flags=GFP_NOFS|GFP_ZERO
> + perf 27846 [001] 29643.445510: kmem:kmalloc: (ext4_ext_find_extent+0x362) call_site=ffffffff81250642 ptr=0xffff88020fd6c300 bytes_req=96 bytes_alloc=96 gfp_flags=GFP_NOFS|GFP_ZERO
> - X 888 [002] 29643.445546: kmem:kmalloc_node: call_site=ffffffff8153c67e ptr=0xffff880103828e00 bytes_req=384 bytes_alloc=512 gfp_flags=GFP_KERNEL|GFP_NOWARN|GFP_REPEAT|GFP_NOMEMALLOC node=-1
> + X 888 [002] 29643.445546: kmem:kmalloc_node: (__alloc_skb+0x7e) call_site=ffffffff8153c67e ptr=0xffff880103828e00 bytes_req=384 bytes_alloc=512 gfp_flags=GFP_KERNEL|GFP_NOWARN|GFP_REPEAT|GFP_NOMEMALLOC node=-1
>
> Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> Cc: Corey Ashford <cjashfor@xxxxxxxxxxxxxxxxxx>
> Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxx>
> Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
> Cc: Paul Mackerras <paulus@xxxxxxxxx>
> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
> Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
> Cc: David Ahern <dsahern@xxxxxxxxx>
> ---
> tools/lib/traceevent/Makefile | 1 +
> tools/lib/traceevent/plugin_kmem.c | 72 ++++++++++++++++++++++++++++++++++++++
> 2 files changed, 73 insertions(+)
> create mode 100644 tools/lib/traceevent/plugin_kmem.c
>
> diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
> index df087f3..1ff8bb2 100644
> --- a/tools/lib/traceevent/Makefile
> +++ b/tools/lib/traceevent/Makefile
> @@ -204,6 +204,7 @@ PEVENT_LIB_OBJS += kbuffer-parse.o
>
> PLUGIN_OBJS = plugin_jbd2.o
> PLUGIN_OBJS += plugin_hrtimer.o
> +PLUGIN_OBJS += plugin_kmem.o
>
> PLUGINS := $(PLUGIN_OBJS:.o=.so)
>
> diff --git a/tools/lib/traceevent/plugin_kmem.c b/tools/lib/traceevent/plugin_kmem.c
> new file mode 100644
> index 0000000..7115c80
> --- /dev/null
> +++ b/tools/lib/traceevent/plugin_kmem.c
> @@ -0,0 +1,72 @@
> +/*
> + * Copyright (C) 2009 Red Hat Inc, Steven Rostedt <srostedt@xxxxxxxxxx>
> + *
> + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation;
> + * version 2.1 of the License (not later!)
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this program; if not, see <http://www.gnu.org/licenses>
> + *
> + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> + */
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <string.h>
> +
> +#include "event-parse.h"
> +
> +static int call_site_handler(struct trace_seq *s, struct pevent_record *record,
> + struct event_format *event, void *context)
> +{
> + struct format_field *field;
> + unsigned long long val, addr;
> + void *data = record->data;
> + const char *func;
> +
> + field = pevent_find_field(event, "call_site");
> + if (!field)
> + return 1;
> +
> + if (pevent_read_number_field(field, data, &val))
> + return 1;
This was one of the older plugins. We can simplify this with:
if (pevent_get_field_val(s, event, "call_site",
record, &val, 0))
return 1;
Would would replace the above two checks.
But we can fix this later. As I'm sure there's other places that can
use these updates.
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
-- Steve
> +
> + func = pevent_find_function(event->pevent, val);
> + if (!func)
> + return 1;
> +
> + addr = pevent_find_function_address(event->pevent, val);
> +
> + trace_seq_printf(s, "(%s+0x%x) ", func, (int)(val - addr));
> + return 1;
> +}
> +
> +int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
> +{
> + pevent_register_event_handler(pevent, -1, "kmem", "kfree",
> + call_site_handler, NULL);
> +
> + pevent_register_event_handler(pevent, -1, "kmem", "kmalloc",
> + call_site_handler, NULL);
> +
> + pevent_register_event_handler(pevent, -1, "kmem", "kmalloc_node",
> + call_site_handler, NULL);
> +
> + pevent_register_event_handler(pevent, -1, "kmem", "kmem_cache_alloc",
> + call_site_handler, NULL);
> +
> + pevent_register_event_handler(pevent, -1, "kmem",
> + "kmem_cache_alloc_node",
> + call_site_handler, NULL);
> +
> + pevent_register_event_handler(pevent, -1, "kmem", "kmem_cache_free",
> + call_site_handler, NULL);
> + return 0;
> +}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/