Author: zoltan
Date: 2005-09-27 14:40:17 -0400 (Tue, 27 Sep 2005)
New Revision: 50882

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/aot.c
   trunk/mono/mono/mini/mini.c
   trunk/mono/mono/mini/mini.h
Log:
2005-09-27  Zoltan Varga  <[EMAIL PROTECTED]>

        * mini.h mini.c aot.c: Add infrastructure to collect pagefault 
        information about aot.


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2005-09-27 17:47:55 UTC (rev 50881)
+++ trunk/mono/mono/mini/ChangeLog      2005-09-27 18:40:17 UTC (rev 50882)
@@ -1,3 +1,8 @@
+2005-09-27  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * mini.h mini.c aot.c: Add infrastructure to collect pagefault 
+       information about aot.
+
 2005-09-27  Ben Maurer  <[EMAIL PROTECTED]>
 
        * *.c: Replace the use of {Enter,Leave}CriticalSection with

Modified: trunk/mono/mono/mini/aot.c
===================================================================
--- trunk/mono/mono/mini/aot.c  2005-09-27 17:47:55 UTC (rev 50881)
+++ trunk/mono/mono/mini/aot.c  2005-09-27 18:40:17 UTC (rev 50882)
@@ -62,6 +62,7 @@
 #define ICALL_GOT_SLOTS_START_INDEX N_RESERVED_GOT_SLOTS
 
 #define ALIGN_PTR_TO(ptr,align) (gpointer)((((gssize)(ptr)) + (align - 1)) & 
(~(align - 1)))
+#define ROUND_DOWN(VALUE,SIZE) ((VALUE) & ~((SIZE) - 1))
 
 typedef struct MonoAotModule {
        char *aot_name;
@@ -75,6 +76,8 @@
        char **image_guids;
        MonoImage **image_table;
        gboolean out_of_date;
+       guint8 *mem_begin;
+       guint8 *mem_end;
        guint8 *code;
        guint8 *code_end;
        guint32 *code_offsets;
@@ -138,6 +141,9 @@
 /* For debugging */
 static gint32 mono_last_aot_method = -1;
 
+static gboolean make_unreadable = FALSE;
+static guint32 n_pagefaults = 0;
+
 static MonoJitInfo*
 mono_aot_load_method (MonoDomain *domain, MonoAotModule *aot_module, 
MonoMethod *method, guint8 *code, guint8 *info, guint8 *ex_info);
 
@@ -549,7 +555,27 @@
        g_module_symbol (assembly->aot_module, "ex_infos", 
(gpointer*)&info->ex_infos);
        g_module_symbol (assembly->aot_module, "class_infos", 
(gpointer*)&info->class_infos);
        g_module_symbol (assembly->aot_module, "class_info_offsets", 
(gpointer*)&info->class_info_offsets);
+       g_module_symbol (assembly->aot_module, "mem_end", 
(gpointer*)&info->mem_end);
 
+       info->mem_begin = info->code;
+
+       if (make_unreadable) {
+#ifndef PLATFORM_WIN32
+               guint8 *addr;
+               guint8 *page_start;
+               int pages, err, len;
+
+               addr = info->mem_begin;
+               len = info->mem_end - info->mem_begin;
+
+               /* Round down in both directions to avoid modifying data which 
is not ours */
+               page_start = (guint8 *) (((gssize) (addr)) & ~ (PAGESIZE - 1)) 
+ PAGESIZE;
+               pages = ((addr + len - page_start + PAGESIZE - 1) / PAGESIZE) - 
1;
+               err = mprotect (page_start, pages * PAGESIZE, 0);
+               g_assert (err == 0);
+#endif
+       }
+
        mono_aot_lock ();
        g_hash_table_insert (aot_modules, assembly, info);
        mono_aot_unlock ();
@@ -1479,6 +1505,99 @@
        return user_data.res;
 }
 
