* [PATCH v1] perf pmu: Make parser reentrant
@ 2023-04-03 17:20 Ian Rogers
2023-04-04 7:38 ` Jiri Olsa
0 siblings, 1 reply; 4+ messages in thread
From: Ian Rogers @ 2023-04-03 17:20 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
Ian Rogers, Adrian Hunter, James Clark, Suzuki Poulouse,
Sean Christopherson, Ravi Bangoria, Rob Herring, Leo Yan,
German Gomez, Jing Zhang, Gaosheng Cui, linux-perf-users,
linux-kernel
By default bison uses global state for compatibility with yacc. Make
the parser reentrant so that it may be used in asynchronous and
multithreaded situations.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/pmu.c | 17 ++++++++++++-----
tools/perf/util/pmu.h | 2 +-
tools/perf/util/pmu.l | 17 ++++++++++++-----
tools/perf/util/pmu.y | 5 ++++-
4 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index e3aae731bd6f..8ef2532428a4 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -24,6 +24,8 @@
#include "evsel.h"
#include "pmu.h"
#include "pmus.h"
+#include "pmu-bison.h"
+#include "pmu-flex.h"
#include "parse-events.h"
#include "print-events.h"
#include "header.h"
@@ -57,9 +59,6 @@ struct perf_pmu_format {
struct list_head list;
};
-int perf_pmu_parse(struct list_head *list, char *name);
-extern FILE *perf_pmu_in;
-
static bool hybrid_scanned;
/*
@@ -79,6 +78,7 @@ int perf_pmu__format_parse(char *dir, struct list_head *head)
while (!ret && (evt_ent = readdir(format_dir))) {
char path[PATH_MAX];
char *name = evt_ent->d_name;
+ void *scanner;
FILE *file;
if (!strcmp(name, ".") || !strcmp(name, ".."))
@@ -91,8 +91,15 @@ int perf_pmu__format_parse(char *dir, struct list_head *head)
if (!file)
break;
- perf_pmu_in = file;
- ret = perf_pmu_parse(head, name);
+ ret = perf_pmu_lex_init(&scanner);
+ if (ret) {
+ fclose(file);
+ break;
+ }
+
+ perf_pmu_set_in(file, scanner);
+ ret = perf_pmu_parse(head, name, scanner);
+ perf_pmu_lex_destroy(scanner);
fclose(file);
}
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 24cf69ab32cd..52c37081c880 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -206,7 +206,7 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms,
struct perf_pmu_info *info);
struct list_head *perf_pmu__alias(struct perf_pmu *pmu,
struct list_head *head_terms);
-void perf_pmu_error(struct list_head *list, char *name, char const *msg);
+void perf_pmu_error(struct list_head *list, char *name, void *scanner, char const *msg);
int perf_pmu__new_format(struct list_head *list, char *name,
int config, unsigned long *bits);
diff --git a/tools/perf/util/pmu.l b/tools/perf/util/pmu.l
index 58b4926cfaca..67b247be693b 100644
--- a/tools/perf/util/pmu.l
+++ b/tools/perf/util/pmu.l
@@ -1,4 +1,6 @@
%option prefix="perf_pmu_"
+%option reentrant
+%option bison-bridge
%{
#include <stdlib.h>
@@ -6,16 +8,21 @@
#include "pmu.h"
#include "pmu-bison.h"
-static int value(int base)
+char *perf_pmu_get_text(yyscan_t yyscanner);
+YYSTYPE *perf_pmu_get_lval(yyscan_t yyscanner);
+
+static int value(yyscan_t scanner, int base)
{
+ YYSTYPE *yylval = perf_pmu_get_lval(scanner);
+ char *text = perf_pmu_get_text(scanner);
long num;
errno = 0;
- num = strtoul(perf_pmu_text, NULL, base);
+ num = strtoul(text, NULL, base);
if (errno)
return PP_ERROR;
- perf_pmu_lval.num = num;
+ yylval->num = num;
return PP_VALUE;
}
@@ -25,7 +32,7 @@ num_dec [0-9]+
%%
-{num_dec} { return value(10); }
+{num_dec} { return value(yyscanner, 10); }
config { return PP_CONFIG; }
- { return '-'; }
: { return ':'; }
@@ -35,7 +42,7 @@ config { return PP_CONFIG; }
%%
-int perf_pmu_wrap(void)
+int perf_pmu_wrap(void *scanner __maybe_unused)
{
return 1;
}
diff --git a/tools/perf/util/pmu.y b/tools/perf/util/pmu.y
index e675d79a0274..dff4e892ac4d 100644
--- a/tools/perf/util/pmu.y
+++ b/tools/perf/util/pmu.y
@@ -1,6 +1,8 @@
-
+%define api.pure full
%parse-param {struct list_head *format}
%parse-param {char *name}
+%parse-param {void *scanner}
+%lex-param {void* scanner}
%{
@@ -78,6 +80,7 @@ PP_VALUE
void perf_pmu_error(struct list_head *list __maybe_unused,
char *name __maybe_unused,
+ void *scanner __maybe_unused,
char const *msg __maybe_unused)
{
}
--
2.40.0.348.gf938b09366-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v1] perf pmu: Make parser reentrant
2023-04-03 17:20 [PATCH v1] perf pmu: Make parser reentrant Ian Rogers
@ 2023-04-04 7:38 ` Jiri Olsa
2023-04-04 12:39 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 4+ messages in thread
From: Jiri Olsa @ 2023-04-04 7:38 UTC (permalink / raw)
To: Ian Rogers
Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Namhyung Kim, Adrian Hunter,
James Clark, Suzuki Poulouse, Sean Christopherson, Ravi Bangoria,
Rob Herring, Leo Yan, German Gomez, Jing Zhang, Gaosheng Cui,
linux-perf-users, linux-kernel
On Mon, Apr 03, 2023 at 10:20:31AM -0700, Ian Rogers wrote:
> By default bison uses global state for compatibility with yacc. Make
> the parser reentrant so that it may be used in asynchronous and
> multithreaded situations.
>
> Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
jirka
> ---
> tools/perf/util/pmu.c | 17 ++++++++++++-----
> tools/perf/util/pmu.h | 2 +-
> tools/perf/util/pmu.l | 17 ++++++++++++-----
> tools/perf/util/pmu.y | 5 ++++-
> 4 files changed, 29 insertions(+), 12 deletions(-)
>
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index e3aae731bd6f..8ef2532428a4 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -24,6 +24,8 @@
> #include "evsel.h"
> #include "pmu.h"
> #include "pmus.h"
> +#include "pmu-bison.h"
> +#include "pmu-flex.h"
> #include "parse-events.h"
> #include "print-events.h"
> #include "header.h"
> @@ -57,9 +59,6 @@ struct perf_pmu_format {
> struct list_head list;
> };
>
> -int perf_pmu_parse(struct list_head *list, char *name);
> -extern FILE *perf_pmu_in;
> -
> static bool hybrid_scanned;
>
> /*
> @@ -79,6 +78,7 @@ int perf_pmu__format_parse(char *dir, struct list_head *head)
> while (!ret && (evt_ent = readdir(format_dir))) {
> char path[PATH_MAX];
> char *name = evt_ent->d_name;
> + void *scanner;
> FILE *file;
>
> if (!strcmp(name, ".") || !strcmp(name, ".."))
> @@ -91,8 +91,15 @@ int perf_pmu__format_parse(char *dir, struct list_head *head)
> if (!file)
> break;
>
> - perf_pmu_in = file;
> - ret = perf_pmu_parse(head, name);
> + ret = perf_pmu_lex_init(&scanner);
> + if (ret) {
> + fclose(file);
> + break;
> + }
> +
> + perf_pmu_set_in(file, scanner);
> + ret = perf_pmu_parse(head, name, scanner);
> + perf_pmu_lex_destroy(scanner);
> fclose(file);
> }
>
> diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
> index 24cf69ab32cd..52c37081c880 100644
> --- a/tools/perf/util/pmu.h
> +++ b/tools/perf/util/pmu.h
> @@ -206,7 +206,7 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms,
> struct perf_pmu_info *info);
> struct list_head *perf_pmu__alias(struct perf_pmu *pmu,
> struct list_head *head_terms);
> -void perf_pmu_error(struct list_head *list, char *name, char const *msg);
> +void perf_pmu_error(struct list_head *list, char *name, void *scanner, char const *msg);
>
> int perf_pmu__new_format(struct list_head *list, char *name,
> int config, unsigned long *bits);
> diff --git a/tools/perf/util/pmu.l b/tools/perf/util/pmu.l
> index 58b4926cfaca..67b247be693b 100644
> --- a/tools/perf/util/pmu.l
> +++ b/tools/perf/util/pmu.l
> @@ -1,4 +1,6 @@
> %option prefix="perf_pmu_"
> +%option reentrant
> +%option bison-bridge
>
> %{
> #include <stdlib.h>
> @@ -6,16 +8,21 @@
> #include "pmu.h"
> #include "pmu-bison.h"
>
> -static int value(int base)
> +char *perf_pmu_get_text(yyscan_t yyscanner);
> +YYSTYPE *perf_pmu_get_lval(yyscan_t yyscanner);
> +
> +static int value(yyscan_t scanner, int base)
> {
> + YYSTYPE *yylval = perf_pmu_get_lval(scanner);
> + char *text = perf_pmu_get_text(scanner);
> long num;
>
> errno = 0;
> - num = strtoul(perf_pmu_text, NULL, base);
> + num = strtoul(text, NULL, base);
> if (errno)
> return PP_ERROR;
>
> - perf_pmu_lval.num = num;
> + yylval->num = num;
> return PP_VALUE;
> }
>
> @@ -25,7 +32,7 @@ num_dec [0-9]+
>
> %%
>
> -{num_dec} { return value(10); }
> +{num_dec} { return value(yyscanner, 10); }
> config { return PP_CONFIG; }
> - { return '-'; }
> : { return ':'; }
> @@ -35,7 +42,7 @@ config { return PP_CONFIG; }
>
> %%
>
> -int perf_pmu_wrap(void)
> +int perf_pmu_wrap(void *scanner __maybe_unused)
> {
> return 1;
> }
> diff --git a/tools/perf/util/pmu.y b/tools/perf/util/pmu.y
> index e675d79a0274..dff4e892ac4d 100644
> --- a/tools/perf/util/pmu.y
> +++ b/tools/perf/util/pmu.y
> @@ -1,6 +1,8 @@
> -
> +%define api.pure full
> %parse-param {struct list_head *format}
> %parse-param {char *name}
> +%parse-param {void *scanner}
> +%lex-param {void* scanner}
>
> %{
>
> @@ -78,6 +80,7 @@ PP_VALUE
>
> void perf_pmu_error(struct list_head *list __maybe_unused,
> char *name __maybe_unused,
> + void *scanner __maybe_unused,
> char const *msg __maybe_unused)
> {
> }
> --
> 2.40.0.348.gf938b09366-goog
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] perf pmu: Make parser reentrant
2023-04-04 7:38 ` Jiri Olsa
@ 2023-04-04 12:39 ` Arnaldo Carvalho de Melo
2023-04-04 13:40 ` Ian Rogers
0 siblings, 1 reply; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2023-04-04 12:39 UTC (permalink / raw)
To: Ian Rogers, Jiri Olsa
Cc: Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
Namhyung Kim, Adrian Hunter, James Clark, Suzuki Poulouse,
Sean Christopherson, Ravi Bangoria, Rob Herring, Leo Yan,
German Gomez, Jing Zhang, Gaosheng Cui, linux-perf-users,
linux-kernel
Em Tue, Apr 04, 2023 at 09:38:32AM +0200, Jiri Olsa escreveu:
> On Mon, Apr 03, 2023 at 10:20:31AM -0700, Ian Rogers wrote:
> > By default bison uses global state for compatibility with yacc. Make
> > the parser reentrant so that it may be used in asynchronous and
> > multithreaded situations.
> >
> > Signed-off-by: Ian Rogers <irogers@google.com>
>
> Acked-by: Jiri Olsa <jolsa@kernel.org>
So this clashed with Namhyung's recent series, please update it using
what is in tmp.perf-tools-next.
- Arnaldo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] perf pmu: Make parser reentrant
2023-04-04 12:39 ` Arnaldo Carvalho de Melo
@ 2023-04-04 13:40 ` Ian Rogers
0 siblings, 0 replies; 4+ messages in thread
From: Ian Rogers @ 2023-04-04 13:40 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Jiri Olsa, Peter Zijlstra, Ingo Molnar, Mark Rutland,
Alexander Shishkin, Namhyung Kim, Adrian Hunter, James Clark,
Suzuki Poulouse, Sean Christopherson, Ravi Bangoria, Rob Herring,
Leo Yan, German Gomez, Jing Zhang, Gaosheng Cui, linux-perf-users,
linux-kernel
On Tue, Apr 4, 2023 at 5:39 AM Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
>
> Em Tue, Apr 04, 2023 at 09:38:32AM +0200, Jiri Olsa escreveu:
> > On Mon, Apr 03, 2023 at 10:20:31AM -0700, Ian Rogers wrote:
> > > By default bison uses global state for compatibility with yacc. Make
> > > the parser reentrant so that it may be used in asynchronous and
> > > multithreaded situations.
> > >
> > > Signed-off-by: Ian Rogers <irogers@google.com>
> >
> > Acked-by: Jiri Olsa <jolsa@kernel.org>
>
> So this clashed with Namhyung's recent series, please update it using
> what is in tmp.perf-tools-next.
>
> - Arnaldo
I dealt with the merge conflict in v2 [1]. I didn't add Jiri's
acked-by just because there was a small change in
perf_pmu__format_parse.
Thanks,
Ian
[1] https://lore.kernel.org/lkml/20230404133630.1985739-1-irogers@google.com/
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-04-04 13:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-03 17:20 [PATCH v1] perf pmu: Make parser reentrant Ian Rogers
2023-04-04 7:38 ` Jiri Olsa
2023-04-04 12:39 ` Arnaldo Carvalho de Melo
2023-04-04 13:40 ` Ian Rogers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox