Merge tag 'v3.8-rc4' into irq/core

Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 51 insertions, 5 deletions

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 75c7b0fca6d9..2d8d53bec17e 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1,4 +1,4 @@
-#include "../../../include/linux/hw_breakpoint.h"
+#include <linux/hw_breakpoint.h>
 #include "util.h"
 #include "../perf.h"
 #include "evlist.h"
@@ -722,6 +722,27 @@ static int get_event_modifier(struct event_modifier *mod, char *str,
         return 0;
 }
 
+/*
+ * Basic modifier sanity check to validate it contains only one
+ * instance of any modifier (apart from 'p') present.
+ */
+static int check_modifier(char *str)
+{
+        char *p = str;
+
+        /* The sizeof includes 0 byte as well. */
+        if (strlen(str) > (sizeof("ukhGHppp") - 1))
+                return -1;
+
+        while (*p) {
+                if (*p != 'p' && strchr(p + 1, *p))
+                        return -1;
+                p++;
+        }
+
+        return 0;
+}
+
 int parse_events__modifier_event(struct list_head *list, char *str, bool add)
 {
         struct perf_evsel *evsel;
@@ -730,6 +751,9 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add)
         if (str == NULL)
                 return 0;
 
+        if (check_modifier(str))
+                return -EINVAL;
+
         if (!add && get_event_modifier(&mod, str, NULL))
                 return -EINVAL;
 
@@ -827,8 +851,6 @@ int parse_events(struct perf_evlist *evlist, const char *str,
          * Both call perf_evlist__delete in case of error, so we dont
          * need to bother.
          */
-        fprintf(stderr, "invalid or unsupported event: '%s'\n", str);
-        fprintf(stderr, "Run 'perf list' for a list of valid events\n");
         return ret;
 }
 
@@ -836,7 +858,13 @@ int parse_events_option(const struct option *opt, const char *str,
                         int unset __maybe_unused)
 {
         struct perf_evlist *evlist = *(struct perf_evlist **)opt->value;
-        return parse_events(evlist, str, unset);
+        int ret = parse_events(evlist, str, unset);
+
+        if (ret) {
+                fprintf(stderr, "invalid or unsupported event: '%s'\n", str);
+                fprintf(stderr, "Run 'perf list' for a list of valid events\n");
+        }
+        return ret;
 }
 
 int parse_filter(const struct option *opt, const char *str,
@@ -1081,7 +1109,7 @@ void print_events(const char *event_glob, bool name_only)
                 printf("  %-50s [%s]\n",
                        "cpu/t1=v1[,t2=v2,t3 ...]/modifier",
                        event_type_descriptors[PERF_TYPE_RAW]);
-                printf("   (see 'perf list --help' on how to encode it)\n");
+                printf("   (see 'man perf-list' on how to encode it)\n");
                 printf("\n");
 
                 printf("  %-50s [%s]\n",
@@ -1142,6 +1170,24 @@ int parse_events__term_str(struct parse_events__term **term,
                         config, str, 0);
 }
 
+int parse_events__term_sym_hw(struct parse_events__term **term,
+                              char *config, unsigned idx)
+{
+        struct event_symbol *sym;
+
+        BUG_ON(idx >= PERF_COUNT_HW_MAX);
+        sym = &event_symbols_hw[idx];
+
+        if (config)
+                return new_term(term, PARSE_EVENTS__TERM_TYPE_STR,
+                                PARSE_EVENTS__TERM_TYPE_USER, config,
+                                (char *) sym->symbol, 0);
+        else
+                return new_term(term, PARSE_EVENTS__TERM_TYPE_STR,
+                                PARSE_EVENTS__TERM_TYPE_USER,
+                                (char *) "event", (char *) sym->symbol, 0);
+}
+
 int parse_events__term_clone(struct parse_events__term **new,
                              struct parse_events__term *term)
 {