* [PATCH] perf tools: Fix pmu events parsing rule
@ 2018-06-05 12:14 Jiri Olsa
2018-06-05 13:25 ` Arnaldo Carvalho de Melo
2018-06-07 8:19 ` [tip:perf/urgent] " tip-bot for Jiri Olsa
0 siblings, 2 replies; 3+ messages in thread
From: Jiri Olsa @ 2018-06-05 12:14 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: lkml, Ingo Molnar, Namhyung Kim, David Ahern, Alexander Shishkin,
Peter Zijlstra, Adrian Hunter
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
...
Suggested-by: Adrian Hunter <adrian.hunter@intel.com>
Link: http://lkml.kernel.org/n/tip-vgf5a8wk0eyayo7omvutwhqo@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/util/parse-events.y | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index e37608a87dba..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 <num> value_sym
%type <head> event_config
%type <head> opt_event_config
+%type <head> opt_pmu_config
%type <term> event_term
%type <head> event_pmu
%type <head> event_legacy_symbol
@@ -224,7 +225,7 @@ event_def: event_pmu |
event_bpf_file
event_pmu:
-PE_NAME opt_event_config
+PE_NAME opt_pmu_config
{
struct list_head *list, *orig_terms, *terms;
@@ -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;
--
2.13.6
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] perf tools: Fix pmu events parsing rule
2018-06-05 12:14 [PATCH] perf tools: Fix pmu events parsing rule Jiri Olsa
@ 2018-06-05 13:25 ` Arnaldo Carvalho de Melo
2018-06-07 8:19 ` [tip:perf/urgent] " tip-bot for Jiri Olsa
1 sibling, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2018-06-05 13:25 UTC (permalink / raw)
To: Jiri Olsa
Cc: lkml, Ingo Molnar, Namhyung Kim, David Ahern, Alexander Shishkin,
Peter Zijlstra, Adrian Hunter
Em Tue, Jun 05, 2018 at 02:14:16PM +0200, Jiri Olsa escreveu:
> 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
> ...
>
> Suggested-by: Adrian Hunter <adrian.hunter@intel.com>
> Link: http://lkml.kernel.org/n/tip-vgf5a8wk0eyayo7omvutwhqo@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Thanks, applied to acme/perf/core, will let it brew there for a while,
if we have time then I'll try getting it to perf/urgent, better error
messages are important :-)
- Arnaldo
> ---
> tools/perf/util/parse-events.y | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
> index e37608a87dba..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 <num> value_sym
> %type <head> event_config
> %type <head> opt_event_config
> +%type <head> opt_pmu_config
> %type <term> event_term
> %type <head> event_pmu
> %type <head> event_legacy_symbol
> @@ -224,7 +225,7 @@ event_def: event_pmu |
> event_bpf_file
>
> event_pmu:
> -PE_NAME opt_event_config
> +PE_NAME opt_pmu_config
> {
> struct list_head *list, *orig_terms, *terms;
>
> @@ -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;
> --
> 2.13.6
^ permalink raw reply [flat|nested] 3+ messages in thread* [tip:perf/urgent] perf tools: Fix pmu events parsing rule
2018-06-05 12:14 [PATCH] perf tools: Fix pmu events parsing rule Jiri Olsa
2018-06-05 13:25 ` Arnaldo Carvalho de Melo
@ 2018-06-07 8:19 ` tip-bot for Jiri Olsa
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Jiri Olsa @ 2018-06-07 8:19 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, peterz, adrian.hunter, alexander.shishkin, mingo,
acme, tglx, dsahern, namhyung, jolsa, hpa
Commit-ID: ceac7b79df7bd67ef9aaf464b0179a2686aff4ee
Gitweb: https://git.kernel.org/tip/ceac7b79df7bd67ef9aaf464b0179a2686aff4ee
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Tue, 5 Jun 2018 14:14:16 +0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 6 Jun 2018 12:52:05 -0300
perf tools: 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
...
Suggested-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.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/20180605121416.31645-1-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/parse-events.y | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index e37608a87dba..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 <num> value_sym
%type <head> event_config
%type <head> opt_event_config
+%type <head> opt_pmu_config
%type <term> event_term
%type <head> event_pmu
%type <head> event_legacy_symbol
@@ -224,7 +225,7 @@ event_def: event_pmu |
event_bpf_file
event_pmu:
-PE_NAME opt_event_config
+PE_NAME opt_pmu_config
{
struct list_head *list, *orig_terms, *terms;
@@ -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;
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-07 8:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-05 12:14 [PATCH] perf tools: Fix pmu events parsing rule Jiri Olsa
2018-06-05 13:25 ` Arnaldo Carvalho de Melo
2018-06-07 8:19 ` [tip:perf/urgent] " tip-bot for Jiri Olsa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox