luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 04:13:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rybalkin-gregex-jit-increase-stack-size' into 'main'

Browse Source 
gregex: set default max stack size for PCRE2 JIT compiler to 512KiB

See merge request GNOME/glib!3530
This commit is contained in:
Philip Withnall 2023-08-15 13:26:43 +00:00
commit 9b15842ec1
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
glib/gregex.c
View File

@ -232,6 +232,7 @@ struct _GMatchInfo
gssize string_len; /* length of string, in bytes */ gssize string_len; /* length of string, in bytes */
pcre2_match_context *match_context; pcre2_match_context *match_context;
pcre2_match_data *match_data; pcre2_match_data *match_data;
pcre2_jit_stack *jit_stack;
}; };
typedef enum typedef enum
@ -896,22 +897,22 @@ recalc_match_offsets (GMatchInfo *match_info,
} }
static JITStatus static JITStatus
enable_jit_with_match_options (GRegex *regex, enable_jit_with_match_options (GMatchInfo *match_info,
uint32_t match_options) uint32_t match_options)
{ {
gint retval; gint retval;
uint32_t old_jit_options, new_jit_options; uint32_t old_jit_options, new_jit_options;
if (!(regex->orig_compile_opts & G_REGEX_OPTIMIZE)) if (!(match_info->regex->orig_compile_opts & G_REGEX_OPTIMIZE))
return JIT_STATUS_DISABLED; return JIT_STATUS_DISABLED;
if (regex->jit_status == JIT_STATUS_DISABLED) if (match_info->regex->jit_status == JIT_STATUS_DISABLED)
return JIT_STATUS_DISABLED; return JIT_STATUS_DISABLED;
if (match_options & G_REGEX_PCRE2_JIT_UNSUPPORTED_OPTIONS) if (match_options & G_REGEX_PCRE2_JIT_UNSUPPORTED_OPTIONS)
return JIT_STATUS_DISABLED; return JIT_STATUS_DISABLED;
old_jit_options = regex->jit_options; old_jit_options = match_info->regex->jit_options;
new_jit_options = old_jit_options | PCRE2_JIT_COMPLETE; new_jit_options = old_jit_options | PCRE2_JIT_COMPLETE;
if (match_options & PCRE2_PARTIAL_HARD) if (match_options & PCRE2_PARTIAL_HARD)
new_jit_options |= PCRE2_JIT_PARTIAL_HARD; new_jit_options |= PCRE2_JIT_PARTIAL_HARD;
@ -920,13 +921,16 @@ enable_jit_with_match_options (GRegex *regex,
/* no new options enabled */ /* no new options enabled */
if (new_jit_options == old_jit_options) if (new_jit_options == old_jit_options)
return regex->jit_status; return match_info->regex->jit_status;
retval = pcre2_jit_compile (regex->pcre_re, new_jit_options); retval = pcre2_jit_compile (match_info->regex->pcre_re, new_jit_options);
switch (retval) switch (retval)
{ {
case 0: /* JIT enabled successfully */ case 0: /* JIT enabled successfully */
regex->jit_options = new_jit_options; match_info->regex->jit_options = new_jit_options;
/* Set min stack size for JIT to 32KiB and max to 512KiB */
match_info->jit_stack = pcre2_jit_stack_create (1 << 15, 1 << 19, NULL);
pcre2_jit_stack_assign (match_info->match_context, NULL, match_info->jit_stack);
return JIT_STATUS_ENABLED; return JIT_STATUS_ENABLED;
case PCRE2_ERROR_NOMEMORY: case PCRE2_ERROR_NOMEMORY:
g_debug ("JIT compilation was requested with G_REGEX_OPTIMIZE, " g_debug ("JIT compilation was requested with G_REGEX_OPTIMIZE, "
@ -1023,6 +1027,8 @@ g_match_info_unref (GMatchInfo *match_info)
g_regex_unref (match_info->regex); g_regex_unref (match_info->regex);
if (match_info->match_context) if (match_info->match_context)
pcre2_match_context_free (match_info->match_context); pcre2_match_context_free (match_info->match_context);
if (match_info->jit_stack)
pcre2_jit_stack_free (match_info->jit_stack);
if (match_info->match_data) if (match_info->match_data)
pcre2_match_data_free (match_info->match_data); pcre2_match_data_free (match_info->match_data);
g_free (match_info->offsets); g_free (match_info->offsets);
@ -1091,7 +1097,7 @@ g_match_info_next (GMatchInfo *match_info,
opts = match_info->regex->match_opts | match_info->match_opts; opts = match_info->regex->match_opts | match_info->match_opts;
jit_status = enable_jit_with_match_options (match_info->regex, opts); jit_status = enable_jit_with_match_options (match_info, opts);
if (jit_status == JIT_STATUS_ENABLED) if (jit_status == JIT_STATUS_ENABLED)
{ {
match_info->matches = pcre2_jit_match (match_info->regex->pcre_re, match_info->matches = pcre2_jit_match (match_info->regex->pcre_re,
@ -1764,7 +1770,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
regex->orig_compile_opts = compile_options; regex->orig_compile_opts = compile_options;
regex->match_opts = pcre_match_options; regex->match_opts = pcre_match_options;
regex->orig_match_opts = match_options; regex->orig_match_opts = match_options;
regex->jit_status = enable_jit_with_match_options (regex, regex->match_opts);
return regex; return regex;
} }

9
glib/tests/regex.c
View File

@ -53,6 +53,9 @@
/* A random value use to mark untouched integer variables. */ /* A random value use to mark untouched integer variables. */
#define UNTOUCHED -559038737 #define UNTOUCHED -559038737
/* A length of the test string in JIT stack test */
#define TEST_STRING_LEN 20000
static gint total; static gint total;
typedef struct { typedef struct {
@ -2738,6 +2741,12 @@ G_GNUC_END_IGNORE_DEPRECATIONS
TEST_MATCH_SIMPLE("\\", "a", 0, 0, FALSE); TEST_MATCH_SIMPLE("\\", "a", 0, 0, FALSE);
TEST_MATCH_SIMPLE("[", "", 0, 0, FALSE); TEST_MATCH_SIMPLE("[", "", 0, 0, FALSE);
/* Test that JIT compiler has enough stack */
char test_string[TEST_STRING_LEN];
memset (test_string, '*', TEST_STRING_LEN);
test_string[TEST_STRING_LEN - 1] = '\0';
TEST_MATCH_SIMPLE ("^(?:[ \t\n]|[^[:cntrl:]])*$", test_string, 0, 0, TRUE);
/* TEST_MATCH(pattern, compile_opts, match_opts, string, /* TEST_MATCH(pattern, compile_opts, match_opts, string,
* string_len, start_position, match_opts2, expected) */ * string_len, start_position, match_opts2, expected) */
TEST_MATCH("a", 0, 0, "a", -1, 0, 0, TRUE); TEST_MATCH("a", 0, 0, "a", -1, 0, 0, TRUE);