perf maps: Make delete static, always use put

Address/leak sanitizer with reference count checking can identify the
location of leaks, so use put rather than delete to avoid free-ing
memory when the reference count is >1. Add maps__zput to ensure the
variable is cleared.

Signed-off-by: Ian Rogers <[e-mail]>
Cc: Adrian Hunter <[e-mail]>
Cc: Alexander Shishkin <[e-mail]>
Cc: Ali Saidi <[e-mail]>
Cc: Andi Kleen <[e-mail]>
Cc: Athira Rajeev <[e-mail]>
Cc: Brian Robbins <[e-mail]>
Cc: Changbin Du <[e-mail]>
Cc: Dmitrii Dolgov <[e-mail]>
Cc: Fangrui Song <[e-mail]>
Cc: German Gomez <[e-mail]>
Cc: Ingo Molnar <[e-mail]>
Cc: Ivan Babrou <[e-mail]>
Cc: James Clark <[e-mail]>
Cc: Jing Zhang <[e-mail]>
Cc: Jiri Olsa <[e-mail]>
Cc: John Garry <[e-mail]>
Cc: K Prateek Nayak <[e-mail]>
Cc: Kan Liang <[e-mail]>
Cc: Leo Yan <[e-mail]>
Cc: Liam Howlett <[e-mail]>
Cc: Mark Rutland <[e-mail]>
Cc: Miguel Ojeda <[e-mail]>
Cc: Mike Leach <[e-mail]>
Cc: Namhyung Kim <[e-mail]>
Cc: Naveen N. Rao <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>
Cc: Ravi Bangoria <[e-mail]>
Cc: Sean Christopherson <[e-mail]>
Cc: Steinar H. Gunderson <[e-mail]>
Cc: Suzuki Poulouse <[e-mail]>
Cc: Wenyu Liu <[e-mail]>
Cc: Will Deacon <[e-mail]>
Cc: Yang Jihong <[e-mail]>
Cc: Ye Xingchen <[e-mail]>
Cc: Yuan Can <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Link: https://lore.kernel.org/r/[e-mail]
Signed-off-by: Arnaldo Carvalho de Melo <[e-mail]>

tools/perf/tests/maps.c

···
 	ret = check_maps(merged3, ARRAY_SIZE(merged3), maps);
 	TEST_ASSERT_VAL("merge check failed", !ret);
 
-	maps__delete(maps);
+	maps__zput(maps);
 	return TEST_OK;
 }
 

tools/perf/util/machine.c

···
 		return;
 
 	machine__destroy_kernel_maps(machine);
-	maps__delete(machine->kmaps);
+	maps__zput(machine->kmaps);
 	dsos__exit(&machine->dsos);
 	machine__exit_vdso(machine);
 	zfree(&machine->root_dir);

tools/perf/util/maps.c

···
 	return result;
 }
 
-void maps__delete(struct maps *maps)
+static void maps__delete(struct maps *maps)
 {
 	maps__exit(maps);
 	unwind__finish_access(maps);

tools/perf/util/maps.h

···
 };
 
 struct maps *maps__new(struct machine *machine);
-void maps__delete(struct maps *maps);
 bool maps__empty(struct maps *maps);
 int maps__clone(struct thread *thread, struct maps *parent);
 
 struct maps *maps__get(struct maps *maps);
 void maps__put(struct maps *maps);
+
+static inline void __maps__zput(struct maps **map)
+{
+	maps__put(*map);
+	*map = NULL;
+}
+
+#define maps__zput(map) __maps__zput(&map)
 
 static inline struct rb_root *maps__entries(struct maps *maps)
 {