perf parse-events: Populate error column for BPF/tracepoint events

[platform/kernel/linux-starfive.git] / tools / perf / util / parse-events.y

diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index eaf43bd..50f5b81 100644 (file)
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -28,6 +28,13 @@ do { \
                YYABORT; \
 } while (0)
 
+#define PE_ABORT(val) \
+do { \
+       if (val == -ENOMEM) \
+               YYNOMEM; \
+       YYABORT; \
+} while (0)
+
 static struct list_head* alloc_list(void)
 {
        struct list_head *list;
@@ -284,7 +291,6 @@ PE_NAME opt_pmu_config
 {
        struct parse_events_state *parse_state = _parse_state;
        struct list_head *list = NULL, *orig_terms = NULL, *terms= NULL;
-       struct parse_events_error *error = parse_state->error;
        char *pattern = NULL;
 
 #define CLEANUP                                                \
@@ -296,9 +302,6 @@ PE_NAME opt_pmu_config
                free(pattern);                          \
        } while(0)
 
-       if (error)
-               error->idx = @1.first_column;
-
        if (parse_events_copy_term_list($2, &orig_terms)) {
                CLEANUP;
                YYNOMEM;
@@ -353,6 +356,14 @@ PE_NAME opt_pmu_config
                        $2 = NULL;
                }
                if (!ok) {
+                       struct parse_events_error *error = parse_state->error;
+                       char *help;
+
+                       if (asprintf(&help, "Unabled to find PMU or event on a PMU of '%s'", $1) < 0)
+                               help = NULL;
+                       parse_events_error__handle(error, @1.first_column,
+                                                  strdup("Bad event or PMU"),
+                                                  help);
                        CLEANUP;
                        YYABORT;
                }
@@ -369,9 +380,18 @@ PE_NAME sep_dc
        int err;
 
        err = parse_events_multi_pmu_add(_parse_state, $1, NULL, &list);
+       if (err < 0) {
+               struct parse_events_state *parse_state = _parse_state;
+               struct parse_events_error *error = parse_state->error;
+               char *help;
+
+               if (asprintf(&help, "Unabled to find PMU or event on a PMU of '%s'", $1) < 0)
+                       help = NULL;
+               parse_events_error__handle(error, @1.first_column, strdup("Bad event name"), help);
+               free($1);
+               PE_ABORT(err);
+       }
        free($1);
-       if (err < 0)
-               YYABORT;
        $$ = list;
 }
 
@@ -396,7 +416,7 @@ value_sym '/' event_config '/'
        parse_events_terms__delete($3);
        if (err) {
                free_list_evsel(list);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = list;
 }
@@ -407,23 +427,28 @@ value_sym sep_slash_slash_dc
        int type = $1 >> 16;
        int config = $1 & 255;
        bool wildcard = (type == PERF_TYPE_HARDWARE || type == PERF_TYPE_HW_CACHE);
+       int err;
 
        list = alloc_list();
        if (!list)
                YYNOMEM;
-       ABORT_ON(parse_events_add_numeric(_parse_state, list, type, config,
-                                         /*head_config=*/NULL, wildcard));
+       err = parse_events_add_numeric(_parse_state, list, type, config, /*head_config=*/NULL, wildcard);
+       if (err)
+               PE_ABORT(err);
        $$ = list;
 }
 |
 PE_VALUE_SYM_TOOL sep_slash_slash_dc
 {
        struct list_head *list;
+       int err;
 
        list = alloc_list();
        if (!list)
                YYNOMEM;
-       ABORT_ON(parse_events_add_tool(_parse_state, list, $1));
+       err = parse_events_add_tool(_parse_state, list, $1);
+       if (err)
+               YYNOMEM;
        $$ = list;
 }
 
@@ -444,7 +469,7 @@ PE_LEGACY_CACHE opt_event_config
        free($1);
        if (err) {
                free_list_evsel(list);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = list;
 }
@@ -465,7 +490,7 @@ PE_PREFIX_MEM PE_VALUE PE_BP_SLASH PE_VALUE PE_BP_COLON PE_MODIFIER_BP opt_event
        free($6);
        if (err) {
                free(list);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = list;
 }
