1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not use rb_iseq_path() while moving ISeq pointers

Browse Source 
in GC.compact.

While `in_jit` is false, GC.compact is allowed to run and it may be
moving ISeq-related pointers. So calling rb_iseq_path() when `in_jit`
is true is illegal.
This commit is contained in:
Takashi Kokubun 2019-05-30 04:12:10 +09:00
parent 5b64d7ac6e
commit 814eaa25e2
No known key found for this signature in database
GPG Key ID: 6FFC433B12EE23DD
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mjit_worker.c
View File

@ -943,19 +943,6 @@ load_func_from_so(const char *so_file, const char *funcname, struct rb_mjit_unit
return func; return func;
} }
static void
print_jit_result(const char *result, const struct rb_mjit_unit *unit, const double duration, long lineno, const char *c_file)
{
if (unit->iseq == NULL) {
verbose(1, "JIT %s (%.1fms): (GCed) -> %s", result, duration, c_file);
}
else {
verbose(1, "JIT %s (%.1fms): %s@%s:%ld -> %s", result,
duration, RSTRING_PTR(unit->iseq->body->location.label),
RSTRING_PTR(rb_iseq_path(unit->iseq)), lineno, c_file);
}
}
#ifndef __clang__ #ifndef __clang__
static const char * static const char *
header_name_end(const char *s) header_name_end(const char *s)
@ -1075,18 +1062,18 @@ convert_unit_to_func(struct rb_mjit_unit *unit)
return (mjit_func_t)NOT_COMPILED_JIT_ISEQ_FUNC; return (mjit_func_t)NOT_COMPILED_JIT_ISEQ_FUNC;
} }
// FIX2INT may fallback to rb_num2long(), which is a method call and dangerous in MJIT worker. So showing the // To make MJIT worker thread-safe against GC.compact, copy ISeq values while `in_jit` is true.
// line number only when it's Fixnum. Also note that doing this while in_jit is true to avoid GC / GC.compact. long iseq_lineno = 0;
long lineno = 0;
if (FIXNUM_P(unit->iseq->body->location.first_lineno)) if (FIXNUM_P(unit->iseq->body->location.first_lineno))
lineno = FIX2LONG(unit->iseq->body->location.first_lineno); // FIX2INT may fallback to rb_num2long(), which is a method call and dangerous in MJIT worker. So using only FIX2LONG.
{ iseq_lineno = FIX2LONG(unit->iseq->body->location.first_lineno);
VALUE s = rb_iseq_path(unit->iseq); char *iseq_label = alloca(RSTRING_LEN(unit->iseq->body->location.label));
const char *label = RSTRING_PTR(unit->iseq->body->location.label); char *iseq_path = alloca(RSTRING_LEN(rb_iseq_path(unit->iseq)));
const char *path = RSTRING_PTR(s); strcpy(iseq_label, RSTRING_PTR(unit->iseq->body->location.label));
verbose(2, "start compilation: %s@%s:%ld -> %s", label, path, lineno, c_file); strcpy(iseq_path, RSTRING_PTR(rb_iseq_path(unit->iseq)));
fprintf(f, "/* %s@%s:%ld */\n\n", label, path, lineno);
} verbose(2, "start compilation: %s@%s:%ld -> %s", iseq_label, iseq_path, iseq_lineno, c_file);
fprintf(f, "/* %s@%s:%ld */\n\n", iseq_label, iseq_path, iseq_lineno);
bool success = mjit_compile(f, unit->iseq, funcname); bool success = mjit_compile(f, unit->iseq, funcname);
// release blocking mjit_gc_start_hook // release blocking mjit_gc_start_hook
@ -1100,7 +1087,7 @@ convert_unit_to_func(struct rb_mjit_unit *unit)
if (!success) { if (!success) {
if (!mjit_opts.save_temps) if (!mjit_opts.save_temps)
remove_file(c_file); remove_file(c_file);
print_jit_result("failure", unit, 0, lineno, c_file); verbose(1, "JIT failure: %s@%s:%ld -> %s", iseq_label, iseq_path, iseq_lineno, c_file);
return (mjit_func_t)NOT_COMPILED_JIT_ISEQ_FUNC; return (mjit_func_t)NOT_COMPILED_JIT_ISEQ_FUNC;
} }
@ -1138,7 +1125,8 @@ convert_unit_to_func(struct rb_mjit_unit *unit)
if ((uintptr_t)func > (uintptr_t)LAST_JIT_ISEQ_FUNC) { if ((uintptr_t)func > (uintptr_t)LAST_JIT_ISEQ_FUNC) {
CRITICAL_SECTION_START(3, "end of jit"); CRITICAL_SECTION_START(3, "end of jit");
add_to_list(unit, &active_units); add_to_list(unit, &active_units);
print_jit_result("success", unit, end_time - start_time, lineno, c_file); verbose(1, "JIT success (%.1fms): %s@%s:%ld -> %s",
end_time - start_time, iseq_label, iseq_path, iseq_lineno, c_file);
CRITICAL_SECTION_FINISH(3, "end of jit"); CRITICAL_SECTION_FINISH(3, "end of jit");
} }
return (mjit_func_t)func; return (mjit_func_t)func;