Change stack size

- Change stack size to 4MB on 64-bit desktop
- Add tests to check stack size

eng/native/configurecompiler.cmake

@@ -102,7 +102,7 @@ if (MSVC)
   if (CLR_CMAKE_ENABLE_SANITIZERS)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:0x800000")
   else()
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:0x180000")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:0x400000")
   endif()
 
   if(EXISTS ${CLR_SOURCELINK_FILE_PATH})

src/coreclr/pal/src/init/pal.cpp

@@ -288,12 +288,20 @@ InitializeDefaultStackSize()
         }
     }
 
+#ifdef HOST_OSX
+    // Match Windows stack size
+    if (g_defaultStackSize == 0)
+    {
+        g_defaultStackSize = 4096 * 1024;
+    }
+#endif
+
 #ifdef ENSURE_PRIMARY_STACK_SIZE
     if (g_defaultStackSize == 0)
     {
         // Set the default minimum stack size for MUSL to the same value as we
         // use on Windows.
-        g_defaultStackSize = 1536 * 1024;
+        g_defaultStackSize = 4096 * 1024;
     }
 #endif // ENSURE_PRIMARY_STACK_SIZE
 }

src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.cs

@@ -3400,7 +3400,7 @@ internal PEHeader() { }
     }
     public sealed partial class PEHeaderBuilder
     {
-        public PEHeaderBuilder(System.Reflection.PortableExecutable.Machine machine = System.Reflection.PortableExecutable.Machine.Unknown, int sectionAlignment = 8192, int fileAlignment = 512, ulong imageBase = (ulong)4194304, byte majorLinkerVersion = (byte)48, byte minorLinkerVersion = (byte)0, ushort majorOperatingSystemVersion = (ushort)4, ushort minorOperatingSystemVersion = (ushort)0, ushort majorImageVersion = (ushort)0, ushort minorImageVersion = (ushort)0, ushort majorSubsystemVersion = (ushort)4, ushort minorSubsystemVersion = (ushort)0, System.Reflection.PortableExecutable.Subsystem subsystem = System.Reflection.PortableExecutable.Subsystem.WindowsCui, System.Reflection.PortableExecutable.DllCharacteristics dllCharacteristics = System.Reflection.PortableExecutable.DllCharacteristics.DynamicBase | System.Reflection.PortableExecutable.DllCharacteristics.NoSeh | System.Reflection.PortableExecutable.DllCharacteristics.NxCompatible | System.Reflection.PortableExecutable.DllCharacteristics.TerminalServerAware, System.Reflection.PortableExecutable.Characteristics imageCharacteristics = System.Reflection.PortableExecutable.Characteristics.Dll, ulong sizeOfStackReserve = (ulong)1048576, ulong sizeOfStackCommit = (ulong)4096, ulong sizeOfHeapReserve = (ulong)1048576, ulong sizeOfHeapCommit = (ulong)4096) { }
+        public PEHeaderBuilder(System.Reflection.PortableExecutable.Machine machine = System.Reflection.PortableExecutable.Machine.Unknown, int sectionAlignment = 8192, int fileAlignment = 512, ulong imageBase = (ulong)4194304, byte majorLinkerVersion = (byte)48, byte minorLinkerVersion = (byte)0, ushort majorOperatingSystemVersion = (ushort)4, ushort minorOperatingSystemVersion = (ushort)0, ushort majorImageVersion = (ushort)0, ushort minorImageVersion = (ushort)0, ushort majorSubsystemVersion = (ushort)4, ushort minorSubsystemVersion = (ushort)0, System.Reflection.PortableExecutable.Subsystem subsystem = System.Reflection.PortableExecutable.Subsystem.WindowsCui, System.Reflection.PortableExecutable.DllCharacteristics dllCharacteristics = System.Reflection.PortableExecutable.DllCharacteristics.DynamicBase | System.Reflection.PortableExecutable.DllCharacteristics.NoSeh | System.Reflection.PortableExecutable.DllCharacteristics.NxCompatible | System.Reflection.PortableExecutable.DllCharacteristics.TerminalServerAware, System.Reflection.PortableExecutable.Characteristics imageCharacteristics = System.Reflection.PortableExecutable.Characteristics.Dll, ulong sizeOfStackReserve = (ulong)0, ulong sizeOfStackCommit = (ulong)0, ulong sizeOfHeapReserve = (ulong)0, ulong sizeOfHeapCommit = (ulong)0) { }
         public System.Reflection.PortableExecutable.DllCharacteristics DllCharacteristics { get { throw null; } }
         public int FileAlignment { get { throw null; } }
         public ulong ImageBase { get { throw null; } }

src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEHeaderBuilder.cs

@@ -59,10 +59,10 @@ public PEHeaderBuilder(
             Subsystem subsystem = Subsystem.WindowsCui,
             DllCharacteristics dllCharacteristics = DllCharacteristics.DynamicBase | DllCharacteristics.NxCompatible | DllCharacteristics.NoSeh | DllCharacteristics.TerminalServerAware,
             Characteristics imageCharacteristics = Characteristics.Dll,
-            ulong sizeOfStackReserve = 0x00100000,
-            ulong sizeOfStackCommit = 0x1000,
-            ulong sizeOfHeapReserve = 0x00100000,
-            ulong sizeOfHeapCommit = 0x1000)
+            ulong sizeOfStackReserve = 0,
+            ulong sizeOfStackCommit = 0,
+            ulong sizeOfHeapReserve = 0,
+            ulong sizeOfHeapCommit = 0)
         {
             if (fileAlignment < 512 || fileAlignment > 64 * 1024 || BitArithmetic.CountBits(fileAlignment) != 1)
             {
@@ -89,10 +89,10 @@ public PEHeaderBuilder(
             Subsystem = subsystem;
             DllCharacteristics = dllCharacteristics;
             ImageCharacteristics = imageCharacteristics;
-            SizeOfStackReserve = sizeOfStackReserve;
-            SizeOfStackCommit = sizeOfStackCommit;
-            SizeOfHeapReserve = sizeOfHeapReserve;
-            SizeOfHeapCommit = sizeOfHeapCommit;
+            SizeOfStackReserve = sizeOfStackReserve == 0 ? (Is32Bit ? 0x1000u : 0x4000u) : sizeOfStackReserve;
+            SizeOfStackCommit = sizeOfStackCommit == 0 ? (Is32Bit ? 0x1000000u : 0x4000000u) : sizeOfStackCommit;
+            SizeOfHeapReserve = sizeOfHeapReserve == 0 ? 0x100000u : sizeOfHeapReserve;
+            SizeOfHeapCommit = sizeOfHeapCommit == 0 ? (Is32Bit ? 0x1000u : 0x2000u) : sizeOfHeapCommit;
         }
 
         public static PEHeaderBuilder CreateExecutableHeader()

src/native/libs/System.Native/pal_threading.c

@@ -233,6 +233,14 @@ int32_t SystemNative_CreateThread(uintptr_t stackSize, void *(*startAddress)(voi
     error = pthread_attr_setdetachstate(&attrs, PTHREAD_CREATE_DETACHED);
     assert(error == 0);
 
+#ifdef HOST_OSX
+    // Match Windows stack size
+    if (stackSize == 0)
+    {
+        stackSize = 4096 * 1024;
+    }
+#endif
+
     if (stackSize > 0)
     {
         if (stackSize < (uintptr_t)PTHREAD_STACK_MIN)

src/tests/Exceptions/ForeignThread/ForeignThreadExceptionsNative.cpp

@@ -49,8 +49,8 @@ extern "C" DLL_EXPORT void InvokeCallbackOnNewThread(PFNACTION1 callback)
     int st = pthread_attr_init(&attr);
     AbortIfFail(st);
 
-    // set stack size to 1.5MB
-    st = pthread_attr_setstacksize(&attr, 0x180000);
+    // set stack size to 4.0MB
+    st = pthread_attr_setstacksize(&attr, 0x400000);
     AbortIfFail(st);
 
     pthread_t t;

src/tests/Regressions/coreclr/GitHub_87879/test87879.cs

@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Threading;
+using System.Runtime.CompilerServices;
+
+class Program
+{
+    [SkipLocalsInit]
+    static int Main()
+    {
+        //determine the expected available stack size (4MB or 1MB), minus a little bit (384kB) for overhead.
+        var expectedSize = (IntPtr.Size == 8 ? 0x4_00000 : 0x1_00000) - 0x60000;
+
+        //allocate 4MB, minus a little bit (512kB) for overhead
+        Span<byte> bytes = stackalloc byte[expectedSize];
+        Consume(bytes);
+        Console.WriteLine("Main thread succeeded.");
+
+        //repeat on a secondary thread
+        Thread t = new Thread([SkipLocalsInit] () =>
+        {
+            Span<byte> bytes = stackalloc byte[expectedSize];
+            Consume(bytes);
+        });
+        t.Start();
+        t.Join();
+        Console.WriteLine("Secondary thread succeeded.");
+
+        //success
+        return 100;
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    static void Consume(Span<byte> bytes)
+    {
+    }
+}

src/tests/Regressions/coreclr/GitHub_87879/test87879.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestTargetUnsupported>true</CLRTestTargetUnsupported>
+    <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' == 'true' OR ('$(TargetsUnix)' == 'true' AND '$(TargetsMobile)' != 'true')">false</CLRTestTargetUnsupported>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="test87879.cs" />
+  </ItemGroup>
+</Project>

src/tests/nativeaot/DesktopStackSize/DesktopStackSize.cs

@@ -0,0 +1,42 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Threading;
+using System.Runtime.CompilerServices;
+
+namespace DesktopStackSize
+{
+	class Program
+	{
+		[SkipLocalsInit]
+		static int Main()
+		{
+			//determine the expected available stack size (4MB or 1MB), minus a little bit (384kB) for overhead.
+			var expectedSize = (IntPtr.Size == 8 ? 0x4_00000 : 0x1_00000) - 0x60000;
+
+			//allocate 4MB, minus a little bit (512kB) for overhead
+			Span<byte> bytes = stackalloc byte[expectedSize];
+			Consume(bytes);
+			Console.WriteLine("Main thread succeeded.");
+
+			//repeat on a secondary thread
+			Thread t = new Thread([SkipLocalsInit] () =>
+			{
+				Span<byte> bytes = stackalloc byte[expectedSize];
+				Consume(bytes);
+			});
+			t.Start();
+			t.Join();
+			Console.WriteLine("Secondary thread succeeded.");
+
+			//success
+			return 100;
+		}
+
+		[MethodImpl(MethodImplOptions.NoInlining)]
+		static void Consume(Span<byte> bytes)
+		{
+		}
+	}
+}

src/tests/nativeaot/DesktopStackSize/DesktopStackSize.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestTargetUnsupported>true</CLRTestTargetUnsupported>
+    <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' == 'true' OR ('$(TargetsUnix)' == 'true' AND '$(TargetsMobile)' != 'true')">false</CLRTestTargetUnsupported>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="DesktopStackSize.cs" />
+  </ItemGroup>
+</Project>