3 files changed, 39 insertions, 0 deletions

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 995fc25db8c6..ef72e98a07a6 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -217,6 +217,29 @@ struct tracepoint_path *tracepoint_id_to_path(u64 config)
         return NULL;
 }
 
+struct tracepoint_path *tracepoint_name_to_path(const char *name)
+{
+        struct tracepoint_path *path = zalloc(sizeof(*path));
+        char *str = strchr(name, ':');
+
+        if (path == NULL || str == NULL) {
+                free(path);
+                return NULL;
+        }
+
+        path->system = strndup(name, str - name);
+        path->name = strdup(str+1);
+
+        if (path->system == NULL || path->name == NULL) {
+                free(path->system);
+                free(path->name);
+                free(path);
+                path = NULL;
+        }
+
+        return path;
+}
+
 const char *event_type(int type)
 {
         switch (type) {
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 8a4859315fd9..080f7cf25d99 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -23,6 +23,7 @@ struct tracepoint_path {
 };
 
 extern struct tracepoint_path *tracepoint_id_to_path(u64 config);
+extern struct tracepoint_path *tracepoint_name_to_path(const char *name);
 extern bool have_tracepoints(struct list_head *evlist);
 
 const char *event_type(int type);
diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
index 615c0628678b..a42624a6cb5c 100644
--- a/tools/perf/util/trace-event-info.c
+++ b/tools/perf/util/trace-event-info.c
@@ -414,12 +414,27 @@ get_tracepoints_path(struct list_head *pattrs)
                 if (pos->attr.type != PERF_TYPE_TRACEPOINT)
                         continue;
                 ++nr_tracepoints;
+
+                if (pos->name) {
+                        ppath->next = tracepoint_name_to_path(pos->name);
+                        if (ppath->next)
+                                goto next;
+
+                        if (strchr(pos->name, ':') == NULL)
+                                goto try_id;
+
+                        goto error;
+                }
+
+try_id:
                 ppath->next = tracepoint_id_to_path(pos->attr.config);
                 if (!ppath->next) {
+error:
                         pr_debug("No memory to alloc tracepoints list\n");
                         put_tracepoints_path(&path);
                         return NULL;
                 }
+next:
                 ppath = ppath->next;
         }