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

[ruby/mmtk] Do root scanning in scan_vm_specific_roots

Browse Source 
We rely on scan_vm_specific_roots to reach all stacks via the following
path:

    VM -> ractors -> threads -> fibers -> stacks

https://github.com/ruby/mmtk/commit/0a6a835aaa
This commit is contained in:
Kunshan Wang 2025-04-07 15:21:51 +08:00 committed by git
parent b3b1d7b295
commit d17ab5a430
4 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gc/mmtk/mmtk.c
View File

@ -201,7 +201,13 @@ rb_mmtk_get_mutators(void (*visit_mutator)(MMTk_Mutator *mutator, void *data), v
static void static void
rb_mmtk_scan_gc_roots(void) rb_mmtk_scan_gc_roots(void)
{ {
// rb_gc_mark_roots(rb_gc_get_objspace(), NULL); struct objspace *objspace = rb_gc_get_objspace();
// FIXME: Make `rb_gc_mark_roots` aware that the current thread may not have EC.
// See: https://github.com/ruby/mmtk/issues/22
rb_gc_worker_thread_set_vm_context(&objspace->vm_context);
rb_gc_mark_roots(objspace, NULL);
rb_gc_worker_thread_unset_vm_context(&objspace->vm_context);
} }
static int static int
@ -240,18 +246,6 @@ rb_mmtk_scan_objspace(void)
} }
} }
static void
rb_mmtk_scan_roots_in_mutator_thread(MMTk_VMMutatorThread mutator, MMTk_VMWorkerThread worker)
{
if (mutator->gc_mutator_p) {
struct objspace *objspace = rb_gc_get_objspace();
rb_gc_worker_thread_set_vm_context(&objspace->vm_context);
rb_gc_mark_roots(objspace, NULL);
rb_gc_worker_thread_unset_vm_context(&objspace->vm_context);
}
}
static void static void
rb_mmtk_scan_object_ruby_style(MMTk_ObjectReference object) rb_mmtk_scan_object_ruby_style(MMTk_ObjectReference object)
{ {
@ -400,7 +394,6 @@ MMTk_RubyUpcalls ruby_upcalls = {
rb_mmtk_get_mutators, rb_mmtk_get_mutators,
rb_mmtk_scan_gc_roots, rb_mmtk_scan_gc_roots,
rb_mmtk_scan_objspace, rb_mmtk_scan_objspace,
rb_mmtk_scan_roots_in_mutator_thread,
rb_mmtk_scan_object_ruby_style, rb_mmtk_scan_object_ruby_style,
rb_mmtk_call_gc_mark_children, rb_mmtk_call_gc_mark_children,
rb_mmtk_call_obj_free, rb_mmtk_call_obj_free,

2
gc/mmtk/mmtk.h
View File

@ -61,8 +61,6 @@ typedef struct MMTk_RubyUpcalls {
void (*get_mutators)(void (*visit_mutator)(MMTk_Mutator*, void*), void *data); void (*get_mutators)(void (*visit_mutator)(MMTk_Mutator*, void*), void *data);
void (*scan_gc_roots)(void); void (*scan_gc_roots)(void);
void (*scan_objspace)(void); void (*scan_objspace)(void);
void (*scan_roots_in_mutator_thread)(MMTk_VMMutatorThread mutator_tls,
MMTk_VMWorkerThread worker_tls);
void (*scan_object_ruby_style)(MMTk_ObjectReference object); void (*scan_object_ruby_style)(MMTk_ObjectReference object);
void (*call_gc_mark_children)(MMTk_ObjectReference object); void (*call_gc_mark_children)(MMTk_ObjectReference object);
void (*call_obj_free)(MMTk_ObjectReference object); void (*call_obj_free)(MMTk_ObjectReference object);

2
gc/mmtk/src/abi.rs
View File

@ -315,8 +315,6 @@ pub struct RubyUpcalls {
), ),
pub scan_gc_roots: extern "C" fn(), pub scan_gc_roots: extern "C" fn(),
pub scan_objspace: extern "C" fn(), pub scan_objspace: extern "C" fn(),
pub scan_roots_in_mutator_thread:
extern "C" fn(mutator_tls: VMMutatorThread, worker_tls: VMWorkerThread),
pub scan_object_ruby_style: extern "C" fn(object: ObjectReference), pub scan_object_ruby_style: extern "C" fn(object: ObjectReference),
pub call_gc_mark_children: extern "C" fn(object: ObjectReference), pub call_gc_mark_children: extern "C" fn(object: ObjectReference),
pub call_obj_free: extern "C" fn(object: ObjectReference), pub call_obj_free: extern "C" fn(object: ObjectReference),

15
gc/mmtk/src/scanning.rs
View File

@ -5,7 +5,7 @@ use crate::{upcalls, Ruby, RubySlot};
use mmtk::scheduler::{GCWork, GCWorker, WorkBucketStage}; use mmtk::scheduler::{GCWork, GCWorker, WorkBucketStage};
use mmtk::util::{ObjectReference, VMWorkerThread}; use mmtk::util::{ObjectReference, VMWorkerThread};
use mmtk::vm::{ObjectTracer, RootsWorkFactory, Scanning, SlotVisitor}; use mmtk::vm::{ObjectTracer, RootsWorkFactory, Scanning, SlotVisitor};
use mmtk::{Mutator, MutatorContext}; use mmtk::Mutator;
pub struct VMScanning {} pub struct VMScanning {}
@ -67,14 +67,13 @@ impl Scanning<Ruby> for VMScanning {
} }
fn scan_roots_in_mutator_thread( fn scan_roots_in_mutator_thread(
tls: VMWorkerThread, _tls: VMWorkerThread,
mutator: &'static mut Mutator<Ruby>, _mutator: &'static mut Mutator<Ruby>,
mut factory: impl RootsWorkFactory<RubySlot>, mut _factory: impl RootsWorkFactory<RubySlot>,
) { ) {
let gc_tls = unsafe { GCThreadTLS::from_vwt_check(tls) }; // Do nothing. All stacks (including Ruby stacks and machine stacks) are reachable from
Self::collect_object_roots_in("scan_thread_root", gc_tls, &mut factory, || { // `rb_vm_t` -> ractor -> thread -> fiber -> stacks. It is part of `ScanGCRoots` which
(upcalls().scan_roots_in_mutator_thread)(mutator.get_tls(), tls); // calls `rb_gc_mark_roots` -> `rb_vm_mark`.
});
} }
fn scan_vm_specific_roots(tls: VMWorkerThread, factory: impl RootsWorkFactory<RubySlot>) { fn scan_vm_specific_roots(tls: VMWorkerThread, factory: impl RootsWorkFactory<RubySlot>) {