From 9fc4c79ff331888003d8dcb944ca4c9bf9800a42 Mon Sep 17 00:00:00 2001 From: nagachika Date: Thu, 11 Oct 2018 14:58:30 +0000 Subject: merge revision(s) 64062: [Backport #14939] cont.c (ec_switch): prevent delayed/missed trap interrupt race timer-thread may set trap interrupt with rb_threadptr_check_signal at any time independent of GVL. This means timer-thread may set the trap interrupt flag on the previous execution context; causing the flag to be unnoticed until a future ec switch (or lost completely if the ec is done). Note: I avoid relying on th->interrupt_lock here and use atomics because we won't be able to rely on it for proposed lazy timer-thread [Misc #14937]. This regression affects Ruby 2.5 as it was introduced by moving interrupt_flag to `ec' which is an unstable pointer. Ruby <= 2.4 was unaffected because vm->main_thread->interrupt_flag never changed. [ruby-core:88119] [Bug #14939] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- cont.c | 10 ++++++++++ version.h | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cont.c b/cont.c index 6e8f95de54..f0b8a8a0a8 100644 --- a/cont.c +++ b/cont.c @@ -240,7 +240,17 @@ static inline void ec_switch(rb_thread_t *th, rb_fiber_t *fib) { rb_execution_context_t *ec = &fib->cont.saved_ec; + ruby_current_execution_context_ptr = th->ec = ec; + + /* + * timer-thread may set trap interrupt on previous th->ec at any time; + * ensure we do not delay (or lose) the trap interrupt handling. + */ + if (th->vm->main_thread == th && rb_signal_buff_size() > 0) { + RUBY_VM_SET_TRAP_INTERRUPT(ec); + } + VM_ASSERT(ec->fiber_ptr->cont.self == 0 || ec->vm_stack != NULL); } diff --git a/version.h b/version.h index ef604ffdbf..1f6410e70f 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.5.2" #define RUBY_RELEASE_DATE "2018-10-11" -#define RUBY_PATCHLEVEL 99 +#define RUBY_PATCHLEVEL 100 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.1