13 files changed, 45 insertions, 15 deletions

diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index 22f8a00446e1..6b3250f54240 100644
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -545,7 +545,7 @@ out_err:
         if (evlist) {
                 perf_evlist__delete(evlist);
         } else {
-                cpu_map__delete(cpus);
+                cpu_map__put(cpus);
                 thread_map__delete(threads);
         }
         machines__destroy_kernel_maps(&machines);
diff --git a/tools/perf/tests/keep-tracking.c b/tools/perf/tests/keep-tracking.c
index 5b171d1e338b..a330235cefc0 100644
--- a/tools/perf/tests/keep-tracking.c
+++ b/tools/perf/tests/keep-tracking.c
@@ -144,7 +144,7 @@ out_err:
                 perf_evlist__disable(evlist);
                 perf_evlist__delete(evlist);
         } else {
-                cpu_map__delete(cpus);
+                cpu_map__put(cpus);
                 thread_map__delete(threads);
         }
 
diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c
index 5855cf471210..5a9ef5833452 100644
--- a/tools/perf/tests/mmap-basic.c
+++ b/tools/perf/tests/mmap-basic.c
@@ -140,7 +140,7 @@ out_delete_evlist:
         cpus    = NULL;
         threads = NULL;
 out_free_cpus:
-        cpu_map__delete(cpus);
+        cpu_map__put(cpus);
 out_free_threads:
         thread_map__delete(threads);
         return err;
diff --git a/tools/perf/tests/switch-tracking.c b/tools/perf/tests/switch-tracking.c
index 0d31403ea593..1b06122beb76 100644
--- a/tools/perf/tests/switch-tracking.c
+++ b/tools/perf/tests/switch-tracking.c
@@ -560,7 +560,7 @@ out:
                 perf_evlist__disable(evlist);
                 perf_evlist__delete(evlist);
         } else {
-                cpu_map__delete(cpus);
+                cpu_map__put(cpus);
                 thread_map__delete(threads);
         }
 
diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
index c4e55b71010c..3667e2123e5b 100644
--- a/tools/perf/util/cpumap.c
+++ b/tools/perf/util/cpumap.c
@@ -5,6 +5,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include "asm/bug.h"
 
 static struct cpu_map *cpu_map__default_new(void)
 {
@@ -22,6 +23,7 @@ static struct cpu_map *cpu_map__default_new(void)
                         cpus->map[i] = i;
 
                 cpus->nr = nr_cpus;
+                atomic_set(&cpus->refcnt, 1);
         }
 
         return cpus;
@@ -35,6 +37,7 @@ static struct cpu_map *cpu_map__trim_new(int nr_cpus, int *tmp_cpus)
         if (cpus != NULL) {
                 cpus->nr = nr_cpus;
                 memcpy(cpus->map, tmp_cpus, payload_size);
+                atomic_set(&cpus->refcnt, 1);
         }
 
         return cpus;
@@ -194,14 +197,32 @@ struct cpu_map *cpu_map__dummy_new(void)
         if (cpus != NULL) {
                 cpus->nr = 1;
                 cpus->map[0] = -1;
+                atomic_set(&cpus->refcnt, 1);
         }
 
         return cpus;
 }
 
-void cpu_map__delete(struct cpu_map *map)
+static void cpu_map__delete(struct cpu_map *map)
 {
-        free(map);
+        if (map) {
+                WARN_ONCE(atomic_read(&map->refcnt) != 0,
+                          "cpu_map refcnt unbalanced\n");
+                free(map);
+        }
+}
+
+struct cpu_map *cpu_map__get(struct cpu_map *map)
+{
+        if (map)
+                atomic_inc(&map->refcnt);
+        return map;
+}
+
+void cpu_map__put(struct cpu_map *map)
+{
+        if (map && atomic_dec_and_test(&map->refcnt))
+                cpu_map__delete(map);
 }
 
 int cpu_map__get_socket(struct cpu_map *map, int idx)
@@ -263,6 +284,7 @@ static int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,
         /* ensure we process id in increasing order */
         qsort(c->map, c->nr, sizeof(int), cmp_ids);
 
+        atomic_set(&cpus->refcnt, 1);
         *res = c;
         return 0;
 }
diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
index 61a654849002..0af9cecb4c51 100644
--- a/tools/perf/util/cpumap.h
+++ b/tools/perf/util/cpumap.h
@@ -3,18 +3,19 @@
 
 #include <stdio.h>
 #include <stdbool.h>
+#include <linux/atomic.h>
 
 #include "perf.h"
 #include "util/debug.h"
 
 struct cpu_map {
+        atomic_t refcnt;
         int nr;
         int map[];
 };
 
 struct cpu_map *cpu_map__new(const char *cpu_list);
 struct cpu_map *cpu_map__dummy_new(void);
-void cpu_map__delete(struct cpu_map *map);
 struct cpu_map *cpu_map__read(FILE *file);
 size_t cpu_map__fprintf(struct cpu_map *map, FILE *fp);
 int cpu_map__get_socket(struct cpu_map *map, int idx);
@@ -22,6 +23,9 @@ int cpu_map__get_core(struct cpu_map *map, int idx);
 int cpu_map__build_socket_map(struct cpu_map *cpus, struct cpu_map **sockp);
 int cpu_map__build_core_map(struct cpu_map *cpus, struct cpu_map **corep);
 
+struct cpu_map *cpu_map__get(struct cpu_map *map);
+void cpu_map__put(struct cpu_map *map);
+
 static inline int cpu_map__socket(struct cpu_map *sock, int s)
 {
         if (!sock || s > sock->nr || s < 0)
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index d29df901be3e..59498f7b3e9b 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -114,7 +114,7 @@ void perf_evlist__delete(struct perf_evlist *evlist)
 {
         perf_evlist__munmap(evlist);
         perf_evlist__close(evlist);
-        cpu_map__delete(evlist->cpus);
+        cpu_map__put(evlist->cpus);
         thread_map__delete(evlist->threads);
         evlist->cpus = NULL;
         evlist->threads = NULL;
@@ -1353,7 +1353,7 @@ static int perf_evlist__create_syswide_maps(struct perf_evlist *evlist)
 out:
         return err;
 out_free_cpus: