module: Speed up NativeModule lifecycle

By using a single lock for all Module objects. We should be able to revert this once we've improved our GLib static allocation cleanup patch to use a more suitable data structure for keeping track of mutexes. Kudos to @mrmacete for profiling.
frida · Jan 13, 2025 · 1267288 · 1267288
1 parent dee4095
commit 1267288
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 28 deletions.
diff --git a/gum/backend-darwin/gummodule-darwin.c b/gum/backend-darwin/gummodule-darwin.c
@@ -15,9 +15,6 @@
 #include <mach-o/dyld.h>
 #include <mach-o/nlist.h>
 
-#define GUM_NATIVE_MODULE_LOCK(o) g_mutex_lock (&(o)->mutex)
-#define GUM_NATIVE_MODULE_UNLOCK(o) g_mutex_unlock (&(o)->mutex)
-
 typedef struct _GumEnumerateImportsContext GumEnumerateImportsContext;
 typedef struct _GumEnumerateExportsContext GumEnumerateExportsContext;
 typedef struct _GumEnumerateSymbolsContext GumEnumerateSymbolsContext;
@@ -32,8 +29,6 @@ struct _GumNativeModule
   GumMemoryRange range;
   GumDarwinModuleResolver * resolver;
 
-  GMutex mutex;
-
   gpointer cached_handle;
   gboolean attempted_handle_creation;
 
@@ -118,6 +113,8 @@ G_DEFINE_TYPE_EXTENDED (GumNativeModule,
                         G_IMPLEMENT_INTERFACE (GUM_TYPE_MODULE,
                             gum_native_module_iface_init))
 
