From: Masami Hiramatsu <mhiramat@redhat.com>
To: Ingo Molnar <mingo@elte.hu>,
Frederic Weisbecker <fweisbec@gmail.com>,
lkml<linux-kernel@vger.kernel.org>
Cc: Paul Mackerras <paulus@samba.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Steven Rostedt <rostedt@goodmis.org>,
Jim Keniston <jkenisto@us.ibm.com>,
Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
Christoph Hellwig <hch@infradead.org>,
"Frank Ch. Eigler" <fche@redhat.com>,
Jason Baron <jbaron@redhat.com>,
"K.Prasad" <prasad@linux.vnet.ibm.com>,
Peter Zijlstra <peterz@infradead.org>,
Srikar Dronamraju <srikar@linux.vnet.ibm.com>,
systemtap<systemtap@sources.redhat.com>,
DLE<dle-develop@lists.sourceforge.net>
Subject: [PATCH -tip 13/14] perf probe: Check symbols in symtab/kallsyms
Date: Tue, 15 Dec 2009 15:28:00 -0000 [thread overview]
Message-ID: <20091215153239.17436.55034.stgit@dhcp-100-2-132.bos.redhat.com> (raw)
In-Reply-To: <20091215153106.17436.66584.stgit@dhcp-100-2-132.bos.redhat.com>
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 <mhiramat@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Jim Keniston <jkenisto@us.ibm.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Frank Ch. Eigler <fche@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jason Baron <jbaron@redhat.com>
Cc: K.Prasad <prasad@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
---
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 5008605..f019536 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
@@ -279,6 +290,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.");
--
Masami Hiramatsu
Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division
e-mail: mhiramat@redhat.com
next prev parent reply other threads:[~2009-12-15 15:28 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-15 15:26 [PATCH -tip 00/14] perf-probe updates Masami Hiramatsu
2009-12-15 15:26 ` [PATCH -tip 01/14] perf probe: Cleanup struct session in builtin-probe.c Masami Hiramatsu
2009-12-15 19:27 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:26 ` [PATCH -tip 02/14] perf probe: Check the result of e_snprintf() Masami Hiramatsu
2009-12-15 19:26 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 05/14] perf probe: Fix --del to show info instead of warning Masami Hiramatsu
2009-12-15 19:29 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 09/14] perf probe: Add glob matching support on --del Masami Hiramatsu
2009-12-15 19:28 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 07/14] perf tools: Add for_each macros for strlist Masami Hiramatsu
2009-12-15 19:28 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 04/14] perf probe: Show need-dwarf message only if it is really needed Masami Hiramatsu
2009-12-15 19:27 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 08/14] perf probe: Use strlist__for_each macros in probe-event.c Masami Hiramatsu
2009-12-15 19:28 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 06/14] perf probe: Fix --del to update current event list Masami Hiramatsu
2009-12-15 19:29 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 03/14] perf probe: Check hyphen only argument Masami Hiramatsu
2009-12-15 19:29 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` [PATCH -tip 10/14] perf probe: Support event name for --add option Masami Hiramatsu
2009-12-15 19:54 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` [PATCH -tip 14/14] perf probe: Fix to show which probe point is not found Masami Hiramatsu
2009-12-15 19:28 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` [PATCH -tip 11/14] perf probe: Reject second attempt of adding same-name event Masami Hiramatsu
2009-12-15 19:29 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` Masami Hiramatsu [this message]
2009-12-15 19:28 ` [tip:perf/urgent] perf probe: Check symbols in symtab/kallsyms tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` [PATCH -tip 12/14] perf probe: Check build-id of vmlinux Masami Hiramatsu
2009-12-15 19:29 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 19:23 ` [PATCH -tip 00/14] perf-probe updates Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091215153239.17436.55034.stgit@dhcp-100-2-132.bos.redhat.com \
--to=mhiramat@redhat.com \
--cc=acme@redhat.com \
--cc=ananth@in.ibm.com \
--cc=dle-develop@lists.sourceforge.net \
--cc=fche@redhat.com \
--cc=fweisbec@gmail.com \
--cc=hch@infradead.org \
--cc=jbaron@redhat.com \
--cc=jkenisto@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=prasad@linux.vnet.ibm.com \
--cc=rostedt@goodmis.org \
--cc=srikar@linux.vnet.ibm.com \
--cc=systemtap@sources.redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).