perf parse-events: Allow config on kernel PMU events

An event like inst_retired.any on an Intel skylake is found in the
pmu-events code created from the pipeline event JSON.

The event is an alias for cpu/event=0xc0,period=2000003/ and
parse-events recognizes the event with the token PE_KERNEL_PMU_EVENT.

The parser doesn't currently allow extra configuration on such events,
except for modifiers, so:

  $ perf stat -e inst_retired.any// /bin/true
  event syntax error: 'inst_retired.any//'
                       \___ parser error
  Run 'perf list' for a list of valid events

   Usage: perf stat [<options>] [<command>]

      -e, --event <event>   event selector. use 'perf list' to list available events

This patch adds configuration to these events which can be useful for a
number of parameters like name and call-graph:

  $ sudo perf record -e inst_retired.any/call-graph=lbr/ -a sleep 1
  [ perf record: Woken up 1 times to write data ]
  [ perf record: Captured and wrote 1.856 MB perf.data (44 samples) ]

It is necessary for the metric code so that we may add metric-id values
to these events before they are parsed.

Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Andi Kleen <ak@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Antonov <alexander.antonov@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andrew Kilroy <andrew.kilroy@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Changbin Du <changbin.du@intel.com>
Cc: Denys Zagorui <dzagorui@cisco.com>
Cc: Fabian Hemmer <copy@copy.sh>
Cc: Felix Fietkau <nbd@nbd.name>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jacob Keller <jacob.e.keller@intel.com>
Cc: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Joakim Zhang <qiangqing.zhang@nxp.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Kees Kook <keescook@chromium.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nicholas Fraser <nfraser@codeweavers.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Sami Tolvanen <samitolvanen@google.com>
Cc: ShihCheng Tu <mrtoastcheng@gmail.com>
Cc: Song Liu <songliubraving@fb.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Wan Jiabing <wanjiabing@vivo.com>
Cc: Zhen Lei <thunder.leizhen@huawei.com>
Link: https://lore.kernel.org/r/20211015172132.1162559-16-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 89494b6213a633b40852b95fca337c712584092b..006a7f72154915a5daeba1685bcc05b0f40a0c9d 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1673,44 +1673,50 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
 }
 
 int parse_events_multi_pmu_add(struct parse_events_state *parse_state,
-                              char *str, struct list_head **listp)
+                              char *str, struct list_head *head,
+                              struct list_head **listp)
 {
        struct parse_events_term *term;
-       struct list_head *list;
+       struct list_head *list = NULL;
        struct perf_pmu *pmu = NULL;
        int ok = 0;
+       char *config;
 
        *listp = NULL;
+
+       if (!head) {
+               head = malloc(sizeof(struct list_head));
+               if (!head)
+                       goto out_err;
+
+               INIT_LIST_HEAD(head);
+       }
+       config = strdup(str);
+       if (!config)
+               goto out_err;
+
+       if (parse_events_term__num(&term,
+                                  PARSE_EVENTS__TERM_TYPE_USER,
+                                  config, 1, false, &config,
+                                       NULL) < 0) {
+               free(config);
+               goto out_err;
+       }
+       list_add_tail(&term->list, head);
+
+
        /* Add it for all PMUs that support the alias */
        list = malloc(sizeof(struct list_head));
        if (!list)
-               return -1;
+               goto out_err;
+
        INIT_LIST_HEAD(list);
+
        while ((pmu = perf_pmu__scan(pmu)) != NULL) {
                struct perf_pmu_alias *alias;
 
                list_for_each_entry(alias, &pmu->aliases, list) {
                        if (!strcasecmp(alias->name, str)) {
-                               struct list_head *head;
-                               char *config;
-
-                               head = malloc(sizeof(struct list_head));
-                               if (!head)
-                                       return -1;
-                               INIT_LIST_HEAD(head);
-                               config = strdup(str);
-                               if (!config)
-                                       return -1;
-                               if (parse_events_term__num(&term,
-                                                  PARSE_EVENTS__TERM_TYPE_USER,
-                                                  config, 1, false, &config,
-                                                  NULL) < 0) {
-                                       free(list);
-                                       free(config);
-                                       return -1;
-                               }
-                               list_add_tail(&term->list, head);
-
                                if (!parse_events_add_pmu(parse_state, list,
                                                          pmu->name, head,
                                                          true, true)) {
@@ -1718,17 +1724,17 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state,
                                                 pmu->name, alias->str);
                                        ok++;
                                }
-
-                               parse_events_terms__delete(head);
                        }
                }
        }
-       if (!ok) {
+out_err:
+       if (ok)
+               *listp = list;
+       else
                free(list);
-               return -1;
-       }
-       *listp = list;
-       return 0;
+
+       parse_events_terms__delete(head);
+       return ok ? 0 : -1;
 }
 
 int parse_events__modifier_group(struct list_head *list,

diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index c6c8343d311bab1adab82acd66e02660cf914d41..07f879e525fe14bdac4ea2b65fcce97ffb0c757d 100644 (file)
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -205,6 +205,7 @@ struct evsel *parse_events__add_event(int idx, struct perf_event_attr *attr,
 
 int parse_events_multi_pmu_add(struct parse_events_state *parse_state,
                               char *str,
+                              struct list_head *head_config,
                               struct list_head **listp);
 
 int parse_events_copy_term_list(struct list_head *old,

diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index d94e48e1ff9b22ddd974465b26cddd3acf470e19..17c8c66f3f51e6f22edde3ee8a84239399615236 100644 (file)
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -342,7 +342,20 @@ PE_KERNEL_PMU_EVENT sep_dc
        struct list_head *list;
        int err;
 
-       err = parse_events_multi_pmu_add(_parse_state, $1, &list);
+       err = parse_events_multi_pmu_add(_parse_state, $1, NULL, &list);
+       free($1);
+       if (err < 0)
+               YYABORT;
+       $$ = list;
+}
+|
+PE_KERNEL_PMU_EVENT opt_pmu_config
+{
+       struct list_head *list;
+       int err;
+
+       /* frees $2 */
+       err = parse_events_multi_pmu_add(_parse_state, $1, $2, &list);
        free($1);
        if (err < 0)
                YYABORT;
@@ -357,7 +370,7 @@ PE_PMU_EVENT_PRE '-' PE_PMU_EVENT_SUF sep_dc
        snprintf(pmu_name, sizeof(pmu_name), "%s-%s", $1, $3);
        free($1);
        free($3);
-       if (parse_events_multi_pmu_add(_parse_state, pmu_name, &list) < 0)
+       if (parse_events_multi_pmu_add(_parse_state, pmu_name, NULL, &list) < 0)
                YYABORT;
        $$ = list;
 }