5 files changed, 74 insertions, 20 deletions

diff --git a/tools/perf/arch/powerpc/util/sym-handling.c b/tools/perf/arch/powerpc/util/sym-handling.c
index 39dbe512b9fc..bf9a2594572c 100644
--- a/tools/perf/arch/powerpc/util/sym-handling.c
+++ b/tools/perf/arch/powerpc/util/sym-handling.c
@@ -52,6 +52,18 @@ int arch__compare_symbol_names(const char *namea, const char *nameb)
 
         return strcmp(namea, nameb);
 }
+
+int arch__compare_symbol_names_n(const char *namea, const char *nameb,
+                                 unsigned int n)
+{
+        /* Skip over initial dot */
+        if (*namea == '.')
+                namea++;
+        if (*nameb == '.')
+                nameb++;
+
+        return strncmp(namea, nameb, n);
+}
 #endif
 
 #if defined(_CALL_ELF) && _CALL_ELF == 2
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index ebfa5d92358a..2179b2deb730 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -325,11 +325,6 @@ int map__load(struct map *map)
         return 0;
 }
 
-int __weak arch__compare_symbol_names(const char *namea, const char *nameb)
-{
-        return strcmp(namea, nameb);
-}
-
 struct symbol *map__find_symbol(struct map *map, u64 addr)
 {
         if (map__load(map) < 0)
diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h
index c8a5a644c0a9..f9e8ac8a52cd 100644
--- a/tools/perf/util/map.h
+++ b/tools/perf/util/map.h
@@ -130,13 +130,14 @@ struct thread;
  */
 #define __map__for_each_symbol_by_name(map, sym_name, pos)      \
         for (pos = map__find_symbol_by_name(map, sym_name);     \
-             pos && arch__compare_symbol_names(pos->name, sym_name) == 0;       \
+             pos &&                                             \
+             !symbol__match_symbol_name(pos->name, sym_name,    \
+                                        SYMBOL_TAG_INCLUDE__DEFAULT_ONLY); \
              pos = symbol__next_by_name(pos))
 
 #define map__for_each_symbol_by_name(map, sym_name, pos)                \
         __map__for_each_symbol_by_name(map, sym_name, (pos))
 
-int arch__compare_symbol_names(const char *namea, const char *nameb);
 void map__init(struct map *map, enum map_type type,
                u64 start, u64 end, u64 pgoff, struct dso *dso);
 struct map *map__new(struct machine *machine, u64 start, u64 len,
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index b349e8eda0e2..8f2b068ff756 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -90,6 +90,17 @@ static int prefix_underscores_count(const char *str)
         return tail - str;
 }
 
+int __weak arch__compare_symbol_names(const char *namea, const char *nameb)
+{
+        return strcmp(namea, nameb);
+}
+
+int __weak arch__compare_symbol_names_n(const char *namea, const char *nameb,
+                                        unsigned int n)
+{
+        return strncmp(namea, nameb, n);
+}
+
 int __weak arch__choose_best_symbol(struct symbol *syma,
                                     struct symbol *symb __maybe_unused)
 {
@@ -399,8 +410,26 @@ static void symbols__sort_by_name(struct rb_root *symbols,
         }
 }
 
+int symbol__match_symbol_name(const char *name, const char *str,
+                              enum symbol_tag_include includes)
+{
+        const char *versioning;
+
+        if (includes == SYMBOL_TAG_INCLUDE__DEFAULT_ONLY &&
+            (versioning = strstr(name, "@@"))) {
+                int len = strlen(str);
+
+                if (len < versioning - name)
+                        len = versioning - name;
+
+                return arch__compare_symbol_names_n(name, str, len);
+        } else
+                return arch__compare_symbol_names(name, str);
+}
+
 static struct symbol *symbols__find_by_name(struct rb_root *symbols,
-                                            const char *name)
+                                            const char *name,
+                                            enum symbol_tag_include includes)
 {
         struct rb_node *n;
         struct symbol_name_rb_node *s = NULL;
@@ -414,11 +443,11 @@ static struct symbol *symbols__find_by_name(struct rb_root *symbols,
                 int cmp;
 
                 s = rb_entry(n, struct symbol_name_rb_node, rb_node);
-                cmp = arch__compare_symbol_names(name, s->sym.name);
+                cmp = symbol__match_symbol_name(s->sym.name, name, includes);
 
-                if (cmp < 0)
+                if (cmp > 0)
                         n = n->rb_left;
-                else if (cmp > 0)
+                else if (cmp < 0)
                         n = n->rb_right;
                 else
                         break;
@@ -427,16 +456,17 @@ static struct symbol *symbols__find_by_name(struct rb_root *symbols,
         if (n == NULL)
                 return NULL;
 
-        /* return first symbol that has same name (if any) */
-        for (n = rb_prev(n); n; n = rb_prev(n)) {
-                struct symbol_name_rb_node *tmp;
+        if (includes != SYMBOL_TAG_INCLUDE__DEFAULT_ONLY)
+                /* return first symbol that has same name (if any) */
+                for (n = rb_prev(n); n; n = rb_prev(n)) {
+                        struct symbol_name_rb_node *tmp;
 
-                tmp = rb_entry(n, struct symbol_name_rb_node, rb_node);
-                if (arch__compare_symbol_names(tmp->sym.name, s->sym.name))
-                        break;
+                        tmp = rb_entry(n, struct symbol_name_rb_node, rb_node);
+                        if (arch__compare_symbol_names(tmp->sym.name, s->sym.name))
+                                break;
 
-                s = tmp;
-        }
+                        s = tmp;
+                }
 
         return &s->sym;
 }
@@ -503,7 +533,12 @@ struct symbol *symbol__next_by_name(struct symbol *sym)
 struct symbol *dso__find_symbol_by_name(struct dso *dso, enum map_type type,
                                         const char *name)
 {
-        return symbols__find_by_name(&dso->symbol_names[type], name);
+        struct symbol *s = symbols__find_by_name(&dso->symbol_names[type], name,
+                                                 SYMBOL_TAG_INCLUDE__NONE);
+        if (!s)
+                s = symbols__find_by_name(&dso->symbol_names[type], name,
+                                          SYMBOL_TAG_INCLUDE__DEFAULT_ONLY);
+        return s;
 }
 
 void dso__sort_by_name(struct dso *dso, enum map_type type)
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 7acd70fce68e..41ebba9a2eb2 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -348,8 +348,19 @@ void arch__sym_update(struct symbol *s, GElf_Sym *sym);
 #define SYMBOL_A 0
 #define SYMBOL_B 1
 
+int arch__compare_symbol_names(const char *namea, const char *nameb);
+int arch__compare_symbol_names_n(const char *namea, const char *nameb,
+                                 unsigned int n);
 int arch__choose_best_symbol(struct symbol *syma, struct symbol *symb);
 
+enum symbol_tag_include {
+        SYMBOL_TAG_INCLUDE__NONE = 0,
+        SYMBOL_TAG_INCLUDE__DEFAULT_ONLY
+};
+
+int symbol__match_symbol_name(const char *namea, const char *nameb,
+                              enum symbol_tag_include includes);
+
 /* structure containing an SDT note's info */
 struct sdt_note {
         char *name;                     /* name of the note*/