Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1258264

[PATCH 12/12] perf symbols: Fix endless loop in dso__split_kallsyms_for_kcore

Show all headers | View raw

From: Jiri Olsa <jolsa@redhat.com>

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>
---
 tools/perf/util/symbol.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 71bf711a628c..b4cc7662677e 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -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;
 			if (pos->end)
 				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);
 				symbols__insert(
 					&curr_map->dso->symbols[curr_map->type],
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/12] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-28 16:40 +0100
  [PATCH 07/12] perf stat: Cache aggregated map entries in extra cpumap Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-28 16:40 +0100
  [PATCH 08/12] perf tools: Search for more options when passing args to -h Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-28 16:40 +0100
  [PATCH 04/12] perf tools: Introduce usage_with_options_msg() Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-28 16:40 +0100
  [PATCH 10/12] perf symbols: we can now read separate debug-info files based on a build ID Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-28 16:40 +0100
  [PATCH 02/12] perf report: Rename to --show-cpu-utilization Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-28 16:40 +0100
  [PATCH 11/12] perf tools: Enable pre-event inherit setting by config terms Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-28 16:40 +0100
  [PATCH 12/12] perf symbols: Fix endless loop in dso__split_kallsyms_for_kcore Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-28 16:40 +0100
  [PATCH 09/12] perf symbols: Fix type error when reading a build-id Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-28 16:40 +0100
  [PATCH 01/12] perf tools: Improve ambiguous option help message Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-28 16:40 +0100
  [PATCH 05/12] perf evsel: Move id_offset out of struct perf_evsel union member Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-28 16:40 +0100
  Re: [GIT PULL 00/12] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2015-10-29 10:40 +0100
    Re: [GIT PULL 00/12] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2015-10-29 11:00 +0100
    Re: [GIT PULL 00/12] perf/core improvements and fixes Jiri Olsa <jolsa@redhat.com> - 2015-10-29 11:00 +0100

csiph-web