From: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
To: pozdneyev@gmail.com, acme@kernel.org, linux-kernel@vger.kernel.org
Cc: linux-perf-users@vger.kernel.org, peterz@infradead.org,
mingo@redhat.com, alexander.shishkin@linux.intel.com,
yao.jin@linux.intel.com, ak@linux.intel.com, jolsa@kernel.org,
kjlx@templeofstupid.com, milian.wolff@kdab.com,
zhangmengting@huawei.com,
Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Subject: [RFC] perf callchain: Compare dsos (as well) for CCKEY_FUNCTION
Date: Wed, 4 Oct 2017 11:43:08 +0530 [thread overview]
Message-ID: <20171004061308.1246-1-ravi.bangoria@linux.vnet.ibm.com> (raw)
In-Reply-To: <CAE3E0fDuYbhSj_EESFh2OKzBUQS=oGKWm3+H7XJARi=m7CLxqQ@mail.gmail.com>
Two functions from different binaries can have same start
address. Thus, comparing only start address in match_chain()
leads to inconsistent callchains. Fix this by adding a check
for dsos as well.
Ex, https://www.spinics.net/lists/linux-perf-users/msg04067.html
Reported-by: Alexander Pozdneev <pozdneyev@gmail.com>
Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
---
tools/perf/util/callchain.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 510b513..6d5a483 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -678,6 +678,9 @@ static enum match_result match_chain(struct callchain_cursor_node *node,
{
struct symbol *sym = node->sym;
u64 left, right;
+ struct dso *left_dso = NULL;
+ struct dso *right_dso = NULL;
+
if (callchain_param.key == CCKEY_SRCLINE) {
enum match_result match = match_chain_srcline(node, cnode);
@@ -689,12 +692,16 @@ static enum match_result match_chain(struct callchain_cursor_node *node,
if (cnode->ms.sym && sym && callchain_param.key == CCKEY_FUNCTION) {
left = cnode->ms.sym->start;
right = sym->start;
+ if (cnode->ms.map && node->map) {
+ left_dso = cnode->ms.map->dso;
+ right_dso = node->map->dso;
+ }
} else {
left = cnode->ip;
right = node->ip;
}
- if (left == right) {
+ if (left == right && left_dso == right_dso) {
if (node->branch) {
cnode->branch_count++;
--
1.8.3.1
next parent reply other threads:[~2017-10-04 6:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAE3E0fDuYbhSj_EESFh2OKzBUQS=oGKWm3+H7XJARi=m7CLxqQ@mail.gmail.com>
2017-10-04 6:13 ` Ravi Bangoria [this message]
2017-10-04 13:08 ` Jiri Olsa
2017-10-05 3:50 ` [PATCH] " Ravi Bangoria
2017-10-05 4:13 ` Namhyung Kim
2017-10-05 9:12 ` [PATCH v2] " Ravi Bangoria
2017-10-05 9:26 ` Jiri Olsa
2017-10-05 18:12 ` [tip:perf/urgent] " tip-bot for Ravi Bangoria
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=20171004061308.1246-1-ravi.bangoria@linux.vnet.ibm.com \
--to=ravi.bangoria@linux.vnet.ibm.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=kjlx@templeofstupid.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=milian.wolff@kdab.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pozdneyev@gmail.com \
--cc=yao.jin@linux.intel.com \
--cc=zhangmengting@huawei.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
all inboxes | Powered by JetHome®