path: root/tools/perf/util/map.c
diff options
authorJiri Olsa <jolsa@kernel.org>2020-02-10 15:32:18 +0100
committerArnaldo Carvalho de Melo <acme@redhat.com>2020-02-11 16:41:49 -0300
commit484214f49bd0948d716832a94e4737ca4dd02c16 (patch)
tree4d829a7780a4276f5fd99c2d6987cd66b9c79e39 /tools/perf/util/map.c
parentperf maps: Fix map__clone() for struct kmap (diff)
perf maps: Move kmap::kmaps setup to maps__insert()
So the kmaps pointer setup is centralized and we do not need to update it in all those places (2 current places and few more missing) after calling maps__insert(). Reported-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com> Signed-off-by: Jiri Olsa <jolsa@kernel.org> Tested-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com> Tested-by: Kim Phillips <kim.phillips@amd.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lore.kernel.org/lkml/20200210143218.24948-5-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to '')
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index cea05fc9595c..a08ca276098e 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -543,6 +543,16 @@ void maps__insert(struct maps *maps, struct map *map)
__maps__insert(maps, map);
+ if (map->dso && map->dso->kernel) {
+ struct kmap *kmap = map__kmap(map);
+ if (kmap)
+ kmap->kmaps = maps;
+ else
+ pr_err("Internal error: kernel dso with non kernel map\n");
+ }
* If we already performed some search by name, then we need to add the just
* inserted map and resort.