Changeset 101162 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Sep 18, 2023 8:03:52 PM (17 months ago)

Author:

vboxsync

Message:

IPRT/mem: Use mempage /w heap code everwhere all the time. bugref:10370

Location:

trunk/src/VBox/Runtime/r3/win

Files:

• RTMemProtect-win.cpp (moved) (moved from trunk/src/VBox/Runtime/r3/win/alloc-win.cpp ) (2 diffs)
• mempage-native-win.cpp (copied) (copied from trunk/src/VBox/Runtime/r3/win/alloc-win.cpp ) (2 diffs, 1 prop)

trunk/src/VBox/Runtime/r3/win/RTMemProtect-win.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Memory Allocation, Windows.
+ * IPRT - RTMemProtect, Windows.
  */
 
@@ -39 +39 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#ifdef IPRT_NO_CRT
-# define USE_VIRTUAL_ALLOC
-#endif
 #define LOG_GROUP RTLOGGROUP_MEM
 #include <iprt/win/windows.h>
 
-#include <iprt/alloc.h>
+#include <iprt/mem.h>
 #include <iprt/assert.h>
 #include <iprt/param.h>
-#include <iprt/string.h>
 #include <iprt/errcore.h>
 
-#ifndef USE_VIRTUAL_ALLOC
-# include <malloc.h>
-#endif
-
-
-/** @todo merge the page alloc code with the heap-based mmap stuff as
- *        _aligned_malloc just isn't well suited for exec. */
-
-
-RTDECL(void *) RTMemPageAllocTag(size_t cb, const char *pszTag) RT_NO_THROW_DEF
-{
-    RT_NOREF_PV(pszTag);
-
-#ifdef USE_VIRTUAL_ALLOC
-    void *pv = VirtualAlloc(NULL, RT_ALIGN_Z(cb, PAGE_SIZE), MEM_COMMIT, PAGE_READWRITE);
-#else
-    void *pv = _aligned_malloc(RT_ALIGN_Z(cb, PAGE_SIZE), PAGE_SIZE);
-#endif
-    AssertMsg(pv, ("cb=%d lasterr=%d\n", cb, GetLastError()));
-    return pv;
-}
-
-
-RTDECL(void *) RTMemPageAllocExTag(size_t cb, uint32_t fFlags, const char *pszTag) RT_NO_THROW_DEF
-{
-    size_t const cbAligned = RT_ALIGN_Z(cb, PAGE_SIZE);
-    RT_NOREF_PV(pszTag);
-    AssertReturn(!(fFlags & ~RTMEMPAGEALLOC_F_VALID_MASK), NULL);
-
-#ifdef USE_VIRTUAL_ALLOC
-    void *pv = VirtualAlloc(NULL, cbAligned, MEM_COMMIT,
-                            !(fFlags & RTMEMPAGEALLOC_F_EXECUTABLE) ? PAGE_READWRITE : PAGE_EXECUTE_READWRITE);
-#else
-    void *pv = _aligned_malloc(cbAligned, PAGE_SIZE);
-#endif
-    AssertMsgReturn(pv, ("cb=%d lasterr=%d\n", cb, GetLastError()), NULL);
-
-#ifndef USE_VIRTUAL_ALLOC
-    if (fFlags & RTMEMPAGEALLOC_F_EXECUTABLE)
-    {
-        DWORD      fIgn = 0;
-        BOOL const fRc  = VirtualProtect(pv, cbAligned, PAGE_EXECUTE_READWRITE, &fIgn);
-        AssertMsgReturnStmt(fRc, ("%p LB %#zx: %#u\n", pv, cbAligned, GetLastError()), _aligned_free(pv), NULL);
-    }
-#endif
-
-    if (fFlags & RTMEMPAGEALLOC_F_ADVISE_LOCKED)
-    {
-        /** @todo check why we get ERROR_WORKING_SET_QUOTA here. */
-        BOOL const fOkay = VirtualLock(pv, cbAligned);
-        AssertMsg(fOkay || GetLastError() == ERROR_WORKING_SET_QUOTA, ("pv=%p cb=%d lasterr=%d\n", pv, cb, GetLastError()));
-        NOREF(fOkay);
-    }
-
-    if (fFlags & RTMEMPAGEALLOC_F_ZERO)
-        RT_BZERO(pv, cbAligned);
-
-    return pv;
-}
-
-
-RTDECL(void *) RTMemPageAllocZTag(size_t cb, const char *pszTag) RT_NO_THROW_DEF
-{
-    RT_NOREF_PV(pszTag);
-
-#ifdef USE_VIRTUAL_ALLOC
-    void *pv = VirtualAlloc(NULL, RT_ALIGN_Z(cb, PAGE_SIZE), MEM_COMMIT, PAGE_READWRITE);
-#else
-    void *pv = _aligned_malloc(RT_ALIGN_Z(cb, PAGE_SIZE), PAGE_SIZE);
-#endif
-    if (pv)
-    {
-        memset(pv, 0, RT_ALIGN_Z(cb, PAGE_SIZE));
-        return pv;
-    }
-    AssertMsgFailed(("cb=%d lasterr=%d\n", cb, GetLastError()));
-    return NULL;
-}
-
-
-RTDECL(void) RTMemPageFree(void *pv, size_t cb) RT_NO_THROW_DEF
-{
-    RT_NOREF_PV(cb);
-
-    if (pv)
-    {
-#ifdef USE_VIRTUAL_ALLOC
-        if (!VirtualFree(pv, 0, MEM_RELEASE))
-            AssertMsgFailed(("pv=%p lasterr=%d\n", pv, GetLastError()));
-#else
-        /** @todo The exec version of this doesn't really work well... */
-        MEMORY_BASIC_INFORMATION MemInfo = { NULL };
-        SIZE_T cbRet = VirtualQuery(pv, &MemInfo, sizeof(MemInfo));
-        Assert(cbRet > 0);
-        if (cbRet > 0 && MemInfo.Protect == PAGE_EXECUTE_READWRITE)
-        {
-            DWORD      fIgn = 0;
-            BOOL const fRc  = VirtualProtect(pv, cb, PAGE_READWRITE, &fIgn);
-            Assert(fRc); RT_NOREF(fRc);
-        }
-        _aligned_free(pv);
-#endif
-    }
-}
 
 

