Handle P/Invoke with MAP_JIT on osx-arm64

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/InternalCalls.cs

@@ -321,10 +321,6 @@ internal static extern unsafe bool RhpCallFilterFunclet(
         [UnmanagedCallConv(CallConvs = new Type[] { typeof(CallConvCdecl) })]
         internal static extern IntPtr RhAllocateThunksMapping();
 
-        [DllImport(Redhawk.BaseName)]
-        [UnmanagedCallConv(CallConvs = new Type[] { typeof(CallConvCdecl) })]
-        internal static extern void RhJitWriteProtect(int writeEnable);
-
         // Enters a no GC region, possibly doing a blocking GC if there is not enough
         // memory available to satisfy the caller's request.
         [DllImport(Redhawk.BaseName)]

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/ThunkPool.cs

@@ -107,14 +107,10 @@ private unsafe ThunksHeap(IntPtr commonStubAddress)
                 // Address of the first thunk data cell should be at the beginning of the thunks data block (page-aligned)
                 Debug.Assert(((nuint)(nint)thunkDataBlock % Constants.PageSize) == 0);
 
-                InternalCalls.RhJitWriteProtect(0);
-
                 // Update the last pointer value in the thunks data section with the value of the common stub address
                 *(IntPtr*)(thunkDataBlock + (int)(Constants.PageSize - IntPtr.Size)) = commonStubAddress;
                 Debug.Assert(*(IntPtr*)(thunkDataBlock + (int)(Constants.PageSize - IntPtr.Size)) == commonStubAddress);
 
-                InternalCalls.RhJitWriteProtect(1);
-
                 // Set the head and end of the linked list
                 _nextAvailableThunkPtr = thunkDataBlock;
                 _lastThunkPtr = _nextAvailableThunkPtr + Constants.ThunkDataSize * (Constants.NumThunksPerBlock - 1);
@@ -167,8 +163,6 @@ private unsafe bool ExpandHeap()
                 // Address of the first thunk data cell should be at the beginning of the thunks data block (page-aligned)
                 Debug.Assert(((nuint)(nint)thunkDataBlock % Constants.PageSize) == 0);
 
-                InternalCalls.RhJitWriteProtect(0);
-
                 // Update the last pointer value in the thunks data section with the value of the common stub address
                 *(IntPtr*)(thunkDataBlock + (int)(Constants.PageSize - IntPtr.Size)) = _commonStubAddress;
                 Debug.Assert(*(IntPtr*)(thunkDataBlock + (int)(Constants.PageSize - IntPtr.Size)) == _commonStubAddress);
@@ -179,8 +173,6 @@ private unsafe bool ExpandHeap()
                 // Update the pointer to the last entry in the list
                 _lastThunkPtr = *((IntPtr*)_lastThunkPtr) + Constants.ThunkDataSize * (Constants.NumThunksPerBlock - 1);
 
-                InternalCalls.RhJitWriteProtect(1);
-
                 newBlockInfo._blockBaseAddress = thunkStubsBlock;
                 newBlockInfo._nextBlock = _allocatedBlocks;
 
@@ -224,10 +216,8 @@ public unsafe IntPtr AllocateThunk()
             Debug.Assert(nextAvailableThunkPtr != IntPtr.Zero);
 
 #if DEBUG
-            InternalCalls.RhJitWriteProtect(0);
             // Reset debug flag indicating the thunk is now in use
             *((IntPtr*)(nextAvailableThunkPtr + IntPtr.Size)) = IntPtr.Zero;
-            InternalCalls.RhJitWriteProtect(1);
 #endif
 
             int thunkIndex = (int)(((nuint)(nint)nextAvailableThunkPtr) - ((nuint)(nint)nextAvailableThunkPtr & ~Constants.PageSizeMask));
@@ -252,12 +242,8 @@ public unsafe void FreeThunk(IntPtr thunkAddress)
             if (!IsThunkInHeap(thunkAddress))
                 EH.FallbackFailFast(RhFailFastReason.InternalError, null);
 
-            InternalCalls.RhJitWriteProtect(0);
-
             // Debug flag indicating the thunk is no longer used
             *((IntPtr*)(dataAddress + IntPtr.Size)) = new IntPtr(-1);
-#else
-            InternalCalls.RhJitWriteProtect(0);
 #endif
 
             InternalCalls.RhpAcquireThunkPoolLock();
@@ -266,8 +252,6 @@ public unsafe void FreeThunk(IntPtr thunkAddress)
             _nextAvailableThunkPtr = dataAddress;
 
             InternalCalls.RhpReleaseThunkPoolLock();
-
-            InternalCalls.RhJitWriteProtect(1);
         }
 
         private bool IsThunkInHeap(IntPtr thunkAddress)
