Hello World now works

Author: mjsabby

src/gc/env/gcenv.os.h

@@ -204,13 +204,12 @@ class GCToOSInterface
     //  true if it has succeeded, false if it has failed
     static bool VirtualCommit(void *address, size_t size, uint32_t node = NUMA_NODE_UNDEFINED);
 
-    // Commit virtual memory range. It must be part of a range reserved using VirtualReserve.
+    // Reserve and Commit virtual memory range for Large Pages
     // Parameters:
-    //  address - starting virtual address
     //  size    - size of the virtual memory range
     // Return:
-    //  true if it has succeeded, false if it has failed
-    static void* VirtualReserveAndCommitLargePages(size_t size, uint32_t node = NUMA_NODE_UNDEFINED);
+    //  Address of the allocated memory
+    static void* VirtualReserveAndCommitLargePages(size_t size);
 
     // Decomit virtual memory range.
     // Parameters:

src/gc/gc.cpp

@@ -4504,7 +4504,7 @@ void* virtual_alloc (size_t size, bool use_large_pages_p)
     }
 #endif // !FEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP
 
-    void* prgmem = use_large_pages_p ? GCToOSInterface::VirtualReserveAndCommitLargePages(requested_size, card_size * card_word_width) : GCToOSInterface::VirtualReserve(requested_size, card_size * card_word_width, flags);
+    void* prgmem = use_large_pages_p ? GCToOSInterface::VirtualReserveAndCommitLargePages(requested_size) : GCToOSInterface::VirtualReserve(requested_size, card_size * card_word_width, flags);
     void *aligned_mem = prgmem;
 
     // We don't want (prgmem + size) to be right at the end of the address space 
@@ -5562,10 +5562,8 @@ bool gc_heap::virtual_commit (void* address, size_t size, int h_number, bool* ha
         }
     }
 
