Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a4a931c authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf pmu: Fix pmu events parsing rule 



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: default avatarJiri Olsa <jolsa@kernel.org>
Reported-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180423090823.32309-5-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 129193bb

tools/perf/util/parse-events.y

+4 −4
Original line number Diff line number Diff line
@@ -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;
@@ -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;

}