From: Changbin Du <changbin...@gmail.com>

[ Upstream commit da3a53a7390a89391bd63bead0c2e9af4c5ef3d6 ]

Add function __maps__purge_names() to purge all maps from the names
tree.  We need to cleanup the names tree in maps__exit().

Detected with gcc's ASan.

Signed-off-by: Changbin Du <changbin...@gmail.com>
Reviewed-by: Jiri Olsa <jo...@kernel.org>
Cc: Alexei Starovoitov <a...@kernel.org>
Cc: Daniel Borkmann <dan...@iogearbox.net>
Cc: Eric Saint-Etienne <eric.saint.etie...@oracle.com>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Steven Rostedt (VMware) <rost...@goodmis.org>
Fixes: 1e6285699b30 ("perf symbols: Fix slowness due to -ffunction-section")
Link: http://lkml.kernel.org/r/20190316080556.3075-12-changbin...@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 tools/perf/util/map.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 750ecc3dad50..2b37f56f0549 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -571,10 +571,25 @@ static void __maps__purge(struct maps *maps)
        }
 }
 
+static void __maps__purge_names(struct maps *maps)
+{
+       struct rb_root *root = &maps->names;
+       struct rb_node *next = rb_first(root);
+
+       while (next) {
+               struct map *pos = rb_entry(next, struct map, rb_node_name);
+
+               next = rb_next(&pos->rb_node_name);
+               rb_erase_init(&pos->rb_node_name, root);
+               map__put(pos);
+       }
+}
+
 static void maps__exit(struct maps *maps)
 {
        down_write(&maps->lock);
        __maps__purge(maps);
+       __maps__purge_names(maps);
        up_write(&maps->lock);
 }
 
-- 
2.19.1

Reply via email to