perf_counter tools: Handle overlapping MMAP events
Commit-ID: 3d906ef10a539ff336010afab8f6f9c4fe379695 Gitweb: http://git.kernel.org/tip/3d906ef10a539ff336010afab8f6f9c4fe379695 Author: Peter Zijlstra <[email protected]> AuthorDate: Tue, 23 Jun 2009 11:23:07 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 23 Jun 2009 11:42:44 +0200
perf_counter tools: Handle overlapping MMAP events
Martin Schwidefsky reported "perf report" symbol resolution problems on S390.
Since we only report MMAP, not MUNMAP, we have to deal with overlapping maps.
We used to simply throw out the old map on the assumption whole maps got unmapped. This obviously doesn't deal with partial unmaps. However it appears some dynamic linkers do fancy partial unmaps (s390), so do something more elaborate and truncate the old maps, only removing them when they've been fully covered.
This resolves (part of) the S390 symbol resolution problems.
Reported-by Martin Schwidefsky <[email protected]>
Tested-by Martin Schwidefsky <[email protected]>
Signed-off-by Peter Zijlstra <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- tools/perf/builtin-report.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-)
tools/perf/builtin-report.c +21 -3
@@ -400,9 +400,27 @@ static void thread__insert_map(struct thread *self, struct map *map)list_for_each_entry_safe (pos, tmp, &self->maps, node) {if (map__overlap (pos, map)) { -list_del_init (&pos->node); -/* XXX leaks dsos */ -free (pos); +if (verbose >=2 ) { +printf ("overlapping maps:\n" ); +map__fprintf (map, stdout); +map__fprintf (pos, stdout); + } + +if (map->start <= pos->start && map->end > pos->start) + pos->start = map->end; + +if (map->end >= pos->end && map->start < pos->end) + pos->end = map->start; + +if (verbose >=2 ) { +printf ("after collision:\n" ); +map__fprintf (pos, stdout); + } + +if (pos->start >= pos->end) { +list_del_init (&pos->node); +free (pos); + } } }