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

Use atomic load to read interrupt mask

Browse Source
This commit is contained in:
John Hawthorn 2025-05-14 18:28:53 -07:00
parent cd15cc250f
commit 05e0e7223a
Notes: git 2025-05-20 17:00:21 +00:00 
Merged: https://github.com/ruby/ruby/pull/13357
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
misc/tsan_suppressions.txt
View File

@ -25,11 +25,6 @@ race:objspace_malloc_increase_body
race_top:rb_signal_buff_size race_top:rb_signal_buff_size
race:unregister_ubf_list race:unregister_ubf_list
# interrupt flag is set atomically, but read non-atomically
race_top:RUBY_VM_INTERRUPTED_ANY
race_top:unblock_function_set
race_top:threadptr_get_interrupts
# It's already crashing. We're doing our best # It's already crashing. We're doing our best
signal:rb_vm_bugreport signal:rb_vm_bugreport
race:check_reserved_signal_ race:check_reserved_signal_

16
ruby_atomic.h
View File

@ -1,3 +1,6 @@
#ifndef INTERNAL_ATOMIC_H
#define INTERNAL_ATOMIC_H
#include "ruby/atomic.h" #include "ruby/atomic.h"
/* shim macros only */ /* shim macros only */
@ -21,3 +24,16 @@
#define ATOMIC_SUB(var, val) RUBY_ATOMIC_SUB(var, val) #define ATOMIC_SUB(var, val) RUBY_ATOMIC_SUB(var, val)
#define ATOMIC_VALUE_CAS(var, oldval, val) RUBY_ATOMIC_VALUE_CAS(var, oldval, val) #define ATOMIC_VALUE_CAS(var, oldval, val) RUBY_ATOMIC_VALUE_CAS(var, oldval, val)
#define ATOMIC_VALUE_EXCHANGE(var, val) RUBY_ATOMIC_VALUE_EXCHANGE(var, val) #define ATOMIC_VALUE_EXCHANGE(var, val) RUBY_ATOMIC_VALUE_EXCHANGE(var, val)
static inline rb_atomic_t
rbimpl_atomic_load_relaxed(rb_atomic_t *ptr)
{
#if defined(HAVE_GCC_ATOMIC_BUILTINS)
return __atomic_load_n(ptr, __ATOMIC_RELAXED);
#else
return *ptr;
#endif
}
#define ATOMIC_LOAD_RELAXED(var) rbimpl_atomic_load_relaxed(&(var))
#endif

3
thread.c
View File

@ -2465,8 +2465,9 @@ threadptr_get_interrupts(rb_thread_t *th)
rb_atomic_t interrupt; rb_atomic_t interrupt;
rb_atomic_t old; rb_atomic_t old;
old = ATOMIC_LOAD_RELAXED(ec->interrupt_flag);
do { do {
interrupt = ec->interrupt_flag; interrupt = old;
old = ATOMIC_CAS(ec->interrupt_flag, interrupt, interrupt & ec->interrupt_mask); old = ATOMIC_CAS(ec->interrupt_flag, interrupt, interrupt & ec->interrupt_mask);
} while (old != interrupt); } while (old != interrupt);
return interrupt & (rb_atomic_t)~ec->interrupt_mask; return interrupt & (rb_atomic_t)~ec->interrupt_mask;

10
vm_core.h
View File

@ -2102,8 +2102,12 @@ enum {
#define RUBY_VM_SET_TRAP_INTERRUPT(ec) ATOMIC_OR((ec)->interrupt_flag, TRAP_INTERRUPT_MASK) #define RUBY_VM_SET_TRAP_INTERRUPT(ec) ATOMIC_OR((ec)->interrupt_flag, TRAP_INTERRUPT_MASK)
#define RUBY_VM_SET_TERMINATE_INTERRUPT(ec) ATOMIC_OR((ec)->interrupt_flag, TERMINATE_INTERRUPT_MASK) #define RUBY_VM_SET_TERMINATE_INTERRUPT(ec) ATOMIC_OR((ec)->interrupt_flag, TERMINATE_INTERRUPT_MASK)
#define RUBY_VM_SET_VM_BARRIER_INTERRUPT(ec) ATOMIC_OR((ec)->interrupt_flag, VM_BARRIER_INTERRUPT_MASK) #define RUBY_VM_SET_VM_BARRIER_INTERRUPT(ec) ATOMIC_OR((ec)->interrupt_flag, VM_BARRIER_INTERRUPT_MASK)
#define RUBY_VM_INTERRUPTED(ec) ((ec)->interrupt_flag & ~(ec)->interrupt_mask & \
(PENDING_INTERRUPT_MASK|TRAP_INTERRUPT_MASK)) static inline bool
RUBY_VM_INTERRUPTED(rb_execution_context_t *ec)
{
return (ATOMIC_LOAD_RELAXED(ec->interrupt_flag) & ~(ec->interrupt_mask) & (PENDING_INTERRUPT_MASK|TRAP_INTERRUPT_MASK));
}
static inline bool static inline bool
RUBY_VM_INTERRUPTED_ANY(rb_execution_context_t *ec) RUBY_VM_INTERRUPTED_ANY(rb_execution_context_t *ec)
@ -2116,7 +2120,7 @@ RUBY_VM_INTERRUPTED_ANY(rb_execution_context_t *ec)
RUBY_VM_SET_TIMER_INTERRUPT(ec); RUBY_VM_SET_TIMER_INTERRUPT(ec);
} }
#endif #endif
return ec->interrupt_flag & ~(ec)->interrupt_mask; return ATOMIC_LOAD_RELAXED(ec->interrupt_flag) & ~(ec)->interrupt_mask;
} }
VALUE rb_exc_set_backtrace(VALUE exc, VALUE bt); VALUE rb_exc_set_backtrace(VALUE exc, VALUE bt);