Skip to content

[mono][interp] Add lock when allocating from method mempool #89231

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
lewing merged 1 commit into from
Jul 20, 2023
+16 −6
Merged

[mono][interp] Add lock when allocating from method mempool #89231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions src/mono/mono/mini/interp/interp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1286,10 +1286,15 @@ compute_arg_offset (MonoMethodSignature *sig, int index)
static gpointer
imethod_alloc0 (InterpMethod *imethod, size_t size)
{
if (imethod->method->dynamic)
return mono_mempool_alloc0 (((MonoDynamicMethod*)imethod->method)->mp, (guint)size);
else
if (imethod->method->dynamic) {
MonoJitMemoryManager *jit_mm = get_default_jit_mm ();
jit_mm_lock (jit_mm);
gpointer ret = mono_mempool_alloc0 (((MonoDynamicMethod*)imethod->method)->mp, (guint)size);
jit_mm_unlock (jit_mm);
return ret;
} else {
return m_method_alloc0 (imethod->method, (guint)size);
}
}

static guint32*
Expand Down
11 changes: 8 additions & 3 deletions src/mono/mono/mini/interp/transform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,10 +1290,15 @@ interp_get_icall_sig (MonoMethodSignature *sig);
static gpointer
imethod_alloc0 (TransformData *td, size_t size)
{
if (td->rtm->method->dynamic)
return mono_mempool_alloc0 (((MonoDynamicMethod*)td->rtm->method)->mp, (guint)size);
else
if (td->rtm->method->dynamic) {
MonoJitMemoryManager *jit_mm = get_default_jit_mm ();
jit_mm_lock (jit_mm);
gpointer ret = mono_mempool_alloc0 (((MonoDynamicMethod*)td->rtm->method)->mp, (guint)size);
jit_mm_unlock (jit_mm);
return ret;
} else {
return mono_mem_manager_alloc0 (td->mem_manager, (guint)size);
}
}

static void
Expand Down