Skip to content

Commit

Permalink
perf pmu: Fix pmu events parsing rule
Browse files Browse the repository at this point in the history
Currently all the event parsing fails end up in the event_pmu rule, and
display misleading help like:

  $ perf stat -e inst kill
  event syntax error: 'inst'
                       \___ Cannot find PMU `inst'. Missing kernel support?
  ...

The reason is that the event_pmu is too strong and match also single
string. Changing it to force the '/' separators to be part of the rule,
and getting the proper error now:

  $ perf stat -e inst kill
  event syntax error: 'inst'
                       \___ parser error
  Run 'perf list' for a list of valid events
  ...

Signed-off-by: Jiri Olsa <[email protected]>
Reported-by: Ingo Molnar <[email protected]>
Tested-by: Arnaldo Carvalho de Melo <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
  • Loading branch information
olsajiri authored and acmel committed Apr 23, 2018
1 parent 129193b commit 9a4a931
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tools/perf/util/parse-events.y
Original file line number Diff line number Diff line change
Expand Up @@ -224,15 +224,15 @@ event_def: event_pmu |
event_bpf_file

event_pmu:
PE_NAME opt_event_config
PE_NAME '/' event_config '/'
{
struct list_head *list, *orig_terms, *terms;

if (parse_events_copy_term_list($2, &orig_terms))
if (parse_events_copy_term_list($3, &orig_terms))
YYABORT;

ALLOC_LIST(list);
if (parse_events_add_pmu(_parse_state, list, $1, $2, false)) {
if (parse_events_add_pmu(_parse_state, list, $1, $3, false)) {
struct perf_pmu *pmu = NULL;
int ok = 0;
char *pattern;
Expand Down Expand Up @@ -262,7 +262,7 @@ PE_NAME opt_event_config
if (!ok)
YYABORT;
}
parse_events_terms__delete($2);
parse_events_terms__delete($3);
parse_events_terms__delete(orig_terms);
$$ = list;
}
Expand Down

0 comments on commit 9a4a931

Please sign in to comment.