Skip to content
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

[mono][aot] Load AOT module of a container assembly using assembly name #83711

Merged
merged 8 commits into from
Mar 21, 2023
Merged

[mono][aot] Load AOT module of a container assembly using assembly name #83711

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c7d7401
Load AOT module of a container assembly using assembly name
kotlarmilos Mar 16, 2023
6fc980f
Use mono_image_init to init the image
kotlarmilos Mar 16, 2023
8d9a0ad
Set container_assm_name to NULL to avoid race conditioning
kotlarmilos Mar 17, 2023
b9531f5
Implement mono_loader_lock on load_container_amodule
kotlarmilos Mar 17, 2023
faa9f72
Update the condition to include container_assm_name
kotlarmilos Mar 17, 2023
d233bfb
Remove redundant local_ref var
kotlarmilos Mar 17, 2023
8dc8fef
Avoid recursive invocation by setting container_assm_name to NULL
kotlarmilos Mar 20, 2023
d0f66a3
Fix ident
kotlarmilos Mar 20, 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
55 changes: 33 additions & 22 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 @@ -2433,35 +2433,46 @@ mono_aot_init (void)
/*
* load_container_amodule:
*
* Load the container assembly and its AOT image.
* Load AOT module of a container assembly
*/
static void
load_container_amodule (MonoAssemblyLoadContext *alc)
{
ERROR_DECL (error);

// If container_amodule loaded, don't lock the runtime
if (!container_assm_name || container_amodule)
return;

char *local_ref = container_assm_name;
container_assm_name = NULL;
MonoImageOpenStatus status = MONO_IMAGE_OK;
MonoAssemblyOpenRequest req;
gchar *dll = g_strdup_printf ( "%s.dll", local_ref);
/*
* Don't fire managed assembly load events whose execution
* might require this module to be already loaded.
*/
mono_assembly_request_prepare_open (&req, alc);
req.request.no_managed_load_event = TRUE;
MonoAssembly *assm = mono_assembly_request_open (dll, &req, &status);
if (!assm) {
gchar *exe = g_strdup_printf ("%s.exe", local_ref);
assm = mono_assembly_request_open (exe, &req, &status);
}
g_assert (assm);
load_aot_module (alc, assm, NULL, error);
container_amodule = assm->image->aot_module;
mono_loader_lock ();
// There might be several threads that passed the first check
// Adding another check to ensure single load of a container assembly due to race condition
if (!container_amodule) {
ERROR_DECL (error);

// This method is recursively invoked within the same thread during AOT module loads
// It avoids recursive invocation by setting container_assm_name to NULL
char *local_ref = container_assm_name;
container_assm_name = NULL;

// Create a fake MonoAssembly/MonoImage to retrieve its AOT module.
// Container MonoAssembly/MonoImage shouldn't be used during the runtime.
MonoAssembly *assm = g_new0 (MonoAssembly, 1);
assm->image = g_new0 (MonoImage, 1);
assm->image->dynamic = 0;
assm->image->alc = alc;
assm->aname.name = local_ref;

mono_image_init (assm->image);
MonoAotFileInfo* info = (MonoAotFileInfo *)g_hash_table_lookup (static_aot_modules, assm->aname.name);
assm->image->guid = (char*)info->assembly_guid;
mono_assembly_addref (assm);

load_aot_module(alc, assm, NULL, error);
mono_memory_barrier ();
g_assert (assm->image->aot_module);
container_amodule = assm->image->aot_module;
}

mono_loader_unlock ();
}

static gboolean
Expand Down