Skip to content

Commit f591e98

Browse files
authored
[Mono] Race in init_method when using LLVM AOT. (#75088)
[Mono] Race in init_method when using LLVM AOT. When using LLVM AOT codegen, init_method updates two GOT slots. These slots are initialized as part of init_method, but there is a race between initialization of the two slots. Current implementation can have two threads running init_method for the same method, but as soon as: [got_slots [pindex]] = addr store is visible, it will trigger other threads to return back from init_method, but since that could happen before the corresponding LLVM AOT const slot is set, second thread will return to method calling init_method, load the LLVM aot const, and crash when trying to use it (since its still NULL). This crash is very rare but have been identified on x86/x64 CPU's, when one thread is either preempted between updating regular GOT slot and LLVM GOT slot or store into LLVM GOT slot gets delayed in store buffer. I have also been able to emulate the scenario in debugger, triggering the issue and crashing in the method loading from LLVM aot const slot. Fix change order of updates and make sure the update of LLVM aot const slot happens before memory_barrier, since: got [got_slots [pindex]] = addr; have release semantics in relation to addr and update of LLVM aot const slot. Fix also add acquire/release semantics for ji->type in init_method since it is used to guard if a thread ignores a patch or not and it should not be re-ordered with previous stores, since it can cause similar race conditions with updated slots.
1 parent 11c8988 commit f591e98

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

src/mono/mono/mini/aot-runtime.c

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4628,10 +4628,13 @@ init_method (MonoAotModule *amodule, gpointer info, guint32 method_index, MonoMe
46284628
* been initialized by load_method () for a static cctor before the cctor has
46294629
* finished executing (#23242).
46304630
*/
4631-
if (ji->type == MONO_PATCH_INFO_NONE) {
4632-
} else if (!got [got_slots [pindex]] || ji->type == MONO_PATCH_INFO_SFLDA) {
4631+
MonoJumpInfoType ji_type = ji->type;
4632+
LOAD_ACQUIRE_FENCE;
4633+
4634+
if (ji_type == MONO_PATCH_INFO_NONE) {
4635+
} else if (!got [got_slots [pindex]] || ji_type == MONO_PATCH_INFO_SFLDA) {
46334636
/* In llvm-only made, we might encounter shared methods */
4634-
if (mono_llvm_only && ji->type == MONO_PATCH_INFO_METHOD && mono_method_check_context_used (ji->data.method)) {
4637+
if (mono_llvm_only && ji_type == MONO_PATCH_INFO_METHOD && mono_method_check_context_used (ji->data.method)) {
46354638
g_assert (context);
46364639
ji->data.method = mono_class_inflate_generic_method_checked (ji->data.method, context, error);
46374640
if (!is_ok (error)) {
@@ -4641,10 +4644,10 @@ init_method (MonoAotModule *amodule, gpointer info, guint32 method_index, MonoMe
46414644
}
46424645
}
46434646
/* This cannot be resolved in mono_resolve_patch_target () */
4644-
if (ji->type == MONO_PATCH_INFO_AOT_JIT_INFO) {
4647+
if (ji_type == MONO_PATCH_INFO_AOT_JIT_INFO) {
46454648
// FIXME: Lookup using the index
46464649
jinfo = mono_aot_find_jit_info (amodule->assembly->image, code);
4647-
ji->type = MONO_PATCH_INFO_ABS;
4650+
ji->type = ji_type = MONO_PATCH_INFO_ABS;
46484651
ji->data.target = jinfo;
46494652
}
46504653
addr = mono_resolve_patch_target (method, code, ji, TRUE, error);
@@ -4653,18 +4656,19 @@ init_method (MonoAotModule *amodule, gpointer info, guint32 method_index, MonoMe
46534656
mono_mempool_destroy (mp);
46544657
return FALSE;
46554658
}
4656-
if (ji->type == MONO_PATCH_INFO_METHOD_JUMP)
4659+
if (ji_type == MONO_PATCH_INFO_METHOD_JUMP) {
46574660
addr = mono_create_ftnptr (addr);
4658-
mono_memory_barrier ();
4659-
got [got_slots [pindex]] = addr;
4660-
if (ji->type == MONO_PATCH_INFO_METHOD_JUMP)
46614661
register_jump_target_got_slot (ji->data.method, &(got [got_slots [pindex]]));
4662-
4662+
}
46634663
if (llvm) {
46644664
void (*init_aotconst) (int, gpointer) = (void (*)(int, gpointer))amodule->info.llvm_init_aotconst;
46654665
init_aotconst (got_slots [pindex], addr);
46664666
}
4667+
mono_memory_barrier ();
4668+
got [got_slots [pindex]] = addr;
46674669
}
4670+
4671+
STORE_RELEASE_FENCE;
46684672
ji->type = MONO_PATCH_INFO_NONE;
46694673
}
46704674

0 commit comments

Comments
 (0)