@@ -484,7 +509,7 @@ PE_PREFIX_MEM PE_VALUE PE_BP_SLASH PE_VALUE opt_event_config
        parse_events_terms__delete($5);
        if (err) {
                free(list);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = list;
 }
@@ -504,7 +529,7 @@ PE_PREFIX_MEM PE_VALUE PE_BP_COLON PE_MODIFIER_BP opt_event_config
        free($4);
        if (err) {
                free(list);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = list;
 }
@@ -522,7 +547,7 @@ PE_PREFIX_MEM PE_VALUE opt_event_config
        parse_events_terms__delete($3);
        if (err) {
                free(list);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = list;
 }
@@ -542,14 +567,14 @@ tracepoint_name opt_event_config
                error->idx = @1.first_column;
 
        err = parse_events_add_tracepoint(list, &parse_state->idx, $1.sys, $1.event,
-                                       error, $2);
+                                       error, $2, &@1);
 
        parse_events_terms__delete($2);
        free($1.sys);
        free($1.event);
        if (err) {
                free(list);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = list;
 }
@@ -576,7 +601,7 @@ PE_VALUE ':' PE_VALUE opt_event_config
        parse_events_terms__delete($4);
        if (err) {
                free(list);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = list;
 }
@@ -600,7 +625,7 @@ PE_RAW opt_event_config
        parse_events_terms__delete($2);
        if (err) {
                free(list);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = list;
 }
@@ -615,12 +640,12 @@ PE_BPF_OBJECT opt_event_config
        list = alloc_list();
        if (!list)
                YYNOMEM;
-       err = parse_events_load_bpf(parse_state, list, $1, false, $2);
+       err = parse_events_load_bpf(parse_state, list, $1, false, $2, &@1);
        parse_events_terms__delete($2);
        free($1);
        if (err) {
                free(list);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = list;
 }
@@ -633,11 +658,11 @@ PE_BPF_SOURCE opt_event_config
        list = alloc_list();
        if (!list)
                YYNOMEM;
-       err = parse_events_load_bpf(_parse_state, list, $1, true, $2);
+       err = parse_events_load_bpf(_parse_state, list, $1, true, $2, &@1);
        parse_events_terms__delete($2);
        if (err) {
                free(list);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = list;
 }
@@ -712,11 +737,12 @@ event_term:
 PE_RAW
 {
        struct parse_events_term *term;
+       int err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_RAW,
+                                        strdup("raw"), $1, &@1, &@1);
 
