Commit 443f8c75 authored Oct 26, 2015 by Jiri Olsa Committed by Arnaldo Carvalho de Melo Oct 28, 2015

perf symbols: Fix endless loop in dso__split_kallsyms_for_kcore



Currently we split symbols based on the map comparison, but symbols are stored
within dso objects and maps could point into same dso objects (kernel maps).

Hence we could end up changing rbtree we are currently iterating and mess it
up. It's easily reproduced on s390x by running:

  $ perf record -a -- sleep 3
  $ perf buildid-list -i perf.data --with-hits

The fix is to compare dso objects instead.

Reported-by: Michael Petlan <mpetlan@redhat.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20151026135130.GA26003@krava.brq.redhat.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 374ce938

tools/perf/util/symbol.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -680,7 +680,7 @@ static int dso__split_kallsyms_for_kcore(struct dso dso, struct map map,
	pos->start -= curr_map->start - curr_map->pgoff;		pos->start -= curr_map->start - curr_map->pgoff;
	if (pos->end)		if (pos->end)
	pos->end -= curr_map->start - curr_map->pgoff;		pos->end -= curr_map->start - curr_map->pgoff;
	if (curr_map != map) {		if (curr_map->dso != map->dso) {
	rb_erase_init(&pos->rb_node, root);		rb_erase_init(&pos->rb_node, root);
	symbols__insert(		symbols__insert(
	&curr_map->dso->symbols[curr_map->type],		&curr_map->dso->symbols[curr_map->type],

Admin message