From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Olsa Subject: Re: [PATCH] perf tools: Fix parser for empty pmu terms case Date: Mon, 7 May 2018 10:12:03 +0200 Message-ID: <20180507081203.GA26443@krava> References: <20180425160008.3407-1-acme@kernel.org> <20180425160008.3407-6-acme@kernel.org> <448c4e21-8232-3d04-cac4-49b95c8bca3a@intel.com> <20180503103717.GA14776@krava> <0c33d3f9-4b76-c94c-7306-e93e8cd8d4aa@intel.com> <20180504160228.GA25229@krava> <87a7tdphyo.fsf@linux.intel.com> <20180506142830.GA18865@krava> <97dc8045-0136-0c9b-8413-1957ceeae5d3@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <97dc8045-0136-0c9b-8413-1957ceeae5d3@intel.com> Sender: linux-kernel-owner@vger.kernel.org To: Adrian Hunter Cc: Andi Kleen , Arnaldo Carvalho de Melo , Ingo Molnar , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Jiri Olsa , Alexander Shishkin , David Ahern , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo , kan.liang@linux.intel.com List-Id: linux-perf-users.vger.kernel.org On Mon, May 07, 2018 at 10:21:42AM +0300, Adrian Hunter wrote: > On 06/05/18 17:28, Jiri Olsa wrote: > > On Sat, May 05, 2018 at 08:43:11PM -0700, Andi Kleen wrote: > >> Jiri Olsa writes: > >> > >> Please fix this quickly, PT is currently totally non functional in Linus > >> mainline. > > > > attached.. Kan, could you please test it wrt your latest changes? > > > > thanks, > > jirka > > > > > > --- > > Adrian reported broken event parsing for Intel PT: > > > > $ perf record -e intel_pt//u uname > > event syntax error: 'intel_pt//u' > > \___ parser error > > Run 'perf list' for a list of valid events > > > > It's caused by recent change in parsing grammar > > (see Fixes: for commit). > > > > Adding special rule with empty terms config to handle > > the reported case and moving the common rule code into > > new parse_events_pmu function. > > Hi > > Can you explain why that is needed instead of just changing the grammar e.g. well, for one, mine is working ;-) [jolsa@krava perf]$ sudo ./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 [] [] or: perf record [] -- [] -e, --event event selector. use 'perf list' to list available events but yep, it's better solution.. with extra changes like below jirka --- diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 47f6399a309a..155d2570274f 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -73,6 +73,7 @@ static void inc_group_count(struct list_head *list, %type value_sym %type event_config %type opt_event_config +%type opt_pmu_config %type event_term %type event_pmu %type event_legacy_symbol @@ -224,15 +225,15 @@ event_def: event_pmu | event_bpf_file event_pmu: -PE_NAME '/' event_config '/' +PE_NAME opt_pmu_config { struct list_head *list, *orig_terms, *terms; - if (parse_events_copy_term_list($3, &orig_terms)) + if (parse_events_copy_term_list($2, &orig_terms)) YYABORT; ALLOC_LIST(list); - if (parse_events_add_pmu(_parse_state, list, $1, $3, false, false)) { + if (parse_events_add_pmu(_parse_state, list, $1, $2, false, false)) { struct perf_pmu *pmu = NULL; int ok = 0; char *pattern; @@ -262,7 +263,7 @@ PE_NAME '/' event_config '/' if (!ok) YYABORT; } - parse_events_terms__delete($3); + parse_events_terms__delete($2); parse_events_terms__delete(orig_terms); $$ = list; } @@ -496,6 +497,17 @@ opt_event_config: $$ = NULL; } +opt_pmu_config: +'/' event_config '/' +{ + $$ = $2; +} +| +'/' '/' +{ + $$ = NULL; +} + start_terms: event_config { struct parse_events_state *parse_state = _parse_state;