From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12744 invoked by alias); 15 Dec 2009 19:28:38 -0000 Received: (qmail 12568 invoked by uid 22791); 15 Dec 2009 19:28:36 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SARE_MSGID_LONG40 X-Spam-Check-By: sourceware.org Received: from hera.kernel.org (HELO hera.kernel.org) (140.211.167.34) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 15 Dec 2009 19:28:32 +0000 Received: from hera.kernel.org (localhost [127.0.0.1]) by hera.kernel.org (8.14.3/8.14.3) with ESMTP id nBFJRZ1s011087 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 15 Dec 2009 19:27:36 GMT Received: (from hpa@localhost) by hera.kernel.org (8.14.3/8.14.2/Submit) id nBFJRZef011084; Tue, 15 Dec 2009 19:27:35 GMT Date: Tue, 15 Dec 2009 19:28:00 -0000 From: tip-bot for Masami Hiramatsu Cc: acme@redhat.com, mingo@redhat.com, peterz@infradead.org, fweisbec@gmail.com, dle-develop@lists.sourceforge.net, rostedt@goodmis.org, jbaron@redhat.com, tglx@linutronix.de, mhiramat@redhat.com, systemtap@sources.redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, paulus@samba.org, fche@redhat.com, jkenisto@us.ibm.com, hch@infradead.org, ananth@in.ibm.com, srikar@linux.vnet.ibm.com, mingo@elte.hu, prasad@linux.vnet.ibm.com Reply-To: mingo@redhat.com, acme@redhat.com, peterz@infradead.org, fweisbec@gmail.com, dle-develop@lists.sourceforge.net, rostedt@goodmis.org, jbaron@redhat.com, tglx@linutronix.de, mhiramat@redhat.com, systemtap@sources.redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, paulus@samba.org, fche@redhat.com, jkenisto@us.ibm.com, hch@infradead.org, ananth@in.ibm.com, srikar@linux.vnet.ibm.com, prasad@linux.vnet.ibm.com, mingo@elte.hu In-Reply-To: <20091215153239.17436.55034.stgit@dhcp-100-2-132.bos.redhat.com> References: <20091215153239.17436.55034.stgit@dhcp-100-2-132.bos.redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf probe: Check symbols in symtab/kallsyms Message-ID: Git-Commit-ID: 62bdc1b38e2abf3f500229c3bf4c82d33575d1ae MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-IsSubscribed: yes Mailing-List: contact systemtap-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: systemtap-owner@sourceware.org X-SW-Source: 2009-q4/txt/msg00931.txt.bz2 Commit-ID: 62bdc1b38e2abf3f500229c3bf4c82d33575d1ae Gitweb: http://git.kernel.org/tip/62bdc1b38e2abf3f500229c3bf4c82d33575d1ae Author: Masami Hiramatsu AuthorDate: Tue, 15 Dec 2009 10:32:40 -0500 Committer: Ingo Molnar CommitDate: Tue, 15 Dec 2009 20:22:05 +0100 perf probe: Check symbols in symtab/kallsyms Check symbols in symtab/kallsyms when no debuginfo is available. e.g. # perf probe test Fatal: Kernel symbol 'test' not found - probe not added. Signed-off-by: Masami Hiramatsu Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Steven Rostedt Cc: Jim Keniston Cc: Ananth N Mavinakayanahalli Cc: Christoph Hellwig Cc: Frank Ch. Eigler Cc: Jason Baron Cc: K.Prasad Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: systemtap Cc: DLE Cc: Frederic Weisbecker LKML-Reference: <20091215153239.17436.55034.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar --- tools/perf/builtin-probe.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c index 0584b7a..6b0e4cf 100644 --- a/tools/perf/builtin-probe.c +++ b/tools/perf/builtin-probe.c @@ -59,6 +59,7 @@ static struct { struct strlist *dellist; struct symbol_conf conf; struct perf_session *psession; + struct map *kmap; } session; @@ -115,22 +116,26 @@ static int opt_del_probe_event(const struct option *opt __used, return 0; } +/* Currently just checking function name from symbol map */ +static void evaluate_probe_point(struct probe_point *pp) +{ + struct symbol *sym; + sym = map__find_symbol_by_name(session.kmap, pp->function, + session.psession, NULL); + if (!sym) + die("Kernel symbol \'%s\' not found - probe not added.", + pp->function); +} + #ifndef NO_LIBDWARF static int open_vmlinux(void) { - struct map *kmap; - kmap = map_groups__find_by_name(&session.psession->kmaps, - MAP__FUNCTION, "[kernel.kallsyms]"); - if (!kmap) { - pr_debug("Could not find kernel map.\n"); - return -ENOENT; - } - if (map__load(kmap, session.psession, NULL) < 0) { + if (map__load(session.kmap, session.psession, NULL) < 0) { pr_debug("Failed to load kernel map.\n"); return -EINVAL; } - pr_debug("Try to open %s\n", kmap->dso->long_name); - return open(kmap->dso->long_name, O_RDONLY); + pr_debug("Try to open %s\n", session.kmap->dso->long_name); + return open(session.kmap->dso->long_name, O_RDONLY); } #endif @@ -219,6 +224,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used) } /* Initialize symbol maps for vmlinux */ + session.conf.sort_by_name = true; if (session.conf.vmlinux_name == NULL) session.conf.try_vmlinux_path = true; if (symbol__init(&session.conf) < 0) @@ -227,6 +233,11 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used) &session.conf); if (session.psession == NULL) die("Failed to init perf_session."); + session.kmap = map_groups__find_by_name(&session.psession->kmaps, + MAP__FUNCTION, + "[kernel.kallsyms]"); + if (!session.kmap) + die("Could not find kernel map.\n"); if (session.need_dwarf) #ifdef NO_LIBDWARF @@ -277,6 +288,7 @@ end_dwarf: if (pp->found) /* This probe is already found. */ continue; + evaluate_probe_point(pp); ret = synthesize_trace_kprobe_event(pp); if (ret == -E2BIG) die("probe point definition becomes too long.");