From: tip-bot for Konstantin Khlebnikov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, khlebnikov@yandex-team.ru,
mhiramat@kernel.org, hpa@zytor.com, tglx@linutronix.de,
acme@redhat.com, mingo@kernel.org
Subject: [tip:perf/urgent] perf probe: Fix module name matching
Date: Tue, 9 Aug 2016 12:18:10 -0700 [thread overview]
Message-ID: <tip-cb3f3378cd09aa3fe975b4ad5ee0229dc76315bb@git.kernel.org> (raw)
In-Reply-To: <147039975648.715620.12985971832789032159.stgit@buzz>
Commit-ID: cb3f3378cd09aa3fe975b4ad5ee0229dc76315bb
Gitweb: http://git.kernel.org/tip/cb3f3378cd09aa3fe975b4ad5ee0229dc76315bb
Author: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
AuthorDate: Fri, 5 Aug 2016 15:22:36 +0300
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 9 Aug 2016 10:48:09 -0300
perf probe: Fix module name matching
If module is "module" then dso->short_name is "[module]". Substring
comparing is't enough: "raid10" matches to "[raid1]". This patch also
checks terminating zero in module name.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Link: http://lkml.kernel.org/r/147039975648.715620.12985971832789032159.stgit@buzz
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/probe-event.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index d5ccb65..1201f73 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -170,8 +170,10 @@ static struct map *kernel_get_module_map(const char *module)
module = "kernel";
for (pos = maps__first(maps); pos; pos = map__next(pos)) {
+ /* short_name is "[module]" */
if (strncmp(pos->dso->short_name + 1, module,
- pos->dso->short_name_len - 2) == 0) {
+ pos->dso->short_name_len - 2) == 0 &&
+ module[pos->dso->short_name_len - 2] == '\0') {
return pos;
}
}
prev parent reply other threads:[~2016-08-09 19:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-05 12:22 [PATCH v2] perf probe: fix module name matching Konstantin Khlebnikov
2016-08-06 10:30 ` Masami Hiramatsu
2016-08-08 19:34 ` Arnaldo Carvalho de Melo
2016-08-09 19:18 ` tip-bot for Konstantin Khlebnikov [this message]
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=tip-cb3f3378cd09aa3fe975b4ad5ee0229dc76315bb@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=khlebnikov@yandex-team.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.