perf symbols: Fixup kernel_maps__fixup_end end map

We better call this routine after both the kernel and modules
are loaded, because as it was if there weren't modules it would not
be called, resulting in kernel_map->end remaining at zero, so no
map would be found and consequently the kernel symtab wouldn't
get loaded, i.e. no kernel symbols would be resolved.

Also this fixes another case, that is when we _have_ modules,
but the last map would have its ->end address not set before we
loaded its symbols, which would never happen because ->end was
not set.

Reported-by: Ingo Molnar <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Cc: Frédéric Weisbecker <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Paul Mackerras <[email protected]>
LKML-Reference: <1258821086[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 48f87f065a2ef6586386a07efdb1cd2c3312d547..e161a51c9fef456d317cf8ef39602d50d8569390 100644 (file)
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -71,6 +71,12 @@ static void kernel_maps__fixup_end(void)
                curr = rb_entry(nd, struct map, rb_node);
                prev->end = curr->start - 1;
        }
+
+       /*
+        * We still haven't the actual symbols, so guess the
+        * last map final address.
+        */
+       curr->end = ~0UL;
 }
 
 static struct symbol *symbol__new(u64 start, u64 len, const char *name)
@@ -1319,12 +1325,6 @@ static int kernel_maps__create_module_maps(void)
        free(line);
        fclose(file);
 
-       /*
-        * Now that we have all sorted out, just set the ->end of all
-        * maps:
-        */
-       kernel_maps__fixup_end();
-
        return dsos__set_modules_path();
 
 out_delete_line:
@@ -1493,7 +1493,10 @@ int kernel_maps__init(bool use_modules)
        if (use_modules && kernel_maps__create_module_maps() < 0)
                pr_warning("Failed to load list of modules in use, "
                           "continuing...\n");
-
+       /*
+        * Now that we have all the maps created, just set the ->end of them:
+        */
+       kernel_maps__fixup_end();
        return 0;
 }