Commit 7346195e authored Feb 19, 2019 by He Kuang Committed by Arnaldo Carvalho de Melo Feb 19, 2019

perf report: Don't shadow inlined symbol with different addr range



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: aa441895 ("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>

parent e19a01c1

tools/perf/util/sort.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -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);

tools/perf/util/srcline.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message