trunk/src/VBox/Runtime/r3/win/mempage-native-win.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Memory Allocation, Windows.
+ * IPRT - rtMemPageNative*, Windows implementation.
  */
 
 /*
- * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2023 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -39 +39 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#ifdef IPRT_NO_CRT
-# define USE_VIRTUAL_ALLOC
-#endif
-#define LOG_GROUP RTLOGGROUP_MEM
 #include <iprt/win/windows.h>
 
-#include <iprt/alloc.h>
+#include "internal/iprt.h"
+#include <iprt/mem.h>
+
 #include <iprt/assert.h>
+#include <iprt/errcore.h>
 #include <iprt/param.h>
 #include <iprt/string.h>
-#include <iprt/errcore.h>
-
-#ifndef USE_VIRTUAL_ALLOC
-# include <malloc.h>
-#endif
+#include "internal/mem.h"
 
 
-/** @todo merge the page alloc code with the heap-based mmap stuff as
- *        _aligned_malloc just isn't well suited for exec. */
 
-
-RTDECL(void *) RTMemPageAllocTag(size_t cb, const char *pszTag) RT_NO_THROW_DEF
+DECLHIDDEN(int) rtMemPageNativeAlloc(size_t cb, uint32_t fFlags, void **ppvRet)
 {
-    RT_NOREF_PV(pszTag);
-
-#ifdef USE_VIRTUAL_ALLOC
-    void *pv = VirtualAlloc(NULL, RT_ALIGN_Z(cb, PAGE_SIZE), MEM_COMMIT, PAGE_READWRITE);
-#else
-    void *pv = _aligned_malloc(RT_ALIGN_Z(cb, PAGE_SIZE), PAGE_SIZE);
-#endif
-    AssertMsg(pv, ("cb=%d lasterr=%d\n", cb, GetLastError()));
-    return pv;
+    void *pv = VirtualAlloc(NULL, cb, MEM_COMMIT,
+                            !(fFlags & RTMEMPAGEALLOC_F_EXECUTABLE) ? PAGE_READWRITE : PAGE_EXECUTE_READWRITE);
+    *ppvRet = pv;
+    if (RT_LIKELY(pv != NULL))
+        return VINF_SUCCESS;
+    return RTErrConvertFromWin32(GetLastError());
 }
 
 
