perf map: Remove map from 'names' tree in __maps__remove()
authorChangbin Du <changbin.du@gmail.com>
Sat, 16 Mar 2019 08:05:50 +0000 (16:05 +0800)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 19 Mar 2019 19:52:05 +0000 (16:52 -0300)
There are two trees for each map inserted by maps__insert(), so remove
it from the 'names' tree in __maps__remove().

Detected with gcc's ASan.

Signed-off-by: Changbin Du <changbin.du@gmail.com>
Reviewed-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Eric Saint-Etienne <eric.saint.etienne@oracle.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Fixes: 1e6285699b30 ("perf symbols: Fix slowness due to -ffunction-section")
Link: http://lkml.kernel.org/r/20190316080556.3075-11-changbin.du@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/map.c

index fbeb0c6efaa6e5ea05383e7a9227798b313379d4..64bea5eb8bf624fd541243d021df2d0539cd7a9b 100644 (file)
@@ -917,6 +917,9 @@ static void __maps__remove(struct maps *maps, struct map *map)
 {
        rb_erase_init(&map->rb_node, &maps->entries);
        map__put(map);
+
+       rb_erase_init(&map->rb_node_name, &maps->names);
+       map__put(map);
 }
 
 void maps__remove(struct maps *maps, struct map *map)