ruby-changes:55092
From: k0kubun <ko1@a...>
Date: Tue, 19 Mar 2019 01:32:54 +0900 (JST)
Subject: [ruby-changes:55092] k0kubun:r67299 (trunk): Resurrect r67287 and r67288
k0kubun 2019-03-19 01:32:48 +0900 (Tue, 19 Mar 2019) New Revision: 67299 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=67299 Log: Resurrect r67287 and r67288 I noticed that r67287 was illegal because memory allocated by `alloca` was used after the stack is expired. So I just replaced that with `malloc` and `free` for now. Modified files: trunk/mjit.h trunk/mjit_compile.c trunk/mjit_worker.c Index: mjit.h =================================================================== --- mjit.h (revision 67298) +++ mjit.h (revision 67299) @@ -64,7 +64,7 @@ extern void mjit_add_iseq_to_process(con https://github.com/ruby/ruby/blob/trunk/mjit.h#L64 extern VALUE mjit_wait_call(rb_execution_context_t *ec, struct rb_iseq_constant_body *body); RUBY_SYMBOL_EXPORT_END -extern bool mjit_compile(FILE *f, const struct rb_iseq_constant_body *body, const char *funcname, struct rb_call_cache *cc_entries, union iseq_inline_storage_entry *is_entries); +extern bool mjit_compile(FILE *f, const rb_iseq_t *iseq, const char *funcname); extern void mjit_init(struct mjit_options *opts); extern void mjit_postponed_job_register_start_hook(void); extern void mjit_postponed_job_register_finish_hook(void); Index: mjit_compile.c =================================================================== --- mjit_compile.c (revision 67298) +++ mjit_compile.c (revision 67299) @@ -196,10 +196,14 @@ compile_cancel_handler(FILE *f, const st https://github.com/ruby/ruby/blob/trunk/mjit_compile.c#L196 fprintf(f, " return Qundef;\n"); } +extern bool mjit_copy_cache_from_main_thread(const rb_iseq_t *iseq, struct rb_call_cache **cc_entries, union iseq_inline_storage_entry **is_entries); + // Compile ISeq to C code in `f`. It returns true if it succeeds to compile. bool -mjit_compile(FILE *f, const struct rb_iseq_constant_body *body, const char *funcname, struct rb_call_cache *cc_entries, union iseq_inline_storage_entry *is_entries) +mjit_compile(FILE *f, const rb_iseq_t *iseq, const char *funcname) { + const struct rb_iseq_constant_body *body = iseq->body; + struct compile_status status; status.success = true; status.local_stack_p = !body->catch_except_p; @@ -207,8 +211,8 @@ mjit_compile(FILE *f, const struct rb_is https://github.com/ruby/ruby/blob/trunk/mjit_compile.c#L211 if (status.stack_size_for_pos == NULL) return false; memset(status.stack_size_for_pos, NOT_COMPILED_STACK_SIZE, sizeof(int) * body->iseq_size); - status.cc_entries = cc_entries; - status.is_entries = is_entries; + if (mjit_copy_cache_from_main_thread(iseq, &status.cc_entries, &status.is_entries) == false) + return false; /* For performance, we verify stack size only on compilation time (mjit_compile.inc.erb) without --jit-debug */ if (!mjit_opts.debug) { @@ -248,6 +252,8 @@ mjit_compile(FILE *f, const struct rb_is https://github.com/ruby/ruby/blob/trunk/mjit_compile.c#L252 fprintf(f, "\n} /* end of %s */\n", funcname); free(status.stack_size_for_pos); + free(status.cc_entries); + free(status.is_entries); return status.success; } Index: mjit_worker.c =================================================================== --- mjit_worker.c (revision 67298) +++ mjit_worker.c (revision 67299) @@ -986,7 +986,7 @@ compile_prelude(FILE *f) https://github.com/ruby/ruby/blob/trunk/mjit_worker.c#L986 /* Compile ISeq in UNIT and return function pointer of JIT-ed code. It may return NOT_COMPILED_JIT_ISEQ_FUNC if something went wrong. */ static mjit_func_t -convert_unit_to_func(struct rb_mjit_unit *unit, struct rb_call_cache *cc_entries, union iseq_inline_storage_entry *is_entries) +convert_unit_to_func(struct rb_mjit_unit *unit) { char c_file_buff[MAXPATHLEN], *c_file = c_file_buff, *so_file, funcname[35]; /* TODO: reconsider `35` */ int fd; @@ -1067,7 +1067,7 @@ convert_unit_to_func(struct rb_mjit_unit https://github.com/ruby/ruby/blob/trunk/mjit_worker.c#L1067 verbose(2, "start compilation: %s@%s:%d -> %s", label, path, lineno, c_file); fprintf(f, "/* %s@%s:%d */\n\n", label, path, lineno); } - bool success = mjit_compile(f, unit->iseq->body, funcname, cc_entries, is_entries); + bool success = mjit_compile(f, unit->iseq, funcname); /* release blocking mjit_gc_start_hook */ CRITICAL_SECTION_START(3, "after mjit_compile to wakeup client for GC"); @@ -1141,33 +1141,73 @@ static void mjit_copy_job_handler(void * https://github.com/ruby/ruby/blob/trunk/mjit_worker.c#L1141 /* vm_trace.c */ int rb_workqueue_register(unsigned flags, rb_postponed_job_func_t , void *); -/* We're lazily copying cache values from main thread because these cache values - could be different between ones on enqueue timing and ones on dequeue timing. - Return true if copy succeeds. */ -static bool -copy_cache_from_main_thread(mjit_copy_job_t *job) +// Copy inline cache values of `iseq` to `*cc_entries` and `*is_entries`. +// Return true if copy succeeds or is not needed. +// +// We're lazily copying cache values from main thread because these cache values +// could be different between ones on enqueue timing and ones on dequeue timing. +bool +mjit_copy_cache_from_main_thread(const rb_iseq_t *iseq, struct rb_call_cache **cc_entries, union iseq_inline_storage_entry **is_entries) { - CRITICAL_SECTION_START(3, "in copy_cache_from_main_thread"); + mjit_copy_job_t *job = &mjit_copy_job; // just a short hand + + CRITICAL_SECTION_START(3, "in mjit_copy_cache_from_main_thread"); + job->finish_p = true; // disable dispatching this job in mjit_copy_job_handler while it's being modified + CRITICAL_SECTION_FINISH(3, "in mjit_copy_cache_from_main_thread"); + + const struct rb_iseq_constant_body *body = iseq->body; + job->cc_entries = NULL; + if (body->ci_size > 0 || body->ci_kw_size > 0) { + job->cc_entries = malloc(sizeof(struct rb_call_cache) * (body->ci_size + body->ci_kw_size)); + if (!job->cc_entries) return false; + } + job->is_entries = NULL; + if (body->is_size > 0) { + job->is_entries = malloc(sizeof(union iseq_inline_storage_entry) * body->is_size); + if (!job->is_entries) { + free(job->cc_entries); + return false; + } + } + + // If ISeq has no inline cache, there's no need to run a copy job. + if (job->cc_entries == NULL && job->is_entries == NULL) { + *cc_entries = job->cc_entries; + *is_entries = job->is_entries; + return true; + } + + CRITICAL_SECTION_START(3, "in mjit_copy_cache_from_main_thread"); + job->iseq = iseq; // Prevernt GC of this ISeq from here job->finish_p = false; // allow dispatching this job in mjit_copy_job_handler - CRITICAL_SECTION_FINISH(3, "in copy_cache_from_main_thread"); + CRITICAL_SECTION_FINISH(3, "in mjit_copy_cache_from_main_thread"); if (UNLIKELY(mjit_opts.wait)) { mjit_copy_job_handler((void *)job); - return job->finish_p; + } else if (rb_workqueue_register(0, mjit_copy_job_handler, (void *)job)) { + CRITICAL_SECTION_START(3, "in MJIT copy job wait"); + // checking `stop_worker_p` too because `RUBY_VM_CHECK_INTS(ec)` may not + // lush mjit_copy_job_handler when EC_EXEC_TAG() is not TAG_NONE, and then + // `stop_worker()` could dead lock with this function. + while (!job->finish_p && !stop_worker_p) { + rb_native_cond_wait(&mjit_worker_wakeup, &mjit_engine_mutex); + verbose(3, "Getting wakeup from client"); + } + CRITICAL_SECTION_FINISH(3, "in MJIT copy job wait"); } - if (!rb_workqueue_register(0, mjit_copy_job_handler, (void *)job)) - return false; - CRITICAL_SECTION_START(3, "in MJIT copy job wait"); - /* checking `stop_worker_p` too because `RUBY_VM_CHECK_INTS(ec)` may not - lush mjit_copy_job_handler when EC_EXEC_TAG() is not TAG_NONE, and then - `stop_worker()` could dead lock with this function. */ - while (!job->finish_p && !stop_worker_p) { - rb_native_cond_wait(&mjit_worker_wakeup, &mjit_engine_mutex); - verbose(3, "Getting wakeup from client"); - } - CRITICAL_SECTION_FINISH(3, "in MJIT copy job wait"); - return job->finish_p; + // Set result values. + *cc_entries = job->cc_entries; + *is_entries = job->is_entries; + + bool result = job->finish_p; + CRITICAL_SECTION_START(3, "in mjit_copy_cache_from_main_thread"); + job->iseq = NULL; // Allow GC of this ISeq from here + // Disable dispatching this job in mjit_copy_job_handler while memory allocated by alloca + // could be expired after finishing this function. + job->finish_p = true; + CRITICAL_SECTION_FINISH(3, "in mjit_copy_cache_from_main_thread"); + return result; } /* The function implementing a worker. It is executed in a separate @@ -1176,8 +1216,6 @@ copy_cache_from_main_thread(mjit_copy_jo https://github.com/ruby/ruby/blob/trunk/mjit_worker.c#L1216 void mjit_worker(void) { - mjit_copy_job_t *job = &mjit_copy_job; /* just a shorthand */ - #ifndef _MSC_VER if (pch_status == PCH_NOT_READY) { make_pch(); @@ -1204,28 +1242,16 @@ mjit_worker(void) https://github.com/ruby/ruby/blob/trunk/mjit_worker.c#L1242 verbose(3, "Getting wakeup from client"); } unit = get_from_list(&unit_queue); - if (unit) job->iseq = unit->iseq; - job->finish_p = true; // disable dispatching this job in mjit_copy_job_handler while it's being modified CRITICAL_SECTION_FINISH(3, "in worker dequeue"); if (unit) { - const struct rb_iseq_constant_body *body = unit->iseq->body; - job->cc_entries = NULL; - if (body->ci_size > 0 || body->ci_kw_size > 0) - job->cc_entries = alloca(sizeof(struct rb_call_cache) * (body->ci_size + body->ci_kw_size)); - job->is_entries = NULL; - if (body->is_size > 0) - job->is_entries = alloca(sizeof(union iseq_inline_storage_entry) * body->is_size); - - /* Copy ISeq's inline caches values to avoid race condition. */ - if (job->cc_entries != NULL || job->is_entries != NULL) { - if (copy_cache_from_main_thread(job) == false) { - continue; /* retry postponed_job failure, or stop worker */ - } - } - // JIT compile - mjit_func_t func = convert_unit_to_func(unit, job->cc_entries, job->is_entries); + mjit_func_t func = convert_unit_to_func(unit); + + // `mjit_copy_cache_from_main_thread` in `mjit_compile` may wait for a long time + // and worker may be stopped during the compilation. + if (stop_worker_p) + break; CRITICAL_SECTION_START(3, "in jit func replace"); while (in_gc) { /* Make sure we're not GC-ing when touching ISeq */ @@ -1248,10 +1274,6 @@ mjit_worker(void) https://github.com/ruby/ruby/blob/trunk/mjit_worker.c#L1274 } } - // Disable dispatching this job in mjit_copy_job_handler while memory allocated by alloca - // could be expired after finishing this function. - job->finish_p = true; - // To keep mutex unlocked when it is destroyed by mjit_finish, don't wrap CRITICAL_SECTION here. worker_stopped = true; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/