Skip to content

[release/7.0] [Mono] Race in init_method when using LLVM AOT. #93006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: [manual] Merge release/7.0-staging into release/7.0
merged 4 commits into from
Oct 6, 2023
Merged

[release/7.0] [Mono] Race in init_method when using LLVM AOT. #93006

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8891c3
Update branding to 7.0.13 (#92970)
vseanreesermsft Oct 4, 2023
d20353e
[Mono] Race in init_method when using LLVM AOT.
lateralusX Sep 5, 2022
92c6521
Move register_jump_target_got_slot above mono_memory_barrier.
lateralusX Sep 7, 2022
e019f9d
revert unintentional branding change
lambdageek Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/mono/mono/mini/aot-runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4633,10 +4633,13 @@ init_method (MonoAotModule *amodule, gpointer info, guint32 method_index, MonoMe
* been initialized by load_method () for a static cctor before the cctor has
* finished executing (#23242).
*/
if (ji->type == MONO_PATCH_INFO_NONE) {
} else if (!got [got_slots [pindex]] || ji->type == MONO_PATCH_INFO_SFLDA) {
MonoJumpInfoType ji_type = ji->type;
LOAD_ACQUIRE_FENCE;

if (ji_type == MONO_PATCH_INFO_NONE) {
} else if (!got [got_slots [pindex]] || ji_type == MONO_PATCH_INFO_SFLDA) {
/* In llvm-only made, we might encounter shared methods */
if (mono_llvm_only && ji->type == MONO_PATCH_INFO_METHOD && mono_method_check_context_used (ji->data.method)) {
if (mono_llvm_only && ji_type == MONO_PATCH_INFO_METHOD && mono_method_check_context_used (ji->data.method)) {
g_assert (context);
ji->data.method = mono_class_inflate_generic_method_checked (ji->data.method, context, error);
if (!is_ok (error)) {
Expand All @@ -4646,10 +4649,10 @@ init_method (MonoAotModule *amodule, gpointer info, guint32 method_index, MonoMe
}
}
/* This cannot be resolved in mono_resolve_patch_target () */
if (ji->type == MONO_PATCH_INFO_AOT_JIT_INFO) {
if (ji_type == MONO_PATCH_INFO_AOT_JIT_INFO) {
// FIXME: Lookup using the index
jinfo = mono_aot_find_jit_info (amodule->assembly->image, code);
ji->type = MONO_PATCH_INFO_ABS;
ji->type = ji_type = MONO_PATCH_INFO_ABS;
ji->data.target = jinfo;
}
addr = mono_resolve_patch_target (method, code, ji, TRUE, error);
Expand All @@ -4658,18 +4661,19 @@ init_method (MonoAotModule *amodule, gpointer info, guint32 method_index, MonoMe
mono_mempool_destroy (mp);
return FALSE;
}
if (ji->type == MONO_PATCH_INFO_METHOD_JUMP)
if (ji_type == MONO_PATCH_INFO_METHOD_JUMP) {
addr = mono_create_ftnptr (addr);
mono_memory_barrier ();
got [got_slots [pindex]] = addr;
if (ji->type == MONO_PATCH_INFO_METHOD_JUMP)
register_jump_target_got_slot (ji->data.method, &(got [got_slots [pindex]]));

}
if (llvm) {
void (*init_aotconst) (int, gpointer) = (void (*)(int, gpointer))amodule->info.llvm_init_aotconst;
init_aotconst (got_slots [pindex], addr);
}
mono_memory_barrier ();
got [got_slots [pindex]] = addr;
}

STORE_RELEASE_FENCE;
ji->type = MONO_PATCH_INFO_NONE;
}

Expand Down