Changeset 108724 in vbox for trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

Timestamp:

Mar 24, 2025 6:53:21 PM (3 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168147

Message:

HostDrivers/Support: Make SUPR3 work on hosts where the page size is not known during compile time, bugref:10391

File:

• trunk/src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (15 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -75 +75 @@
 #include <iprt/path.h>
 #include <iprt/string.h>
+#include <iprt/system.h>
 #include <iprt/env.h>
 #include <iprt/rand.h>
@@ -551 +552 @@
 
         /* fake the GIP. */
-        g_pSUPGlobalInfoPage = (PSUPGLOBALINFOPAGE)RTMemPageAllocZ(PAGE_SIZE);
+        g_pSUPGlobalInfoPage = (PSUPGLOBALINFOPAGE)RTMemPageAllocZ(SUP_PAGE_SIZE);
         if (g_pSUPGlobalInfoPage)
         {
             g_pSUPGlobalInfoPageR0 = g_pSUPGlobalInfoPage;
-            g_HCPhysSUPGlobalInfoPage = NIL_RTHCPHYS & ~(RTHCPHYS)PAGE_OFFSET_MASK;
+            g_HCPhysSUPGlobalInfoPage = NIL_RTHCPHYS & ~(RTHCPHYS)SUP_PAGE_OFFSET_MASK;
             /* the page is supposed to be invalid, so don't set the magic. */
             return VINF_SUCCESS;
@@ -1002 +1003 @@
 SUPR3DECL(int) supR3PageLock(void *pvStart, size_t cPages, PSUPPAGE paPages)
 {
+    uint32_t  const cbPage = SUP_PAGE_SIZE;
+
     /*
      * Validate.
      */
     AssertPtr(pvStart);
-    AssertMsg(RT_ALIGN_P(pvStart, PAGE_SIZE) == pvStart, ("pvStart (%p) must be page aligned\n", pvStart));
+    AssertMsg(RT_ALIGN_P(pvStart, cbPage) == pvStart, ("pvStart (%p) must be page aligned\n", pvStart));
     AssertPtr(paPages);
 
@@ -1012 +1015 @@
     if (RT_UNLIKELY(g_uSupFakeMode))
     {
-        RTHCPHYS    Phys = (uintptr_t)pvStart + PAGE_SIZE * 1024;
+        RTHCPHYS    Phys = (uintptr_t)pvStart + cbPage * 1024;
         size_t      iPage = cPages;
         while (iPage-- > 0)
-            paPages[iPage].Phys = Phys + (iPage << PAGE_SHIFT);
+            paPages[iPage].Phys = Phys + (iPage << SUP_PAGE_SHIFT);
         return VINF_SUCCESS;
     }
@@ -1068 +1071 @@
      */
     AssertPtr(pvStart);
-    AssertMsg(RT_ALIGN_P(pvStart, PAGE_SIZE) == pvStart, ("pvStart (%p) must be page aligned\n", pvStart));
+    AssertMsg(RT_ALIGN_P(pvStart, SUP_PAGE_SIZE) == pvStart, ("pvStart (%p) must be page aligned\n", pvStart));
 
     /* fake */
@@ -1117 +1120 @@
 
 
+#ifdef VBOX_WITH_R0_MODULES
 /**
  * Fallback for SUPR3PageAllocEx on systems where RTR0MemObjPhysAllocNC isn't
@@ -1135 +1139 @@
     return rc;
 }
+#endif /* VBOX_WITH_R0_MODULES */
 
 
@@ -1148 +1153 @@
         *pR0Ptr = NIL_RTR0PTR;
     AssertPtrNullReturn(paPages, VERR_INVALID_POINTER);
-    AssertMsgReturn(cPages > 0 && cPages <= VBOX_MAX_ALLOC_PAGE_COUNT, ("cPages=%zu\n", cPages), VERR_PAGE_COUNT_OUT_OF_RANGE);
+    AssertMsgReturn(cPages > 0 && cPages <= VBOX_MAX_ALLOC_SIZE / SUP_PAGE_SIZE, ("cPages=%zu\n", cPages), VERR_PAGE_COUNT_OUT_OF_RANGE);
     AssertReturn(!fFlags, VERR_INVALID_FLAGS);
 
@@ -1157 +1162 @@
     {
         int rc = SUPR3PageAlloc(cPages, 0 /*fFlags*/, ppvPages);
-        Assert(RT_FAILURE(rc) || ASMMemIsZero(*ppvPages, cPages << PAGE_SHIFT));
+        Assert(RT_FAILURE(rc) || ASMMemIsZero(*ppvPages, cPages << SUP_PAGE_SHIFT));
         if (pR0Ptr)
             *pR0Ptr = NIL_RTR0PTR;
@@ -1176 +1181 @@
         return VERR_WRONG_ORDER;
 
+#ifdef VBOX_WITH_R0_MODULES
     /*
      * Use fallback for non-R0 mapping?
@@ -1240 +1246 @@
         rc = VERR_NO_TMP_MEMORY;
     return rc;
-
-}
-
-
+#else
+    AssertFailedReturn(VERR_NOT_SUPPORTED);
+#endif /* VBOX_WITH_R0_MODULES */
+}
+
+
+#ifdef VBOX_WITH_R0_MODULES
 SUPR3DECL(int) SUPR3PageMapKernel(void *pvR3, uint32_t off, uint32_t cb, uint32_t fFlags, PRTR0PTR pR0Ptr)
 {
@@ -1282 +1291 @@
     return rc;
 }
+#endif
 
 
@@ -1290 +1300 @@
      */
     AssertPtrReturn(pvR3, VERR_INVALID_POINTER);
-    Assert(!(off & PAGE_OFFSET_MASK));
-    Assert(!(cb & PAGE_OFFSET_MASK) && cb);
+    Assert(!(off & SUP_PAGE_OFFSET_MASK));
+    Assert(!(cb & SUP_PAGE_OFFSET_MASK) && cb);
     AssertReturn(!(fProt & ~(RTMEM_PROT_NONE | RTMEM_PROT_READ | RTMEM_PROT_WRITE | RTMEM_PROT_EXEC)), VERR_INVALID_PARAMETER);
 
@@ -1476 +1486 @@
     if (RT_UNLIKELY(g_uSupFakeMode))
     {
-        *ppvPages = RTMemPageAllocZ((size_t)cPages * PAGE_SIZE);
+        *ppvPages = RTMemPageAllocZ((size_t)cPages * SUP_PAGE_SIZE);
         if (!*ppvPages)
             return VERR_NO_LOW_MEMORY;
 
         /* fake physical addresses. */
-        RTHCPHYS    Phys = (uintptr_t)*ppvPages + PAGE_SIZE * 1024;
+        RTHCPHYS    Phys = (uintptr_t)*ppvPages + SUP_PAGE_SIZE * 1024;
         size_t      iPage = cPages;
         while (iPage-- > 0)
-            paPages[iPage].Phys = Phys + (iPage << PAGE_SHIFT);
+            paPages[iPage].Phys = Phys + (iPage << SUP_PAGE_SHIFT);
         return VINF_SUCCESS;
     }
@@ -1544 +1554 @@
     if (RT_UNLIKELY(g_uSupFakeMode))
     {
-        RTMemPageFree(pv, cPages * PAGE_SIZE);
+        RTMemPageFree(pv, cPages * SUP_PAGE_SIZE);
         return VINF_SUCCESS;
     }