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 f090a85..50f5b81 100644 (file)
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -291,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                                                \
@@ -303,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;
@@ -360,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;
                }
@@ -376,9 +380,18 @@ PE_NAME sep_dc
        int err;
 
        err = parse_events_multi_pmu_add(_parse_state, $1, NULL, &list);
-       free($1);
-       if (err < 0)
+       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);
        $$ = list;
 }
 
@@ -554,7 +567,7 @@ 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);
@@ -627,7 +640,7 @@ 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) {
@@ -645,7 +658,7 @@ 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);