@@ -329,14 +313,10 @@ public unsafe bool TryGetThunkData(IntPtr thunkAddress, out IntPtr context, out
             if (!IsThunkInHeap(thunkAddress))
                 return false;
 
-            InternalCalls.RhJitWriteProtect(0);
-
             // Update the data that will be used by the thunk that was allocated
             context = *((IntPtr*)(dataAddress));
             target = *((IntPtr*)(dataAddress + IntPtr.Size));
 
-            InternalCalls.RhJitWriteProtect(1);
-
             return true;
         }
 
@@ -357,13 +337,9 @@ public unsafe void SetThunkData(IntPtr thunkAddress, IntPtr context, IntPtr targ
                 EH.FallbackFailFast(RhFailFastReason.InternalError, null);
 #endif
 
-            InternalCalls.RhJitWriteProtect(0);
-
             // Update the data that will be used by the thunk that was allocated
             *((IntPtr*)(dataAddress)) = context;
             *((IntPtr*)(dataAddress + IntPtr.Size)) = target;
-
-            InternalCalls.RhJitWriteProtect(1);
         }
     }
 
@@ -420,8 +396,6 @@ public static unsafe IntPtr GetNewThunksBlock()
             // Use the first data field of the thunk to build the linked list.
             IntPtr dataAddress = InternalCalls.RhpGetThunkDataBlockAddress(nextThunksBlock);
 
-            InternalCalls.RhJitWriteProtect(0);
-
             for (int i = 0; i < Constants.NumThunksPerBlock; i++)
             {
                 if (i == (Constants.NumThunksPerBlock - 1))
@@ -437,8 +411,6 @@ public static unsafe IntPtr GetNewThunksBlock()
                 dataAddress += Constants.ThunkDataSize;
             }
 
-            InternalCalls.RhJitWriteProtect(1);
-
             return nextThunksBlock;
         }
 

src/coreclr/nativeaot/Runtime/ThunksMapping.cpp

@@ -89,13 +89,6 @@ COOP_PINVOKE_HELPER(int, RhpGetThunkBlockSize, ())
     return OS_PAGE_SIZE;
 }
 
-EXTERN_C NATIVEAOT_API void __cdecl RhJitWriteProtect(int writeEnable)
-{
-#if defined(HOST_OSX) && defined(HOST_ARM64)
-    pthread_jit_write_protect_np(writeEnable);
-#endif
-}
-
 EXTERN_C NATIVEAOT_API void* __cdecl RhAllocateThunksMapping()
 {
 #ifdef WIN32
@@ -128,8 +121,9 @@ EXTERN_C NATIVEAOT_API void* __cdecl RhAllocateThunksMapping()
         return NULL;
     }
 
-    RhJitWriteProtect(0);
-
+#if defined(HOST_OSX) && defined(HOST_ARM64)
+    pthread_jit_write_protect_np(0);
+#endif
 #endif
 
     int numBlocksPerMap = RhpGetNumThunkBlocksPerMapping();
@@ -233,7 +227,8 @@ EXTERN_C NATIVEAOT_API void* __cdecl RhAllocateThunksMapping()
     }
 
 #if defined(HOST_OSX) && defined(HOST_ARM64)
-    RhJitWriteProtect(1);
+    pthread_jit_write_protect_np(1);
+    __builtin___clear_cache((char*)pThunksSection, (char*)pThunksSection + THUNKS_MAP_SIZE);
 #else
     if (!PalVirtualProtect(pThunksSection, THUNKS_MAP_SIZE, PAGE_EXECUTE_READ))
     {