From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754126Ab3KUNOc (ORCPT ); Thu, 21 Nov 2013 08:14:32 -0500 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.225]:33036 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750976Ab3KUNOb (ORCPT ); Thu, 21 Nov 2013 08:14:31 -0500 Date: Thu, 21 Nov 2013 08:14:27 -0500 From: Steven Rostedt To: Jiri Olsa Cc: linux-kernel@vger.kernel.org, Corey Ashford , Frederic Weisbecker , Ingo Molnar , Namhyung Kim , Paul Mackerras , Peter Zijlstra , Arnaldo Carvalho de Melo , David Ahern Subject: Re: [PATCH 06/22] tools lib traceevent: Add kmem plugin Message-ID: <20131121081427.404601e9@gandalf.local.home> In-Reply-To: <1385031680-9014-7-git-send-email-jolsa@redhat.com> References: <1385031680-9014-1-git-send-email-jolsa@redhat.com> <1385031680-9014-7-git-send-email-jolsa@redhat.com> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.20; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-RR-Connecting-IP: 107.14.168.130:25 X-Cloudmark-Score: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 21 Nov 2013 12:01:04 +0100 Jiri Olsa 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 > Cc: Corey Ashford > Cc: Frederic Weisbecker > Cc: Ingo Molnar > Cc: Namhyung Kim > Cc: Paul Mackerras > Cc: Peter Zijlstra > Cc: Arnaldo Carvalho de Melo > Cc: Steven Rostedt > Cc: David Ahern > --- > 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 > + * > + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > + * 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 > + * > + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > + */ > +#include > +#include > +#include > + > +#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 -- 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; > +}