Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core

6 files changed, 96 insertions, 18 deletions

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index a6cea2894d12..e7263d49bcf0 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -93,6 +93,8 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template)
         if (self != NULL) {
                 *self = *template;
                 self->nr_events = 1;
+                if (self->ms.map)
+                        self->ms.map->referenced = true;
                 if (symbol_conf.use_callchain)
                         callchain_init(self->callchain);
         }
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 15d6a6dd50c5..3a7eb6ec0eec 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -29,6 +29,7 @@ void map__init(struct map *self, enum map_type type,
         self->unmap_ip = map__unmap_ip;
         RB_CLEAR_NODE(&self->rb_node);
         self->groups   = NULL;
+        self->referenced = false;
 }
 
 struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,
@@ -387,6 +388,7 @@ int map_groups__fixup_overlappings(struct map_groups *self, struct map *map,
 {
         struct rb_root *root = &self->maps[map->type];
         struct rb_node *next = rb_first(root);
+        int err = 0;
 
         while (next) {
                 struct map *pos = rb_entry(next, struct map, rb_node);
@@ -403,20 +405,16 @@ int map_groups__fixup_overlappings(struct map_groups *self, struct map *map,
 
                 rb_erase(&pos->rb_node, root);
                 /*
-                 * We may have references to this map, for instance in some
-                 * hist_entry instances, so just move them to a separate
-                 * list.
-                 */
-                list_add_tail(&pos->node, &self->removed_maps[map->type]);
-                /*
                  * Now check if we need to create new maps for areas not
                  * overlapped by the new map:
                  */
                 if (map->start > pos->start) {
                         struct map *before = map__clone(pos);
 
-                        if (before == NULL)
-                                return -ENOMEM;
+                        if (before == NULL) {
+                                err = -ENOMEM;
+                                goto move_map;
+                        }
 
                         before->end = map->start - 1;
                         map_groups__insert(self, before);
@@ -427,14 +425,27 @@ int map_groups__fixup_overlappings(struct map_groups *self, struct map *map,
                 if (map->end < pos->end) {
                         struct map *after = map__clone(pos);
 
-                        if (after == NULL)
-                                return -ENOMEM;
+                        if (after == NULL) {
+                                err = -ENOMEM;
+                                goto move_map;
+                        }
 
                         after->start = map->end + 1;
                         map_groups__insert(self, after);
                         if (verbose >= 2)
                                 map__fprintf(after, fp);
                 }
+move_map:
+                /*
+                 * If we have references, just move them to a separate list.
+                 */
+                if (pos->referenced)
+                        list_add_tail(&pos->node, &self->removed_maps[map->type]);
+                else
+                        map__delete(pos);
+
+                if (err)
+                        return err;
         }
 
         return 0;
@@ -506,6 +517,11 @@ void maps__insert(struct rb_root *maps, struct map *map)
         rb_insert_color(&map->rb_node, maps);
 }
 
+void maps__remove(struct rb_root *self, struct map *map)
+{
+        rb_erase(&map->rb_node, self);
+}
+
 struct map *maps__find(struct rb_root *maps, u64 ip)
 {
         struct rb_node **p = &maps->rb_node;
@@ -551,13 +567,6 @@ static void dsos__delete(struct list_head *self)
 
 void machine__exit(struct machine *self)
 {
-        struct kmap *kmap = map__kmap(self->vmlinux_maps[MAP__FUNCTION]);
-
-        if (kmap->ref_reloc_sym) {
-                free((char *)kmap->ref_reloc_sym->name);
-                free(kmap->ref_reloc_sym);
-        }
-
         map_groups__exit(&self->kmaps);
         dsos__delete(&self->user_dsos);
         dsos__delete(&self->kernel_dsos);
@@ -565,6 +574,12 @@ void machine__exit(struct machine *self)
         self->root_dir = NULL;
 }
 
+void machine__delete(struct machine *self)
+{
+        machine__exit(self);
+        free(self);
+}
+
 struct machine *machines__add(struct rb_root *self, pid_t pid,
                               const char *root_dir)
 {
diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h
index 0e0984e86fce..78575796d5f3 100644
--- a/tools/perf/util/map.h
+++ b/tools/perf/util/map.h
@@ -29,7 +29,8 @@ struct map {
         };
         u64                     start;
         u64                     end;
-        enum map_type           type;
+        u8 /* enum map_type */  type;
+        bool                    referenced;
         u32                     priv;
         u64                     pgoff;
 
@@ -125,6 +126,7 @@ void map__reloc_vmlinux(struct map *self);
 size_t __map_groups__fprintf_maps(struct map_groups *self,
                                   enum map_type type, int verbose, FILE *fp);
 void maps__insert(struct rb_root *maps, struct map *map);
+void maps__remove(struct rb_root *self, struct map *map);
 struct map *maps__find(struct rb_root *maps, u64 addr);
 void map_groups__init(struct map_groups *self);
 void map_groups__exit(struct map_groups *self);
@@ -144,6 +146,7 @@ struct machine *machines__findnew(struct rb_root *self, pid_t pid);
 char *machine__mmap_name(struct machine *self, char *bf, size_t size);
 int machine__init(struct machine *self, const char *root_dir, pid_t pid);
 void machine__exit(struct machine *self);
+void machine__delete(struct machine *self);
 
 /*
  * Default guest kernel is defined by parameter --guestkallsyms
@@ -165,6 +168,11 @@ static inline void map_groups__insert(struct map_groups *self, struct map *map)
         map->groups = self;
 }
 
+static inline void map_groups__remove(struct map_groups *self, struct map *map)
+{
+        maps__remove(&self->maps[map->type], map);
+}
+
 static inline struct map *map_groups__find(struct map_groups *self,
                                            enum map_type type, u64 addr)
 {
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 04a3b3db9e90..fa9d652c2dc3 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -79,6 +79,12 @@ int perf_session__create_kernel_maps(struct perf_session *self)
         return ret;