vm: change strategy for marking executable pages on macos aarch64

mrjbq7 · Nov 15, 2023 · 6235c8c · 6235c8c
1 parent cb51398
commit 6235c8c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/vm/main-unix.cpp b/vm/main-unix.cpp
@@ -1,6 +1,9 @@
 #include "master.hpp"
 
 int main(int argc, char** argv) {
+#if defined(__APPLE__) && defined(FACTOR_ARM64)
+  pthread_jit_write_protect_np(0);
+#endif
   factor::init_mvm();
   factor::start_standalone_factor(argc, argv);
   return 0;

diff --git a/vm/os-unix.cpp b/vm/os-unix.cpp
@@ -79,27 +79,34 @@ segment::segment(cell size_, bool executable_p) {
 
   int pagesize = getpagesize();
 
+#if defined(__APPLE__) && defined(FACTOR_ARM64)
+  int prot = PROT_READ | PROT_WRITE;
+  int flags = MAP_ANON | MAP_PRIVATE | MAP_JIT;
+#else
   int prot;
   if (executable_p)
     prot = PROT_READ | PROT_WRITE | PROT_EXEC;
   else
     prot = PROT_READ | PROT_WRITE;
+  int flags = MAP_ANON | MAP_PRIVATE;
+#endif
 
   cell alloc_size = 2 * pagesize + size;
-#if defined(__APPLE__) && defined(FACTOR_ARM64)  // FIXME: could be in header file
-  char* array = (char*)mmap(NULL, alloc_size, prot,
-                            MAP_ANON | MAP_PRIVATE | MAP_JIT, -1, 0);
-#else
-  char* array = (char*)mmap(NULL, alloc_size, prot,
-                            MAP_ANON | MAP_PRIVATE, -1, 0);
-#endif
+  char* array = (char*)mmap(NULL, alloc_size, prot, flags, -1, 0);
 
   if (array == (char*)-1)
     fatal_error("Out of memory in mmap", alloc_size);
 
   start = (cell)(array + pagesize);
   end = start + size;
 
+#if defined(__APPLE__) && defined(FACTOR_ARM64)
+  if (executable_p) {
+    if (mprotect((char*)start, size, prot | PROT_EXEC) == -1)
+      fatal_error("mprotect executable page failed", 0);
+  }
+#endif
+
   set_border_locked(true);
 }