All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
	Clark Williams <williams@redhat.com>,
	linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	He Kuang <hekuang@huawei.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Milian Wolff <milian.wolff@kdab.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 06/17] perf report: Don't shadow inlined symbol with different addr range
Date: Wed, 20 Feb 2019 22:25:38 -0300	[thread overview]
Message-ID: <20190221012549.4069-7-acme@kernel.org> (raw)
In-Reply-To: <20190221012549.4069-1-acme@kernel.org>

From: He Kuang <hekuang@huawei.com>

We can't assume inlined symbols with the same name are equal, because
their address range may be different. This will cause the symbols with
different addresses be shadowed when adding to the hist entry, and lead
to ERANGE error when checking the symbol address during sample parse,
the addr should be within the range of [sym.start, sym.end].

The error message is like: "0x36aea60 [0x8]: failed to process type: 68".

The second parameter of symbol__new() is the length of the fake symbol
for the inline frame, which is the subtraction of the end and start
address of base_sym.

Signed-off-by: He Kuang <hekuang@huawei.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: aa441895f7b4 ("perf report: Compare symbol name for inlined frames when sorting")
Link: http://lkml.kernel.org/r/20190219130531.15692-1-hekuang@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/sort.c    | 10 ++++++++--
 tools/perf/util/srcline.c |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 2b6c1ccb878c..d2299e912e59 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -231,8 +231,14 @@ static int64_t _sort__sym_cmp(struct symbol *sym_l, struct symbol *sym_r)
 	if (sym_l == sym_r)
 		return 0;
 
-	if (sym_l->inlined || sym_r->inlined)
-		return strcmp(sym_l->name, sym_r->name);
+	if (sym_l->inlined || sym_r->inlined) {
+		int ret = strcmp(sym_l->name, sym_r->name);
+
+		if (ret)
+			return ret;
+		if ((sym_l->start <= sym_r->end) && (sym_l->end >= sym_r->start))
+			return 0;
+	}
 
 	if (sym_l->start != sym_r->start)
 		return (int64_t)(sym_r->start - sym_l->start);
diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index 00f215580b5a..10ca1533937e 100644
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -104,7 +104,7 @@ static struct symbol *new_inline_sym(struct dso *dso,
 	} else {
 		/* create a fake symbol for the inline frame */
 		inline_sym = symbol__new(base_sym ? base_sym->start : 0,
-					 base_sym ? base_sym->end : 0,
+					 base_sym ? (base_sym->end - base_sym->start) : 0,
 					 base_sym ? base_sym->binding : 0,
 					 base_sym ? base_sym->type : 0,
 					 funcname);
-- 
2.19.1


  parent reply	other threads:[~2019-02-21  1:26 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-21  1:25 [GIT PULL 00/17] perf/core improvements and fixes Arnaldo Carvalho de Melo
2019-02-21  1:25 ` [PATCH 01/17] perf tests shell: Skip trace+probe_vfs_getname.sh if built without trace support Arnaldo Carvalho de Melo
2019-02-21  1:25 ` [PATCH 02/17] perf header: Fix wrong node write in NUMA_TOPOLOGY feature Arnaldo Carvalho de Melo
2019-02-21  1:25 ` [PATCH 03/17] perf tools: Add cpu_topology object Arnaldo Carvalho de Melo
2019-02-21  1:25 ` [PATCH 04/17] perf tools: Add numa_topology object Arnaldo Carvalho de Melo
2019-02-21  1:25 ` [PATCH 05/17] perf tools: Use sysfs__mountpoint() when reading cpu topology Arnaldo Carvalho de Melo
2019-02-21  1:25 ` Arnaldo Carvalho de Melo [this message]
2019-02-21  1:25 ` [PATCH 07/17] perf doc: Fix HEADER_CMDLINE description in perf.data documentation Arnaldo Carvalho de Melo
2019-02-21  1:25 ` [PATCH 08/17] perf doc: Fix documentation of the Flags section in perf.data Arnaldo Carvalho de Melo
2019-02-21  1:25 ` [PATCH 09/17] perf test: Fix failure of 'evsel-tp-sched' test on s390 Arnaldo Carvalho de Melo
2019-02-21  1:25 ` [PATCH 10/17] perf bpf: Add bpf_map dumper Arnaldo Carvalho de Melo
2019-02-21  1:25 ` [PATCH 11/17] perf trace: Allow dumping a BPF map after setting up BPF events Arnaldo Carvalho de Melo
2019-02-21  1:25 ` [PATCH 12/17] perf session: Don't report zero period samples for slave events Arnaldo Carvalho de Melo
2019-02-21  1:25 ` [PATCH 13/17] perf evsel: Force sample_type " Arnaldo Carvalho de Melo
2019-02-21  1:25 ` [PATCH 14/17] perf script: Allow +- operator for type specific fields option Arnaldo Carvalho de Melo
2019-02-21  1:25 ` [PATCH 15/17] perf bpf-event: Add missing new line into pr_debug call Arnaldo Carvalho de Melo
2019-02-21  7:12   ` Song Liu
2019-02-21  1:25 ` [PATCH 16/17] perf cpumap: Increase debug level for cpu_map__snprint verbose output Arnaldo Carvalho de Melo
2019-02-21  1:25 ` [PATCH 17/17] perf tools: Make rm_rf() remove single file Arnaldo Carvalho de Melo
2019-02-28  7:28 ` [GIT PULL 00/17] perf/core improvements and fixes 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=20190221012549.4069-7-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=hekuang@huawei.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=milian.wolff@kdab.com \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=williams@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 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.