-       if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_RAW,
-                                       strdup("raw"), $1, &@1, &@1)) {
+       if (err) {
                free($1);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = term;
 }
@@ -724,12 +750,12 @@ PE_RAW
 name_or_raw '=' name_or_legacy
 {
        struct parse_events_term *term;
+       int err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, $1, $3, &@1, &@3);
 
-       if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER,
-                                       $1, $3, &@1, &@3)) {
+       if (err) {
                free($1);
                free($3);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = term;
 }
@@ -737,11 +763,12 @@ name_or_raw '=' name_or_legacy
 name_or_raw '=' PE_VALUE
 {
        struct parse_events_term *term;
+       int err = parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER,
+                                        $1, $3, false, &@1, &@3);
 
-       if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER,
-                                       $1, $3, false, &@1, &@3)) {
+       if (err) {
                free($1);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = term;
 }
@@ -749,12 +776,13 @@ name_or_raw '=' PE_VALUE
 name_or_raw '=' PE_TERM_HW
 {
        struct parse_events_term *term;
+       int err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER,
+                                        $1, $3.str, &@1, &@3);
 
-       if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER,
-                                       $1, $3.str, &@1, &@3)) {
+       if (err) {
                free($1);
                free($3.str);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = term;
 }
@@ -762,11 +790,12 @@ name_or_raw '=' PE_TERM_HW
 PE_LEGACY_CACHE
 {
        struct parse_events_term *term;
+       int err = parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_LEGACY_CACHE,
+                                        $1, 1, true, &@1, NULL);
 
-       if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_LEGACY_CACHE,
-                                       $1, 1, true, &@1, NULL)) {
+       if (err) {
                free($1);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = term;
 }
@@ -774,11 +803,12 @@ PE_LEGACY_CACHE
 PE_NAME
 {
        struct parse_events_term *term;
+       int err = parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER,
+                                        $1, 1, true, &@1, NULL);
 
-       if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER,
-                                       $1, 1, true, &@1, NULL)) {
+       if (err) {
                free($1);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = term;
 }
@@ -786,11 +816,12 @@ PE_NAME
 PE_TERM_HW
 {
        struct parse_events_term *term;
+       int err = parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_HARDWARE,
+                                        $1.str, $1.num & 255, false, &@1, NULL);
 
-       if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_HARDWARE,
-                                  $1.str, $1.num & 255, false, &@1, NULL)) {
+       if (err) {
                free($1.str);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = term;
 }
@@ -798,10 +829,11 @@ PE_TERM_HW
 PE_TERM '=' name_or_legacy
 {
        struct parse_events_term *term;
+       int err = parse_events_term__str(&term, (int)$1, NULL, $3, &@1, &@3);
 
-       if (parse_events_term__str(&term, (int)$1, NULL, $3, &@1, &@3)) {
+       if (err) {
                free($3);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = term;
 }
@@ -809,10 +841,11 @@ PE_TERM '=' name_or_legacy
 PE_TERM '=' PE_TERM_HW
 {
        struct parse_events_term *term;
+       int err = parse_events_term__str(&term, (int)$1, NULL, $3.str, &@1, &@3);
 
-       if (parse_events_term__str(&term, (int)$1, NULL, $3.str, &@1, &@3)) {
+       if (err) {
                free($3.str);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = term;
 }
@@ -820,37 +853,46 @@ PE_TERM '=' PE_TERM_HW
 PE_TERM '=' PE_TERM
 {
        struct parse_events_term *term;
+       int err = parse_events_term__term(&term, (int)$1, (int)$3, &@1, &@3);
+
+       if (err)
+               PE_ABORT(err);
 
-       ABORT_ON(parse_events_term__term(&term, (int)$1, (int)$3, &@1, &@3));
        $$ = term;
 }
 |
 PE_TERM '=' PE_VALUE
 {
        struct parse_events_term *term;
+       int err = parse_events_term__num(&term, (int)$1, NULL, $3, false, &@1, &@3);
+
+       if (err)
+               PE_ABORT(err);
 
-       ABORT_ON(parse_events_term__num(&term, (int)$1, NULL, $3, false, &@1, &@3));
        $$ = term;
 }
 |
 PE_TERM
 {
        struct parse_events_term *term;
+       int err = parse_events_term__num(&term, (int)$1, NULL, 1, true, &@1, NULL);
+
+       if (err)
+               PE_ABORT(err);
 
-       ABORT_ON(parse_events_term__num(&term, (int)$1, NULL, 1, true, &@1, NULL));
        $$ = term;
 }
 |
 name_or_raw array '=' name_or_legacy
 {
        struct parse_events_term *term;
+       int err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, $1, $4, &@1, &@4);
 
-       if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER,
-                                       $1, $4, &@1, &@4)) {
+       if (err) {
                free($1);
                free($4);
                free($2.ranges);
-               YYABORT;
+               PE_ABORT(err);
        }
        term->array = $2;
        $$ = term;
@@ -859,12 +901,12 @@ name_or_raw array '=' name_or_legacy
 name_or_raw array '=' PE_VALUE
 {
        struct parse_events_term *term;
+       int err = parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, $1, $4, false, &@1, &@4);
 
-       if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER,
-                                       $1, $4, false, &@1, &@4)) {
+       if (err) {
                free($1);
                free($2.ranges);
-               YYABORT;
+               PE_ABORT(err);
        }
        term->array = $2;
        $$ = term;
@@ -874,14 +916,15 @@ PE_DRV_CFG_TERM
 {
        struct parse_events_term *term;
        char *config = strdup($1);
+       int err;
 
        if (!config)
                YYNOMEM;
-       if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG,
-                                       config, $1, &@1, NULL)) {
+       err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, config, $1, &@1, NULL);
+       if (err) {
                free($1);
                free(config);
-               YYABORT;
+               PE_ABORT(err);
        }
        $$ = term;
 }