-RTDECL(void *) RTMemPageAllocExTag(size_t cb, uint32_t fFlags, const char *pszTag) RT_NO_THROW_DEF
+DECLHIDDEN(int) rtMemPageNativeFree(void *pv, size_t cb)
 {
-    size_t const cbAligned = RT_ALIGN_Z(cb, PAGE_SIZE);
-    RT_NOREF_PV(pszTag);
-    AssertReturn(!(fFlags & ~RTMEMPAGEALLOC_F_VALID_MASK), NULL);
+    if (RT_LIKELY(VirtualFree(pv, 0, MEM_RELEASE)))
+        return VINF_SUCCESS;
+    int rc = RTErrConvertFromWin32(GetLastError());
+    AssertMsgFailed(("rc=%d pv=%p cb=%#zx lasterr=%u\n", rc, pv, cb, GetLastError()));
+    RT_NOREF(cb);
+    return rc;
+}
 
-#ifdef USE_VIRTUAL_ALLOC
-    void *pv = VirtualAlloc(NULL, cbAligned, MEM_COMMIT,
-                            !(fFlags & RTMEMPAGEALLOC_F_EXECUTABLE) ? PAGE_READWRITE : PAGE_EXECUTE_READWRITE);
-#else
-    void *pv = _aligned_malloc(cbAligned, PAGE_SIZE);
-#endif
-    AssertMsgReturn(pv, ("cb=%d lasterr=%d\n", cb, GetLastError()), NULL);
 
-#ifndef USE_VIRTUAL_ALLOC
-    if (fFlags & RTMEMPAGEALLOC_F_EXECUTABLE)
-    {
-        DWORD      fIgn = 0;
-        BOOL const fRc  = VirtualProtect(pv, cbAligned, PAGE_EXECUTE_READWRITE, &fIgn);
-        AssertMsgReturnStmt(fRc, ("%p LB %#zx: %#u\n", pv, cbAligned, GetLastError()), _aligned_free(pv), NULL);
-    }
-#endif
+DECLHIDDEN(uint32_t) rtMemPageNativeApplyFlags(void *pv, size_t cb, uint32_t fFlags)
+{
+    uint32_t fRet = 0;
 
     if (fFlags & RTMEMPAGEALLOC_F_ADVISE_LOCKED)
     {
         /** @todo check why we get ERROR_WORKING_SET_QUOTA here. */
-        BOOL const fOkay = VirtualLock(pv, cbAligned);
+        BOOL const fOkay = VirtualLock(pv, cb);
         AssertMsg(fOkay || GetLastError() == ERROR_WORKING_SET_QUOTA, ("pv=%p cb=%d lasterr=%d\n", pv, cb, GetLastError()));
-        NOREF(fOkay);
+        if (fOkay)
+            fRet |= RTMEMPAGEALLOC_F_ADVISE_LOCKED;
     }
 
-    if (fFlags & RTMEMPAGEALLOC_F_ZERO)
-        RT_BZERO(pv, cbAligned);
+    /** @todo Any way to apply RTMEMPAGEALLOC_F_ADVISE_NO_DUMP on windows? */
 
-    return pv;
+    return fRet;
 }
 
 
