Skip to content

Commit 4a35a90

Browse files
committed
Revert "perf pmu: Fix pmu events parsing rule"
As reported by Adrian Hunter, this breaks intel_pt event parsing: # perf record -e intel_pt//u uname event syntax error: 'intel_pt//u' \___ parser error Run 'perf list' for a list of valid events Usage: perf record [<options>] [<command>] or: perf record [<options>] -- <command> [<options>] -e, --event <event> event selector. use 'perf list' to list available events # This reverts commit 9a4a931. Reported-by: Adrian Hunter <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Andi Kleen <[email protected]> Cc: David Ahern <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Kan Liang <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Wang Nan <[email protected]> Link: https://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 5981ec3 commit 4a35a90

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tools/perf/util/parse-events.y

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,15 +224,15 @@ event_def: event_pmu |
224224
event_bpf_file
225225

226226
event_pmu:
227-
PE_NAME '/' event_config '/'
227+
PE_NAME opt_event_config
228228
{
229229
struct list_head *list, *orig_terms, *terms;
230230

231-
if (parse_events_copy_term_list($3, &orig_terms))
231+
if (parse_events_copy_term_list($2, &orig_terms))
232232
YYABORT;
233233

234234
ALLOC_LIST(list);
235-
if (parse_events_add_pmu(_parse_state, list, $1, $3, false)) {
235+
if (parse_events_add_pmu(_parse_state, list, $1, $2, false)) {
236236
struct perf_pmu *pmu = NULL;
237237
int ok = 0;
238238
char *pattern;
@@ -262,7 +262,7 @@ PE_NAME '/' event_config '/'
262262
if (!ok)
263263
YYABORT;
264264
}
265-
parse_events_terms__delete($3);
265+
parse_events_terms__delete($2);
266266
parse_events_terms__delete(orig_terms);
267267
$$ = list;
268268
}

0 commit comments

Comments
 (0)