perf probe: Do not use dwfl_module_addrsym if dwarf_diename finds symbol name

Do not use dwfl_module_addrsym if dwarf_diename can find the symbol
name, since dwfl_module_addrsym can be failed on shared libraries.

Without this patch
  ----
  $ perf probe -x ../lib/traceevent/libtraceevent.so -V create_arg_op
  Failed to find symbol at 0x11df1
  Failed to find the address of create_arg_op
    Error: Failed to show vars.
  ----
With this patch
  ----
  $ perf probe -x ../lib/traceevent/libtraceevent.so -V create_arg_op
  Available variables at create_arg_op
          @<create_arg_op+0>
                  enum filter_op_type     btype
                  struct filter_arg*      arg
  ----

This bug was reported on [email protected].

Reported-by: david lerner <[email protected]>
Signed-off-by: Masami Hiramatsu <[email protected]>
Cc: david lerner <[email protected]>
Cc: [email protected]
Cc: [email protected]
Link: http://permalink.gmane.org/gmane.linux.kernel.perf.user/1691
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index 9c593561aa71d483d384206a02835965a20aac44..c7918f83b300086649f522bc5f663d9a5a88a5dc 100644 (file)
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -609,14 +609,18 @@ static int convert_to_trace_point(Dwarf_Die *sp_die, Dwfl_Module *mod,
                return -EINVAL;
        }
 
-       /* Get an appropriate symbol from symtab */
-       symbol = dwfl_module_addrsym(mod, paddr, &sym, NULL);
+       symbol = dwarf_diename(sp_die);
        if (!symbol) {
-               pr_warning("Failed to find symbol at 0x%lx\n",
-                          (unsigned long)paddr);
-               return -ENOENT;
+               /* Try to get the symbol name from symtab */
+               symbol = dwfl_module_addrsym(mod, paddr, &sym, NULL);
+               if (!symbol) {
+                       pr_warning("Failed to find symbol at 0x%lx\n",
+                                  (unsigned long)paddr);
+                       return -ENOENT;
+               }
+               eaddr = sym.st_value;
        }
-       tp->offset = (unsigned long)(paddr - sym.st_value);
+       tp->offset = (unsigned long)(paddr - eaddr);
        tp->address = (unsigned long)paddr;
        tp->symbol = strdup(symbol);
        if (!tp->symbol)