-    // If it's a valid heap number it means it's commiting for memory on the GC heap.
-    bool commit_succeeded_p = ((h_number >= 0) ? 
-        virtual_alloc_commit_for_heap (address, size, h_number) : 
-        GCToOSInterface::VirtualCommit(address, size));
+    // If it's a valid heap number it means it's commiting for memory on the GC heap. In addition if large pages is enabled, we set commit_succeeded_p to true because memory is already committed.
+    bool commit_succeeded_p = ((h_number >= 0) ? (use_large_pages_p ? true : virtual_alloc_commit_for_heap (address, size, h_number)) : GCToOSInterface::VirtualCommit(address, size));
 
     if (!commit_succeeded_p && heap_hard_limit)
     {

src/gc/unix/gcenv.unix.cpp

@@ -271,7 +271,7 @@ void GCToOSInterface::YieldThread(uint32_t switchCount)
 //  flags     - flags to control special settings like write watching
 // Return:
 //  Starting virtual address of the reserved range
-static VirtualReserveInner(size_t size, size_t alignment, uint32_t flags, uint32_t hugePagesFlag = 0)
+static void* VirtualReserveInner(size_t size, size_t alignment, uint32_t flags, uint32_t hugePagesFlag = 0)
 {
     assert(!(flags & VirtualReserveFlags::WriteWatch) && "WriteWatch not supported on Unix");
     if (alignment == 0)
@@ -333,15 +333,12 @@ bool GCToOSInterface::VirtualRelease(void* address, size_t size)
 // Commit virtual memory range.
 // Parameters:
 //  size      - size of the virtual memory range
-//  alignment - requested memory alignment, 0 means no specific alignment requested
-//  flags     - flags to control special settings like write watching
-//  node      - NUMA node
 // Return:
 //  Starting virtual address of the committed range
-void* GCToOSInterface::VirtualReserveAndCommitLargePages(size_t size, uint32_t node)
+void* GCToOSInterface::VirtualReserveAndCommitLargePages(size_t size)
 {
-    void* pRetVal = VirtualReserveInner(size, alignment, 0, MAP_HUGETLB);
-    if (VirtualCommit(pRetVal, size, node))
+    void* pRetVal = VirtualReserveInner(size, OS_PAGE_SIZE, 0, MAP_HUGETLB);
+    if (VirtualCommit(pRetVal, size, NUMA_NODE_UNDEFINED))
     {
         return pRetVal;
     }

src/gc/windows/gcenv.windows.cpp

@@ -111,14 +111,15 @@ bool InitLargePagesPrivilege()
     }
 
     auto retVal = AdjustTokenPrivileges(token, FALSE, &tp, 0, nullptr, 0);
+    auto gls = GetLastError();
     CloseHandle(token);
 
     if (!retVal)
     {
         return false;
     }
 
-    if (GetLastError() != 0)
+    if (gls != 0)
     {
         return false;
     }
@@ -639,12 +640,9 @@ bool GCToOSInterface::VirtualRelease(void* address, size_t size)
 // Commit virtual memory range.
 // Parameters:
 //  size      - size of the virtual memory range
-//  alignment - requested memory alignment, 0 means no specific alignment requested
-//  flags     - flags to control special settings like write watching
-//  node      - NUMA node
 // Return:
 //  Starting virtual address of the committed range
-void* GCToOSInterface::VirtualReserveAndCommitLargePages(size_t size, uint32_t node)
+void* GCToOSInterface::VirtualReserveAndCommitLargePages(size_t size)
 {
     void* pRetVal = nullptr;
 
@@ -661,17 +659,7 @@ void* GCToOSInterface::VirtualReserveAndCommitLargePages(size_t size, uint32_t n
     auto largePageMinimum = GetLargePageMinimum();
     size = (size + (largePageMinimum - 1)) & ~(largePageMinimum - 1);
 
-    if (node == NUMA_NODE_UNDEFINED)
-    {
-        pRetVal = ::VirtualAlloc(nullptr, size, MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES, PAGE_READWRITE);
-    }
-    else
-    {
-        assert(g_fEnableGCNumaAware);
-        pRetVal = ::VirtualAllocExNuma(::GetCurrentProcess(), nullptr, size, MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES, PAGE_READWRITE, node);
-    }
-
-    return pRetVal;
+    return ::VirtualAlloc(nullptr, size, MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES, PAGE_READWRITE);
 }
 
 // Commit virtual memory range. It must be part of a range reserved using VirtualReserve.

src/vm/gcenv.os.cpp

@@ -54,14 +54,15 @@ bool InitLargePagesPrivilege()
     }
 
     auto retVal = AdjustTokenPrivileges(token, FALSE, &tp, 0, nullptr, 0);
+    auto gls = GetLastError();
     CloseHandle(token);
 
     if (!retVal)
     {
         return false;
     }
 
-    if (GetLastError() != 0)
+    if (gls != 0)
     {
         return false;
     }
@@ -248,10 +249,9 @@ bool GCToOSInterface::VirtualRelease(void* address, size_t size)
 // Commit virtual memory range.
 // Parameters:
 //  size      - size of the virtual memory range
-//  node      - NUMA node
 // Return:
 //  Starting virtual address of the committed range
-void* GCToOSInterface::VirtualReserveAndCommitLargePages(size_t size, uint32_t node)
+void* GCToOSInterface::VirtualReserveAndCommitLargePages(size_t size)
 {
     LIMITED_METHOD_CONTRACT;
 
@@ -270,17 +270,7 @@ void* GCToOSInterface::VirtualReserveAndCommitLargePages(size_t size, uint32_t n
     size = (size + (largePageMinimum - 1)) & ~(largePageMinimum - 1);
 #endif
 
-    void* pRetVal = nullptr;
-    if (node == NUMA_NODE_UNDEFINED)
-    {
-        pRetVal = ::ClrVirtualAlloc(nullptr, size, MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES, PAGE_READWRITE);
-    }
-    else
-    {
-        pRetVal = NumaNodeInfo::VirtualAllocExNuma(::GetCurrentProcess(), nullptr, size, MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES, PAGE_READWRITE, node);
-    }
-
-    return pRetVal;
+    return ::ClrVirtualAlloc(nullptr, size, MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES, PAGE_READWRITE);
 }
 
 // Commit virtual memory range. It must be part of a range reserved using VirtualReserve.