-RTDECL(void *) RTMemPageAllocZTag(size_t cb, const char *pszTag) RT_NO_THROW_DEF
+DECLHIDDEN(void) rtMemPageNativeRevertFlags(void *pv, size_t cb, uint32_t fFlags)
 {
-    RT_NOREF_PV(pszTag);
-
-#ifdef USE_VIRTUAL_ALLOC
-    void *pv = VirtualAlloc(NULL, RT_ALIGN_Z(cb, PAGE_SIZE), MEM_COMMIT, PAGE_READWRITE);
-#else
-    void *pv = _aligned_malloc(RT_ALIGN_Z(cb, PAGE_SIZE), PAGE_SIZE);
-#endif
-    if (pv)
+    if (fFlags & RTMEMPAGEALLOC_F_ADVISE_LOCKED)
     {
-        memset(pv, 0, RT_ALIGN_Z(cb, PAGE_SIZE));
-        return pv;
-    }
-    AssertMsgFailed(("cb=%d lasterr=%d\n", cb, GetLastError()));
-    return NULL;
-}
-
-
-RTDECL(void) RTMemPageFree(void *pv, size_t cb) RT_NO_THROW_DEF
-{
-    RT_NOREF_PV(cb);
-
-    if (pv)
-    {
-#ifdef USE_VIRTUAL_ALLOC
-        if (!VirtualFree(pv, 0, MEM_RELEASE))
-            AssertMsgFailed(("pv=%p lasterr=%d\n", pv, GetLastError()));
-#else
-        /** @todo The exec version of this doesn't really work well... */
-        MEMORY_BASIC_INFORMATION MemInfo = { NULL };
-        SIZE_T cbRet = VirtualQuery(pv, &MemInfo, sizeof(MemInfo));
-        Assert(cbRet > 0);
-        if (cbRet > 0 && MemInfo.Protect == PAGE_EXECUTE_READWRITE)
-        {
-            DWORD      fIgn = 0;
-            BOOL const fRc  = VirtualProtect(pv, cb, PAGE_READWRITE, &fIgn);
-            Assert(fRc); RT_NOREF(fRc);
-        }
-        _aligned_free(pv);
-#endif
+        /** @todo check why we get ERROR_NOT_LOCKED here... */
+        BOOL const fOkay = VirtualUnlock(pv, cb);
+        AssertMsg(fOkay || GetLastError() == ERROR_NOT_LOCKED, ("pv=%p cb=%d lasterr=%d\n", pv, cb, GetLastError()));
+        RT_NOREF(fOkay);
     }
 }
 
-
-RTDECL(int) RTMemProtect(void *pv, size_t cb, unsigned fProtect) RT_NO_THROW_DEF
-{
-    /*
-     * Validate input.
-     */
-    if (cb == 0)
-    {
-        AssertMsgFailed(("!cb\n"));
-        return VERR_INVALID_PARAMETER;
-    }
-    if (fProtect & ~(RTMEM_PROT_NONE | RTMEM_PROT_READ | RTMEM_PROT_WRITE | RTMEM_PROT_EXEC))
-    {
-        AssertMsgFailed(("fProtect=%#x\n", fProtect));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    /*
-     * Convert the flags.
-     */
-    int fProt;
-    Assert(!RTMEM_PROT_NONE);
-    switch (fProtect & (RTMEM_PROT_NONE | RTMEM_PROT_READ | RTMEM_PROT_WRITE | RTMEM_PROT_EXEC))
-    {
-        case RTMEM_PROT_NONE:
-            fProt = PAGE_NOACCESS;
-            break;
-
-        case RTMEM_PROT_READ:
-            fProt = PAGE_READONLY;
-            break;
-
-        case RTMEM_PROT_READ | RTMEM_PROT_WRITE:
-            fProt = PAGE_READWRITE;
-            break;
-
-        case RTMEM_PROT_READ | RTMEM_PROT_WRITE | RTMEM_PROT_EXEC:
-            fProt = PAGE_EXECUTE_READWRITE;
-            break;
-
-        case RTMEM_PROT_READ | RTMEM_PROT_EXEC:
-            fProt = PAGE_EXECUTE_READWRITE;
-            break;
-
-        case RTMEM_PROT_WRITE:
-            fProt = PAGE_READWRITE;
-            break;
-
-        case RTMEM_PROT_WRITE | RTMEM_PROT_EXEC:
-            fProt = PAGE_EXECUTE_READWRITE;
-            break;
-
-        case RTMEM_PROT_EXEC:
-            fProt = PAGE_EXECUTE_READWRITE;
-            break;
-
-        /* If the compiler had any brains it would warn about this case. */
-        default:
-            AssertMsgFailed(("fProtect=%#x\n", fProtect));
-            return VERR_INTERNAL_ERROR;
-    }
-
-    /*
-     * Align the request.
-     */
-    cb += (uintptr_t)pv & PAGE_OFFSET_MASK;
-    pv = (void *)((uintptr_t)pv & ~(uintptr_t)PAGE_OFFSET_MASK);
-
-    /*
-     * Change the page attributes.
-     */
-    DWORD fFlags = 0;
-    if (VirtualProtect(pv, cb, fProt, &fFlags))
-        return VINF_SUCCESS;
-    return RTErrConvertFromWin32(GetLastError());
-}
-