+G_LOCK_DEFINE_STATIC (gum_native_module);
+
 static void
 gum_native_module_class_init (GumNativeModuleClass * klass)
 {
@@ -149,20 +146,19 @@ gum_native_module_iface_init (gpointer g_iface,
 static void
 gum_native_module_init (GumNativeModule * self)
 {
-  g_mutex_init (&self->mutex);
 }
 
 static void
 gum_native_module_dispose (GObject * object)
 {
   GumNativeModule * self = GUM_NATIVE_MODULE (object);
 
-  GUM_NATIVE_MODULE_LOCK (self);
+  G_LOCK (gum_native_module);
 
   g_clear_object (&self->cached_darwin_module);
   g_clear_pointer (&self->cached_handle, dlclose);
 
-  GUM_NATIVE_MODULE_UNLOCK (self);
+  G_UNLOCK (gum_native_module);
 
   G_OBJECT_CLASS (gum_native_module_parent_class)->dispose (object);
 }
@@ -172,8 +168,6 @@ gum_native_module_finalize (GObject * object)
 {
   GumNativeModule * self = GUM_NATIVE_MODULE (object);
 
-  g_mutex_clear (&self->mutex);
-
   g_free (self->path);
 
   G_OBJECT_CLASS (gum_native_module_parent_class)->finalize (object);
@@ -237,7 +231,7 @@ _gum_native_module_detach_resolver (GumNativeModule * self)
 gpointer
 _gum_native_module_get_handle (GumNativeModule * self)
 {
-  GUM_NATIVE_MODULE_LOCK (self);
+  G_LOCK (gum_native_module);
 
   if (!self->attempted_handle_creation)
   {
@@ -247,15 +241,15 @@ _gum_native_module_get_handle (GumNativeModule * self)
       self->cached_handle = dlopen (self->path, RTLD_LAZY);
   }
 
-  GUM_NATIVE_MODULE_UNLOCK (self);
+  G_UNLOCK (gum_native_module);
 
   return self->cached_handle;
 }
 
 GumDarwinModule *
 _gum_native_module_get_darwin_module (GumNativeModule * self)
 {
-  GUM_NATIVE_MODULE_LOCK (self);
+  G_LOCK (gum_native_module);
 
   if (!self->attempted_darwin_module_creation)
   {
@@ -267,7 +261,7 @@ _gum_native_module_get_darwin_module (GumNativeModule * self)
     gum_darwin_module_ensure_image_loaded (self->cached_darwin_module, NULL);
   }
 
-  GUM_NATIVE_MODULE_UNLOCK (self);
+  G_UNLOCK (gum_native_module);
 
   return self->cached_darwin_module;
 }

diff --git a/gum/backend-elf/gummodule-elf.c b/gum/backend-elf/gummodule-elf.c
@@ -12,9 +12,6 @@
 
 #include <dlfcn.h>
 
-#define GUM_NATIVE_MODULE_LOCK(o) g_mutex_lock (&(o)->mutex)
-#define GUM_NATIVE_MODULE_UNLOCK(o) g_mutex_unlock (&(o)->mutex)
-
 typedef struct _GumEnumerateImportsContext GumEnumerateImportsContext;
 typedef struct _GumEnumerateSymbolsContext GumEnumerateSymbolsContext;
 typedef struct _GumEnumerateRangesContext GumEnumerateRangesContext;
@@ -85,6 +82,8 @@ G_DEFINE_TYPE_EXTENDED (GumNativeModule,
                         G_IMPLEMENT_INTERFACE (GUM_TYPE_MODULE,
                             gum_native_module_iface_init))
 
+G_LOCK_DEFINE_STATIC (gum_native_module);
+
 static void
 gum_native_module_class_init (GumNativeModuleClass * klass)
 {
@@ -116,15 +115,14 @@ gum_native_module_iface_init (gpointer g_iface,
 static void
 gum_native_module_init (GumNativeModule * self)
 {
-  g_mutex_init (&self->mutex);
 }
 
 static void
 gum_native_module_dispose (GObject * object)
 {
   GumNativeModule * self = GUM_NATIVE_MODULE (object);
 
-  GUM_NATIVE_MODULE_LOCK (self);
+  G_LOCK (gum_native_module);
 
   g_clear_object (&self->cached_elf_module);
 
@@ -133,7 +131,7 @@ gum_native_module_dispose (GObject * object)
   else
     self->cached_handle = NULL;
 
-  GUM_NATIVE_MODULE_UNLOCK (self);
+  G_UNLOCK (gum_native_module);
 
   G_OBJECT_CLASS (gum_native_module_parent_class)->dispose (object);
 }
@@ -143,8 +141,6 @@ gum_native_module_finalize (GObject * object)
 {
   GumNativeModule * self = GUM_NATIVE_MODULE (object);
 
-  g_mutex_clear (&self->mutex);
-
   g_free (self->path);
 
   G_OBJECT_CLASS (gum_native_module_parent_class)->finalize (object);
@@ -190,7 +186,7 @@ _gum_native_module_make_handleless (const gchar * path,
 gpointer
 _gum_native_module_get_handle (GumNativeModule * self)
 {
-  GUM_NATIVE_MODULE_LOCK (self);
+  G_LOCK (gum_native_module);
 
   if (!self->attempted_handle_creation)
   {
@@ -203,15 +199,15 @@ _gum_native_module_get_handle (GumNativeModule * self)
     }
   }
 
-  GUM_NATIVE_MODULE_UNLOCK (self);
+  G_UNLOCK (gum_native_module);
 
   return self->cached_handle;
 }
 
 GumElfModule *
 _gum_native_module_get_elf_module (GumNativeModule * self)
 {
-  GUM_NATIVE_MODULE_LOCK (self);
+  G_LOCK (gum_native_module);
 
   if (!self->attempted_elf_module_creation)
   {
@@ -221,7 +217,7 @@ _gum_native_module_get_elf_module (GumNativeModule * self)
         self->range.base_address, NULL);
   }
 
-  GUM_NATIVE_MODULE_UNLOCK (self);
+  G_UNLOCK (gum_native_module);
 
   return self->cached_elf_module;
 }

diff --git a/gum/backend-elf/gummodule-elf.h b/gum/backend-elf/gummodule-elf.h
@@ -31,8 +31,6 @@ struct _GumNativeModule
   GDestroyNotify create_handle_data_destroy;
   GDestroyNotify destroy_handle;
 
-  GMutex mutex;
-
   gpointer cached_handle;
   gboolean attempted_handle_creation;