1 files changed, 131 insertions, 43 deletions

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 995fc25db8c6..98125319b158 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -6,7 +6,7 @@
 #include "parse-options.h"
 #include "parse-events.h"
 #include "exec_cmd.h"
-#include "string.h"
+#include "linux/string.h"
 #include "symbol.h"
 #include "cache.h"
 #include "header.h"
@@ -15,6 +15,7 @@
 #define YY_EXTRA_TYPE int
 #include "parse-events-flex.h"
 #include "pmu.h"
+#include "thread_map.h"
 
 #define MAX_NAME_LEN 100
 
@@ -108,6 +109,10 @@ static struct event_symbol event_symbols_sw[PERF_COUNT_SW_MAX] = {
                 .symbol = "emulation-faults",
                 .alias  = "",
         },
+        [PERF_COUNT_SW_DUMMY] = {
+                .symbol = "dummy",
+                .alias  = "",
+        },
 };
 
 #define __PERF_EVENT_FIELD(config, name) \
@@ -217,6 +222,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) {
@@ -241,40 +269,29 @@ const char *event_type(int type)
 
 
 
-static int __add_event(struct list_head **_list, int *idx,
+static int __add_event(struct list_head *list, int *idx,
                        struct perf_event_attr *attr,
                        char *name, struct cpu_map *cpus)
 {
         struct perf_evsel *evsel;
-        struct list_head *list = *_list;
-
-        if (!list) {
-                list = malloc(sizeof(*list));
-                if (!list)
-                        return -ENOMEM;
-                INIT_LIST_HEAD(list);
-        }
 
         event_attr_init(attr);
 
         evsel = perf_evsel__new(attr, (*idx)++);
-        if (!evsel) {
-                free(list);
+        if (!evsel)
                 return -ENOMEM;
-        }
 
         evsel->cpus = cpus;
         if (name)
                 evsel->name = strdup(name);
         list_add_tail(&evsel->node, list);
-        *_list = list;
         return 0;
 }
 
-static int add_event(struct list_head **_list, int *idx,
+static int add_event(struct list_head *list, int *idx,
                      struct perf_event_attr *attr, char *name)
 {
-        return __add_event(_list, idx, attr, name, NULL);
+        return __add_event(list, idx, attr, name, NULL);
 }
 
 static int parse_aliases(char *str, const char *names[][PERF_EVSEL__MAX_ALIASES], int size)
@@ -295,7 +312,7 @@ static int parse_aliases(char *str, const char *names[][PERF_EVSEL__MAX_ALIASES]
         return -1;
 }
 
-int parse_events_add_cache(struct list_head **list, int *idx,
+int parse_events_add_cache(struct list_head *list, int *idx,
                            char *type, char *op_result1, char *op_result2)
 {
         struct perf_event_attr attr;
@@ -356,31 +373,21 @@ int parse_events_add_cache(struct list_head **list, int *idx,
         return add_event(list, idx, &attr, name);
 }
 
-static int add_tracepoint(struct list_head **listp, int *idx,
+static int add_tracepoint(struct list_head *list, int *idx,
                           char *sys_name, char *evt_name)
 {
         struct perf_evsel *evsel;
-        struct list_head *list = *listp;
-
-        if (!list) {
-                list = malloc(sizeof(*list));
-                if (!list)
-                        return -ENOMEM;
-                INIT_LIST_HEAD(list);
-        }
 
         evsel = perf_evsel__newtp(sys_name, evt_name, (*idx)++);
-        if (!evsel) {
-                free(list);
+        if (!evsel)
                 return -ENOMEM;
-        }
 
         list_add_tail(&evsel->node, list);
-        *listp = list;
+
         return 0;
 }
 
-static int add_tracepoint_multi_event(struct list_head **list, int *idx,
+static int add_tracepoint_multi_event(struct list_head *list, int *idx,
                                       char *sys_name, char *evt_name)
 {
         char evt_path[MAXPATHLEN];
@@ -412,7 +419,7 @@ static int add_tracepoint_multi_event(struct list_head **list, int *idx,
         return ret;
 }
 
-static int add_tracepoint_event(struct list_head **list, int *idx,
+static int add_tracepoint_event(struct list_head *list, int *idx,
                                 char *sys_name, char *evt_name)
 {
         return strpbrk(evt_name, "*?") ?
@@ -420,7 +427,7 @@ static int add_tracepoint_event(struct list_head **list, int *idx,
                add_tracepoint(list, idx, sys_name, evt_name);
 }
 
-static int add_tracepoint_multi_sys(struct list_head **list, int *idx,
+static int add_tracepoint_multi_sys(struct list_head *list, int *idx,
                                     char *sys_name, char *evt_name)
 {
         struct dirent *events_ent;
@@ -452,7 +459,7 @@ static int add_tracepoint_multi_sys(struct list_head **list, int *idx,
         return ret;
 }
 
-int parse_events_add_tracepoint(struct list_head **list, int *idx,
+int parse_events_add_tracepoint(struct list_head *list, int *idx,
                                 char *sys, char *event)
 {
         int ret;
@@ -507,7 +514,7 @@ do {					\
         return 0;
 }
 
-int parse_events_add_breakpoint(struct list_head **list, int *idx,
+int parse_events_add_breakpoint(struct list_head *list, int *idx,
                                 void *ptr, char *type)
 {
         struct perf_event_attr attr;
@@ -588,7 +595,7 @@ static int config_attr(struct perf_event_attr *attr,
         return 0;
 }
 
-int parse_events_add_numeric(struct list_head **list, int *idx,
+int parse_events_add_numeric(struct list_head *list, int *idx,
                              u32 type, u64 config,
                              struct list_head *head_config)
 {
@@ -621,7 +628,7 @@ static char *pmu_event_name(struct list_head *head_terms)
         return NULL;
 }
 
-int parse_events_add_pmu(struct list_head **list, int *idx,
+int parse_events_add_pmu(struct list_head *list, int *idx,
                          char *name, struct list_head *head_config)
 {
         struct perf_event_attr attr;
@@ -664,6 +671,7 @@ void parse_events__set_leader(char *name, struct list_head *list)
         leader->group_name = name ? strdup(name) : NULL;
 }
 
+/* list_event is assumed to point to malloc'ed memory */
 void parse_events_update_lists(struct list_head *list_event,
                                struct list_head *list_all)
 {
@@ -684,6 +692,8 @@ struct event_modifier {
         int eG;
         int precise;
         int exclude_GH;
+        int sample_read;
+        int pinned;
 };
 
 static int get_event_modifier(struct event_modifier *mod, char *str,
@@ -695,6 +705,8 @@ static int get_event_modifier(struct event_modifier *mod, char *str,
         int eH = evsel ? evsel->attr.exclude_host : 0;
         int eG = evsel ? evsel->attr.exclude_guest : 0;
         int precise = evsel ? evsel->attr.precise_ip : 0;
+        int sample_read = 0;
+        int pinned = evsel ? evsel->attr.pinned : 0;
 
         int exclude = eu | ek | eh;
         int exclude_GH = evsel ? evsel->exclude_GH : 0;
@@ -727,6 +739,10 @@ static int get_event_modifier(struct event_modifier *mod, char *str,
                         /* use of precise requires exclude_guest */
                         if (!exclude_GH)
                                 eG = 1;
+                } else if (*str == 'S') {
+                        sample_read = 1;
+                } else if (*str == 'D') {
+                        pinned = 1;
                 } else
                         break;
 
@@ -753,6 +769,9 @@ static int get_event_modifier(struct event_modifier *mod, char *str,
         mod->eG = eG;
         mod->precise = precise;
         mod->exclude_GH = exclude_GH;
+        mod->sample_read = sample_read;
+        mod->pinned = pinned;
+
         return 0;
 }
 
@@ -765,7 +784,7 @@ static int check_modifier(char *str)
         char *p = str;
 
         /* The sizeof includes 0 byte as well. */
-        if (strlen(str) > (sizeof("ukhGHppp") - 1))
+        if (strlen(str) > (sizeof("ukhGHpppSD") - 1))
                 return -1;
 
         while (*p) {
@@ -803,6 +822,10 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add)
                 evsel->attr.exclude_host   = mod.eH;
                 evsel->attr.exclude_guest  = mod.eG;
                 evsel->exclude_GH          = mod.exclude_GH;
+                evsel->sample_read         = mod.sample_read;
+
+                if (perf_evsel__is_group_leader(evsel))
+                        evsel->attr.pinned = mod.pinned;
         }
 
         return 0;
@@ -820,6 +843,32 @@ int parse_events_name(struct list_head *list, char *name)
         return 0;
 }
 
+static int parse_events__scanner(const char *str, void *data, int start_token);
+
+static int parse_events_fixup(int ret, const char *str, void *data,
+                              int start_token)
+{
+        char *o = strdup(str);
+        char *s = NULL;
+        char *t = o;
+        char *p;
+        int len = 0;
+
+        if (!o)
+                return ret;
+        while ((p = strsep(&t, ",")) != NULL) {
+                if (s)
+                        str_append(&s, &len, ",");
+                str_append(&s, &len, "cpu/");
+                str_append(&s, &len, p);
+                str_append(&s, &len, "/");
+        }
+        free(o);
+        if (!s)
+                return -ENOMEM;
+        return parse_events__scanner(s, data, start_token);
+}
+
 static int parse_events__scanner(const char *str, void *data, int start_token)
 {
         YY_BUFFER_STATE buffer;
@@ -840,6 +889,8 @@ static int parse_events__scanner(const char *str, void *data, int start_token)
         parse_events__flush_buffer(buffer, scanner);
         parse_events__delete_buffer(buffer, scanner);
         parse_events_lex_destroy(scanner);
+        if (ret && !strchr(str, '/'))
+                ret = parse_events_fixup(ret, str, data, start_token);
         return ret;
 }
 
@@ -1026,6 +1077,33 @@ int is_valid_tracepoint(const char *event_string)
         return 0;
 }
 
+static bool is_event_supported(u8 type, unsigned config)
+{
+        bool ret = true;
+        struct perf_evsel *evsel;
+        struct perf_event_attr attr = {
+                .type = type,
+                .config = config,
+                .disabled = 1,
+                .exclude_kernel = 1,
+        };
+        struct {
+                struct thread_map map;
+                int threads[1];
+        } tmap = {
+                .map.nr  = 1,
+                .threads = { 0 },
+        };
+
+        evsel = perf_evsel__new(&attr, 0);
+        if (evsel) {
+                ret = perf_evsel__open(evsel, NULL, &tmap.map) >= 0;
+                perf_evsel__delete(evsel);
+        }
+
+        return ret;
+}
+
 static void __print_events_type(u8 type, struct event_symbol *syms,
                                 unsigned max)
 {
@@ -1033,14 +1111,16 @@ static void __print_events_type(u8 type, struct event_symbol *syms,
         unsigned i;
 
         for (i = 0; i < max ; i++, syms++) {
+                if (!is_event_supported(type, i))
+                        continue;
+
                 if (strlen(syms->alias))
                         snprintf(name, sizeof(name),  "%s OR %s",
                                  syms->symbol, syms->alias);
                 else
                         snprintf(name, sizeof(name), "%s", syms->symbol);
 
-                printf("  %-50s [%s]\n", name,
-                        event_type_descriptors[type]);
+                printf("  %-50s [%s]\n", name, event_type_descriptors[type]);
         }
 }
 
@@ -1069,6 +1149,10 @@ int print_hwcache_events(const char *event_glob, bool name_only)
                                 if (event_glob != NULL && !strglobmatch(name, event_glob))
                                         continue;
 
+                                if (!is_event_supported(PERF_TYPE_HW_CACHE,
+                                                        type | (op << 8) | (i << 16)))
+                                        continue;
+
                                 if (name_only)
                                         printf("%s ", name);
                                 else
@@ -1079,6 +1163,8 @@ int print_hwcache_events(const char *event_glob, bool name_only)
                 }
         }
 
+        if (printed)
+                printf("\n");
         return printed;
 }
 
@@ -1096,6 +1182,9 @@ static void print_symbol_events(const char *event_glob, unsigned type,
                       (syms->alias && strglobmatch(syms->alias, event_glob))))
                         continue;
 
+                if (!is_event_supported(type, i))
+                        continue;
+
                 if (name_only) {
                         printf("%s ", syms->symbol);
                         continue;
@@ -1133,11 +1222,12 @@ void print_events(const char *event_glob, bool name_only)
 
         print_hwcache_events(event_glob, name_only);
 
+        print_pmu_events(event_glob, name_only);
+
         if (event_glob != NULL)
                 return;
 
         if (!name_only) {
-                printf("\n");
                 printf("  %-50s [%s]\n",
                        "rNNN",
                        event_type_descriptors[PERF_TYPE_RAW]);
@@ -1237,6 +1327,4 @@ void parse_events__free_terms(struct list_head *terms)
 
         list_for_each_entry_safe(term, h, terms, list)
                 free(term);
-
-        free(terms);
 }