From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40058C7619A for ; Wed, 5 Apr 2023 07:25:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236931AbjDEHZZ (ORCPT ); Wed, 5 Apr 2023 03:25:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230050AbjDEHZY (ORCPT ); Wed, 5 Apr 2023 03:25:24 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7D0440D3; Wed, 5 Apr 2023 00:25:22 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-947c7d38ef5so28260166b.1; Wed, 05 Apr 2023 00:25:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680679521; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:from:to:cc:subject:date:message-id:reply-to; bh=VkhKh/PwqyfN4KxHXS1N4qLbgG5mAMhKeb6DJtL6PA0=; b=f6w6dW5S62Y6/g84bNlb+xW3TJAo77lcb03/NyOTtfhgk8odVQjeo2ScGhHiaHl46k xSzvrN3VtFOC+B0MnMj6V3S9G2N1ASolj+qY8aNHFSnmS+VDzgECtALScbnTDalDIYoH WhH/B1eU39dyTCNmhaSvu9s75X1iL25hOlEJHyptU30qGeIcbkEGdAKrlEHJsZaI93AC ahVPdRoX7t2mxH3YEzmhhoXW3SWArcmmGstfcMaGLLZyDVJ51/uH62vAKsE7caJr1SVA MWzeZWRp/kThgZKuzSJi29JPLIZa8AvY1urOq7bB+CWD8BqptrHoGiWX6d6sYHXFyp5H prQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680679521; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=VkhKh/PwqyfN4KxHXS1N4qLbgG5mAMhKeb6DJtL6PA0=; b=nn8YJRzIju1X0HKWVTiwAuqR6YPk81Fda+Bm0+9taolQhl13Q4kRer+rKrVWmw7jL8 EVXWVjFP0oYpWZXFZdZKHbpFforeROEe16BWTYhsH3vMb2iF55b2wvVknnc0nGrpPuDy 8Bp0BGZLbRYF+v31jA3OpXUqdAAzvS5X9ttwOUMnGzLutFCJikD+nP1emk4yBDydf0AD 256HNyjuv5KYj8b5TCXnRlPTxM2mytM9liWfzMIM/Qlr4c0AwITvH7heso8576O6fniw uSqol1eKcxMukOWizFx0aybwLbXDKzM/wDyeBLjwIrVtCU8yLXZhwJw10RkK3Kzp1FS9 7yrQ== X-Gm-Message-State: AAQBX9dXVc1Ukid2MTLN5/8csvDXO7YcR7HuR4hGUMOe+g1cizA8s3et XhL9PyTgdPrm+NzvcAhEUGE= X-Google-Smtp-Source: AKy350Zh2H1E62n2QX24xYNhYPrIr5LzXqq6QOgkPWBkjS72GtfNnD3d2nr1yjF0qFcF8zSBkHrfFA== X-Received: by 2002:aa7:d69a:0:b0:4fe:9689:96bb with SMTP id d26-20020aa7d69a000000b004fe968996bbmr1366142edr.35.1680679521016; Wed, 05 Apr 2023 00:25:21 -0700 (PDT) Received: from krava ([83.240.62.56]) by smtp.gmail.com with ESMTPSA id r6-20020a05640251c600b004fd219242a5sm6794770edd.7.2023.04.05.00.25.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 00:25:20 -0700 (PDT) From: Jiri Olsa X-Google-Original-From: Jiri Olsa Date: Wed, 5 Apr 2023 09:25:18 +0200 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@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] perf pmu: Make parser reentrant Message-ID: References: <20230404133630.1985739-1-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230404133630.1985739-1-irogers@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org On Tue, Apr 04, 2023 at 06:36:30AM -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 hum I can't apply this version on Arnaldo's perf/core: patching file tools/perf/util/pmu.c Hunk #2 succeeded at 59 with fuzz 1. Hunk #3 FAILED at 80. Hunk #4 FAILED at 90. 2 out of 4 hunks FAILED -- saving rejects to file tools/perf/util/pmu.c.rej patching file tools/perf/util/pmu.h patching file tools/perf/util/pmu.l patching file tools/perf/util/pmu.y jirka > --- > tools/perf/util/pmu.c | 24 ++++++++++++++++++------ > tools/perf/util/pmu.h | 2 +- > tools/perf/util/pmu.l | 17 ++++++++++++----- > tools/perf/util/pmu.y | 5 ++++- > 4 files changed, 35 insertions(+), 13 deletions(-) > > diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c > index 78a407b42ad1..f603cdabf797 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; > > static struct perf_pmu *perf_pmu__find2(int dirfd, const char *name); > @@ -81,6 +80,8 @@ int perf_pmu__format_parse(int dirfd, struct list_head *head) > while (!ret && (evt_ent = readdir(format_dir))) { > char *name = evt_ent->d_name; > int fd; > + void *scanner; > + FILE *file; > > if (!strcmp(name, ".") || !strcmp(name, "..")) > continue; > @@ -91,9 +92,20 @@ int perf_pmu__format_parse(int dirfd, struct list_head *head) > if (fd < 0) > break; > > - perf_pmu_in = fdopen(fd, "r"); > - ret = perf_pmu_parse(head, name); > - fclose(perf_pmu_in); > + file = fdopen(fd, "r"); > + if (!file) > + break; > + > + 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); > } > > closedir(format_dir); > diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h > index 32c3a75bca0e..d53618c65c92 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 > @@ -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 >