Changeset 92718 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Dec 2, 2021 9:44:14 PM (3 years ago)

Author:

vboxsync

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

148619

Message:

VMM/APIC,SUP: Driverless tweaks for the APIC code. bugref:10138

File:

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

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

@@ -1129 +1129 @@
     if (g_supLibData.fDriverless)
     {
-        int rc = SUPR3PageAlloc(cPages * PAGE_SIZE, 0 /*fFlags*/, ppvPages);
+        int rc = SUPR3PageAlloc(cPages, 0 /*fFlags*/, ppvPages);
         if (pR0Ptr)
             *pR0Ptr = NIL_RTR0PTR;
@@ -1222 +1222 @@
     *pR0Ptr = NIL_RTR0PTR;
 
-    /* fake */
-    if (RT_UNLIKELY(g_uSupFakeMode))
-        return VERR_NOT_SUPPORTED;
+    /*
+     * Not a valid operation in driverless mode.
+     */
+    AssertReturn(g_supLibData.fDriverless, VERR_SUP_DRIVERLESS);
 
     /*
@@ -1259 +1260 @@
     AssertReturn(!(fProt & ~(RTMEM_PROT_NONE | RTMEM_PROT_READ | RTMEM_PROT_WRITE | RTMEM_PROT_EXEC)), VERR_INVALID_PARAMETER);
 
-    /* fake */
-    if (RT_UNLIKELY(g_uSupFakeMode))
+    /*
+     * Deal with driverless mode first.
+     */
+    if (g_supLibData.fDriverless)
         return RTMemProtect((uint8_t *)pvR3 + off, cb, fProt);
 
@@ -1299 +1302 @@
     AssertReturn(cPages > 0, VERR_PAGE_COUNT_OUT_OF_RANGE);
 
-    /* fake */
-    if (RT_UNLIKELY(g_uSupFakeMode))
-    {
-        RTMemPageFree(pvPages, cPages * PAGE_SIZE);
+    /*
+     * Deal with driverless mode first.
+     */
+    if (g_supLibData.fDriverless)
+    {
+        SUPR3PageFree(pvPages, cPages);
         return VINF_SUCCESS;
     }
@@ -1348 +1353 @@
     AssertMsgReturn(cPages > 0 && cPages < 256, ("cPages=%d must be > 0 and < 256\n", cPages), NULL);
 
-    /* fake */
-    if (RT_UNLIKELY(g_uSupFakeMode))
-    {
-        void *pv = RTMemPageAllocZ(cPages * PAGE_SIZE);
+    /*
+     * Deal with driverless mode first.
+     */
+    if (g_supLibData.fDriverless)
+    {
+        void *pvPages = NULL;
+        int rc = SUPR3PageAlloc(cPages, 0 /*fFlags*/, &pvPages);
         if (pR0Ptr)
-            *pR0Ptr = (RTR0PTR)pv;
+            *pR0Ptr = NIL_RTR0PTR;
         if (pHCPhys)
-            *pHCPhys = (uintptr_t)pv + (PAGE_SHIFT * 1024);
-        return pv;
+            *pHCPhys = NIL_RTHCPHYS;
+        return RT_SUCCESS(rc) ? pvPages : NULL;
     }
 
@@ -1397 +1405 @@
     AssertReturn(cPages > 0, VERR_PAGE_COUNT_OUT_OF_RANGE);
 
-    /* fake */
-    if (RT_UNLIKELY(g_uSupFakeMode))
-    {
-        RTMemPageFree(pv, cPages * PAGE_SIZE);
-        return VINF_SUCCESS;
-    }
+    /*
+     * Deal with driverless mode first.
+     */
+    if (g_supLibData.fDriverless)
+        return SUPR3PageFree(pv, cPages);
 
     /*