+/*
+ * mono_aot_set_make_unreadable:
+ *
+ *   Set whenever to make all mmaped memory unreadable. In conjuction with a
+ * SIGSEGV handler, this is useful to find out which pages the runtime tries 
to read.
+ */
+void
+mono_aot_set_make_unreadable (gboolean unreadable)
+{
+       make_unreadable = unreadable;
+}
+
+typedef struct {
+       MonoAotModule *module;
+       guint8 *ptr;
+} FindMapUserData;
+
+static void
+find_map (gpointer key, gpointer value, gpointer user_data)
+{
+       MonoAotModule *module = (MonoAotModule*)value;
+       FindMapUserData *data = (FindMapUserData*)user_data;
+
+       if (!data->module)
+               if ((data->ptr >= module->mem_begin) && (data->ptr < 
module->mem_end))
+                       data->module = module;
+}
+
+static MonoAotModule*
+find_module_for_addr (void *ptr)
+{
+       FindMapUserData data;
+
+       if (!make_unreadable)
+               return NULL;
+
+       data.module = NULL;
+       data.ptr = (guint8*)ptr;
+
+       mono_aot_lock ();
+       g_hash_table_foreach (aot_modules, (GHFunc)find_map, &data);
+       mono_aot_unlock ();
+
+       return data.module;
+}
+
+/*
+ * mono_aot_is_pagefault:
+ *
+ *   Should be called from a SIGSEGV signal handler to find out whenever @ptr 
is
+ * within memory allocated by this module.
+ */
+gboolean
+mono_aot_is_pagefault (void *ptr)
+{
+       if (!make_unreadable)
+               return FALSE;
+
+       return find_module_for_addr (ptr) != NULL;
+}
+
+/*
+ * mono_aot_handle_pagefault:
+ *
+ *   Handle a pagefault caused by an unreadable page by making it readable 
again.
+ */
+void
+mono_aot_handle_pagefault (void *ptr)
+{
+#ifndef PLATFORM_WIN32
+       guint8* start = (guint8*)ROUND_DOWN (((gssize)ptr), PAGESIZE);
+       int res;
+
+       mono_aot_lock ();
+       res = mprotect (start, PAGESIZE, PROT_READ|PROT_WRITE|PROT_EXEC);
+       g_assert (res == 0);
+
+       n_pagefaults ++;
+       mono_aot_unlock ();
+#endif
+}
+
+/*
+ * mono_aot_get_n_pagefaults:
+ *
+ *   Return the number of times handle_pagefault is called.
+ */
+guint32
+mono_aot_get_n_pagefaults (void)
+{
+       return n_pagefaults;
+}
+
 /*****************************************************/
 /*                 AOT COMPILER                      */
 /*****************************************************/
@@ -2724,6 +2843,12 @@
        }
        fprintf (tmpfp, "\n");
 
+       symbol = g_strdup_printf ("mem_end");
+       emit_section_change (tmpfp, ".text", 1);
+       emit_global (tmpfp, symbol, FALSE);
+       emit_alignment (tmpfp, 8);
+       emit_label(tmpfp, symbol);
+
        fclose (tmpfp);
 
 #if defined(__x86_64__)

Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c 2005-09-27 17:47:55 UTC (rev 50881)
+++ trunk/mono/mono/mini/mini.c 2005-09-27 18:40:17 UTC (rev 50882)
@@ -9829,6 +9829,10 @@
                        mono_raw_buffer_handle_pagefault (info->si_addr);
                        return;
                }
+               if (mono_aot_is_pagefault (info->si_addr)) {
+                       mono_aot_handle_pagefault (info->si_addr);
+                       return;
+               }
        }
 #endif
 
@@ -10183,8 +10187,10 @@
        mono_install_get_cached_class_info (mono_aot_get_cached_class_info);
        mono_install_jit_info_find_in_aot (mono_aot_find_jit_info);
 
-       if (debug_options.collect_pagefault_stats)
+       if (debug_options.collect_pagefault_stats) {
                mono_raw_buffer_set_make_unreadable (TRUE);
+               mono_aot_set_make_unreadable (TRUE);
+       }
 
        domain = mono_init_from_assembly (filename, filename);
        mono_icall_init ();
@@ -10373,8 +10379,10 @@
                        g_print ("LinkDemand (aptc)     : %ld\n", 
mono_jit_stats.cas_linkdemand_aptc);
                        g_print ("Demand (code gen)     : %ld\n", 
mono_jit_stats.cas_demand_generation);
                }
-               if (debug_options.collect_pagefault_stats)
+               if (debug_options.collect_pagefault_stats) {
                        g_print ("Metadata pagefaults   : %d\n", 
mono_raw_buffer_get_n_pagefaults ());
+                       g_print ("AOT pagefaults        : %d\n", 
mono_aot_get_n_pagefaults ());
+               }
        }
 }
 

Modified: trunk/mono/mono/mini/mini.h
===================================================================
--- trunk/mono/mono/mini/mini.h 2005-09-27 17:47:55 UTC (rev 50881)
+++ trunk/mono/mono/mini/mini.h 2005-09-27 18:40:17 UTC (rev 50882)
@@ -804,6 +804,7 @@
 int       mono_compile_assembly             (MonoAssembly *ass, guint32 opts, 
const char *aot_options);
 MonoCompile *mini_method_compile            (MonoMethod *method, guint32 opts, 
MonoDomain *domain, gboolean run_cctors, gboolean compile_aot, int parts);
 void      mono_destroy_compile              (MonoCompile *cfg);
+
 void      mono_aot_init                     (void);
 MonoJitInfo*  mono_aot_get_method           (MonoDomain *domain,
                                                                                
         MonoMethod *method);
@@ -812,6 +813,10 @@
 gboolean  mono_aot_init_vtable              (MonoVTable *vtable);
 gboolean  mono_aot_get_cached_class_info    (MonoClass *klass, 
MonoCachedClassInfo *res);
 MonoJitInfo* mono_aot_find_jit_info         (MonoDomain *domain, MonoImage 
*image, gpointer addr);
+void mono_aot_set_make_unreadable           (gboolean unreadable);
+gboolean mono_aot_is_pagefault              (void *ptr);
+void mono_aot_handle_pagefault              (void *ptr);
+guint32 mono_aot_get_n_pagefaults           (void);
 
 gboolean  mono_method_blittable             (MonoMethod *method);
 gboolean  mono_method_same_domain           (MonoJitInfo *caller, MonoJitInfo 
*callee);

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to