perf symbols: Fix kallsyms kernel/module map splitting

On ARM, module addresss space is ahead of kernel space, so the module
symbols are handled before kernel symbol in dso__split_kallsyms, then
was causing one map to be created for each kernel symbol.

Reported-by: Ming Lei <tom.leiming@gmail.com>
Tested-by: Ming Lei <tom.leiming@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Ming Lei <tom.leiming@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <20101124144540.GB15875@ghostprotocols.net>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 11 insertions, 5 deletions

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 0500895a45af..2af4d7d22373 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -532,7 +532,7 @@ static int dso__split_kallsyms(struct dso *self, struct map *map,
         struct machine *machine = kmaps->machine;
         struct map *curr_map = map;
         struct symbol *pos;
-        int count = 0;
+        int count = 0, moved = 0;       
         struct rb_root *root = &self->symbols[map->type];
         struct rb_node *next = rb_first(root);
         int kernel_range = 0;
@@ -590,6 +590,11 @@ static int dso__split_kallsyms(struct dso *self, struct map *map,
                         char dso_name[PATH_MAX];
                         struct dso *dso;
 
+                        if (count == 0) {
+                                curr_map = map;
+                                goto filter_symbol;
+                        }
+
                         if (self->kernel == DSO_TYPE_GUEST_KERNEL)
                                 snprintf(dso_name, sizeof(dso_name),
                                         "[guest.kernel].%d",
@@ -615,7 +620,7 @@ static int dso__split_kallsyms(struct dso *self, struct map *map,
                         map_groups__insert(kmaps, curr_map);
                         ++kernel_range;
                 }
-
+filter_symbol:
                 if (filter && filter(curr_map, pos)) {
 discard_symbol:         rb_erase(&pos->rb_node, root);
                         symbol__delete(pos);
@@ -623,8 +628,9 @@ discard_symbol:		rb_erase(&pos->rb_node, root);
                         if (curr_map != map) {
                                 rb_erase(&pos->rb_node, root);
                                 symbols__insert(&curr_map->dso->symbols[curr_map->type], pos);
-                        }
-                        count++;
+                                ++moved;
+                        } else
+                                ++count;
                 }
         }
 
@@ -634,7 +640,7 @@ discard_symbol:		rb_erase(&pos->rb_node, root);
                 dso__set_loaded(curr_map->dso, curr_map->type);
         }
 
-        return count;
+        return count + moved;
 }
 
 int dso__load_kallsyms(struct dso *self, const char *filename,