From: Junio C Hamano <gitster@pobox.com> To: "Carlo Marcelo Arenas Belón" <carenas@gmail.com> Cc: git@vger.kernel.org, avarab@gmail.com, sandals@crustytoothpaste.net Subject: Re: [RFC PATCH] grep: allow for run time disabling of JIT in PCRE Date: Sun, 28 Jul 2019 21:57:19 -0700 Message-ID: <xmqqimrll9ow.fsf@gitster-ct.c.googlers.com> (raw) In-Reply-To: <20190728235427.41425-1-carenas@gmail.com> ("Carlo Marcelo Arenas =?utf-8?Q?Bel=C3=B3n=22's?= message of "Sun, 28 Jul 2019 16:54:27 -0700") Carlo Marcelo Arenas Belón <carenas@gmail.com> writes: > PCRE1 allowed for a compile time flag to disable JIT, but PCRE2 never > had one, forcing the use of JIT if -P was requested. > > After ed0479ce3d (Merge branch 'ab/no-kwset' into next, 2019-07-15) > the PCRE2 engine will be used more broadly and therefore adding this > knob will give users a fallback for situations like the one observed > in OpenBSD with a JIT enabled PCRE2, because of W^X restrictions: > > $ git grep 'foo bar' > fatal: Couldn't JIT the PCRE2 pattern 'foo bar', got '-48' > $ git grep -G 'foo bar' > fatal: Couldn't JIT the PCRE2 pattern 'foo bar', got '-48' > $ git grep -E 'foo bar' > fatal: Couldn't JIT the PCRE2 pattern 'foo bar', got '-48' > $ git grep -F 'foo bar' > fatal: Couldn't JIT the PCRE2 pattern 'foo bar', got '-48' ;-) Yeah, we should have known that security-paranoid distros would have W^X issues with this series, too. I am not sure I like a config-only knob like this, though---shouldn't we have a command line knob to turn jit off first, and then for those who gets tired of having to type it all the time add the configuration to flip the default for them? Other than that, the feature itself makes quite a lot of sense. > > Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> > --- > Documentation/git-grep.txt | 4 ++++ > grep.c | 15 +++++++++++++-- > grep.h | 1 + > 3 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt > index c89fb569e3..ff544bdeec 100644 > --- a/Documentation/git-grep.txt > +++ b/Documentation/git-grep.txt > @@ -69,6 +69,10 @@ grep.fallbackToNoIndex:: > If set to true, fall back to git grep --no-index if git grep > is executed outside of a git repository. Defaults to false. > > +pcre.jit:: > + If set to false, disable JIT when using PCRE. Defaults to > + true. > + > > OPTIONS > ------- > diff --git a/grep.c b/grep.c > index c7c06ae08d..3524d353dd 100644 > --- a/grep.c > +++ b/grep.c > @@ -56,6 +56,7 @@ void init_grep_defaults(struct repository *repo) > opt->repo = repo; > opt->relative = 1; > opt->pathname = 1; > + opt->pcre_jit = 1; > opt->max_depth = -1; > opt->pattern_type_option = GREP_PATTERN_TYPE_UNSPECIFIED; > color_set(opt->colors[GREP_COLOR_CONTEXT], ""); > @@ -125,6 +126,12 @@ int grep_config(const char *var, const char *value, void *cb) > return 0; > } > > + if (!strcmp(var, "pcre.jit")) { > + int is_bool; > + opt->pcre_jit = git_config_bool_or_int(var, value, &is_bool); > + return 0; > + } > + > if (!strcmp(var, "color.grep")) > opt->color = git_config_colorbool(var, value); > if (!strcmp(var, "color.grep.match")) { > @@ -163,6 +170,7 @@ void grep_init(struct grep_opt *opt, struct repository *repo, const char *prefix > opt->pattern_tail = &opt->pattern_list; > opt->header_tail = &opt->header_list; > > + opt->pcre_jit = def->pcre_jit; > opt->only_matching = def->only_matching; > opt->color = def->color; > opt->extended_regexp_option = def->extended_regexp_option; > @@ -393,7 +401,8 @@ static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt) > die("%s", error); > > #ifdef GIT_PCRE1_USE_JIT > - pcre_config(PCRE_CONFIG_JIT, &p->pcre1_jit_on); > + if (opt->pcre_jit) > + pcre_config(PCRE_CONFIG_JIT, &p->pcre1_jit_on); > #endif > } > > @@ -489,7 +498,9 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt > compile_regexp_failed(p, (const char *)&errbuf); > } > > - pcre2_config(PCRE2_CONFIG_JIT, &p->pcre2_jit_on); > + if (opt->pcre_jit) > + pcre2_config(PCRE2_CONFIG_JIT, &p->pcre2_jit_on); > + > if (p->pcre2_jit_on) { > jitret = pcre2_jit_compile(p->pcre2_pattern, PCRE2_JIT_COMPLETE); > if (jitret) > diff --git a/grep.h b/grep.h > index c0c71eb4a9..fff152e606 100644 > --- a/grep.h > +++ b/grep.h > @@ -151,6 +151,7 @@ struct grep_opt { > int allow_textconv; > int extended; > int use_reflog_filter; > + int pcre_jit; > int pcre1; > int pcre2; > int relative;
next prev parent reply other threads:[~2019-07-29 4:57 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-28 23:54 Carlo Marcelo Arenas Belón 2019-07-29 0:09 ` Carlo Arenas 2019-07-29 4:57 ` Junio C Hamano [this message] 2019-07-29 5:29 ` Carlo Arenas 2019-07-29 8:55 ` Ævar Arnfjörð Bjarmason 2019-07-29 10:26 ` Carlo Arenas 2019-07-29 12:38 ` Ævar Arnfjörð Bjarmason 2019-07-30 13:01 ` Carlo Arenas 2019-07-29 10:59 ` [RFC PATCH v2] " Carlo Marcelo Arenas Belón 2019-07-29 11:33 ` Carlo Arenas 2019-07-29 15:11 ` René Scharfe 2019-07-29 17:47 ` Junio C Hamano 2019-07-30 0:49 ` Carlo Arenas 2019-07-30 17:55 ` René Scharfe 2019-07-31 12:36 ` Johannes Schindelin 2019-07-31 16:18 ` Junio C Hamano 2019-07-31 12:32 ` Johannes Schindelin 2019-07-31 14:57 ` Ævar Arnfjörð Bjarmason 2019-08-04 0:25 ` Carlo Arenas 2019-08-04 3:14 ` [RFC PATCH v3] grep: treat PCRE2 jit compilation memory error as non fatal Carlo Marcelo Arenas Belón 2019-08-04 7:43 ` Carlo Arenas 2019-08-05 20:16 ` Junio C Hamano 2019-07-31 12:24 ` [RFC PATCH] grep: allow for run time disabling of JIT in PCRE Johannes Schindelin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=xmqqimrll9ow.fsf@gitster-ct.c.googlers.com \ --to=gitster@pobox.com \ --cc=avarab@gmail.com \ --cc=carenas@gmail.com \ --cc=git@vger.kernel.org \ --cc=sandals@crustytoothpaste.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git