Changeset 80118 in vbox for trunk/src/VBox/VMM/VMMR3/MMHyper.cpp

Timestamp:

Aug 4, 2019 2:39:54 AM (5 years ago)

Author:

vboxsync

Message:

VMM: Kicking out raw-mode and 32-bit hosts - MM, PGM, ++. bugref:9517 bugref:9511

File:

• trunk/src/VBox/VMM/VMMR3/MMHyper.cpp (modified) (26 diffs)

trunk/src/VBox/VMM/VMMR3/MMHyper.cpp

@@ -38 +38 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
+#ifndef PGM_WITHOUT_MAPPINGS
 static DECLCALLBACK(bool) mmR3HyperRelocateCallback(PVM pVM, RTGCPTR GCPtrOld, RTGCPTR GCPtrNew, PGMRELOCATECALL enmMode,
                                                     void *pvUser);
+#endif
 static int mmR3HyperMap(PVM pVM, const size_t cb, const char *pszDesc, PRTGCPTR pGCPtr, PMMLOOKUPHYPER *ppLookup);
 static int mmR3HyperHeapCreate(PVM pVM, const size_t cb, PMMHYPERHEAP *ppHeap, PRTR0PTR pR0PtrHeap);
@@ -54 +56 @@
 static uint32_t mmR3HyperComputeHeapSize(PVM pVM)
 {
+    /** @todo Redo after moving allocations off the hyper heap. */
+
     /*
      * Gather parameters.
      */
-    bool        fCanUseLargerHeap;
-    int rc = CFGMR3QueryBoolDef(CFGMR3GetChild(CFGMR3GetRoot(pVM), "MM"), "CanUseLargerHeap", &fCanUseLargerHeap, false);
-    AssertStmt(RT_SUCCESS(rc), fCanUseLargerHeap = false);
+    bool        fCanUseLargerHeap = true;
+    //bool        fCanUseLargerHeap;
+    //int rc = CFGMR3QueryBoolDef(CFGMR3GetChild(CFGMR3GetRoot(pVM), "MM"), "CanUseLargerHeap", &fCanUseLargerHeap, false);
+    //AssertStmt(RT_SUCCESS(rc), fCanUseLargerHeap = false);
 
     uint64_t    cbRam;
-    rc = CFGMR3QueryU64(CFGMR3GetRoot(pVM), "RamSize", &cbRam);
+    int rc = CFGMR3QueryU64(CFGMR3GetRoot(pVM), "RamSize", &cbRam);
     AssertStmt(RT_SUCCESS(rc), cbRam = _1G);
 
@@ -142 +147 @@
          * Make a small head fence to fend of accidental sequential access.
          */
-        MMR3HyperReserve(pVM, PAGE_SIZE, "fence", NULL);
+        MMR3HyperReserveFence(pVM);
 
         /*
@@ -158 +163 @@
 
             /* Reserve a page for fencing. */
-            MMR3HyperReserve(pVM, PAGE_SIZE, "fence", NULL);
+            MMR3HyperReserveFence(pVM);
 
             /*
@@ -218 +223 @@
     AssertRC(rc);
 
+#ifndef PGM_WITHOUT_MAPPINGS
     /*
      * Adjust and create the HMA mapping.
@@ -227 +233 @@
     if (RT_FAILURE(rc))
         return rc;
+#endif
     pVM->mm.s.fPGMInitialized = true;
 
+#ifndef PGM_WITHOUT_MAPPINGS
     /*
      * Do all the delayed mappings.
@@ -309 +317 @@
         pLookup = (PMMLOOKUPHYPER)((uintptr_t)pLookup + pLookup->offNext);
     }
+#endif /* !PGM_WITHOUT_MAPPINGS */
 
     LogFlow(("MMR3HyperInitFinalize: returns VINF_SUCCESS\n"));
@@ -315 +324 @@
 
 
+#ifndef PGM_WITHOUT_MAPPINGS
 /**
  * Callback function which will be called when PGM is trying to find a new
@@ -385 +395 @@
     return false;
 }
+#endif /* !PGM_WITHOUT_MAPPINGS */
+
 
 /**
@@ -400 +412 @@
     return rc;
 }
+
+
+#ifndef PGM_WITHOUT_MAPPINGS
 
 /**
@@ -607 +622 @@
 }
 
+#endif /* !PGM_WITHOUT_MAPPINGS */
 
 /**
@@ -662 +678 @@
             }
 
+#ifndef PGM_WITHOUT_MAPPINGS
             if (pVM->mm.s.fPGMInitialized)
             {
@@ -670 +687 @@
                 }
             }
+#endif
             if (RT_SUCCESS(rc))
             {
@@ -689 +707 @@
 
 
+#ifndef PGM_WITHOUT_MAPPINGS
 /**
  * Reserves a hypervisor memory area.
@@ -729 +748 @@
     }
     return rc;
+}
+#endif /* !PGM_WITHOUT_MAPPINGS */
+
+
+/**
+ * Reserves an electric fence page.
+ *
+ * @returns VBox status code.
+ * @param   pVM         The cross context VM structure.
+ */
+VMMR3DECL(int) MMR3HyperReserveFence(PVM pVM)
+{
+#ifndef PGM_WITHOUT_MAPPINGS
+    return MMR3HyperReserve(pVM, cb, "fence", NULL);
+#else
+    RT_NOREF(pVM);
+    return VINF_SUCCESS;
+#endif
 }
 
@@ -818 +855 @@
                               0 /*fFlags*/,
                               &pv,
-#if defined(VBOX_WITH_2X_4GB_ADDR_SPACE) || defined(VBOX_WITH_MORE_RING0_MEM_MAPPINGS)
                               &pvR0,
-#else
-                              NULL,
-#endif
                               paPages);
     if (RT_SUCCESS(rc))
     {
-#if !defined(VBOX_WITH_2X_4GB_ADDR_SPACE) && !defined(VBOX_WITH_MORE_RING0_MEM_MAPPINGS)
-        pvR0 = (uintptr_t)pv;
-#endif
+        Assert(pvR0 != NIL_RTR0PTR && !(PAGE_OFFSET_MASK & pvR0));
         memset(pv, 0, cbAligned);
 
@@ -837 +868 @@
         pHeap->u32Magic             = MMHYPERHEAP_MAGIC;
         pHeap->pbHeapR3             = (uint8_t *)pHeap + MMYPERHEAP_HDR_SIZE;
-        pHeap->pbHeapR0             = pvR0 != NIL_RTR0PTR ? pvR0 + MMYPERHEAP_HDR_SIZE : NIL_RTR0PTR;
+        pHeap->pbHeapR0             = pvR0 + MMYPERHEAP_HDR_SIZE;
         //pHeap->pbHeapRC           = 0; // set by mmR3HyperHeapMap()
         pHeap->pVMR3                = pVM;
@@ -871 +902 @@
 }
 
+
 /**
  * Allocates a new heap.
@@ -877 +909 @@
 {
     Assert(RT_ALIGN_Z(pHeap->cbHeap + MMYPERHEAP_HDR_SIZE, PAGE_SIZE) == pHeap->cbHeap + MMYPERHEAP_HDR_SIZE);
+    Assert(pHeap->pbHeapR0);
     Assert(pHeap->paPages);
     int rc = MMR3HyperMapPages(pVM,
                                pHeap,
-                               pHeap->pbHeapR0 != NIL_RTR0PTR ? pHeap->pbHeapR0 - MMYPERHEAP_HDR_SIZE : NIL_RTR0PTR,
+                               pHeap->pbHeapR0 - MMYPERHEAP_HDR_SIZE,
                                (pHeap->cbHeap + MMYPERHEAP_HDR_SIZE) >> PAGE_SHIFT,
                                pHeap->paPages,
@@ -889 +922 @@
         pHeap->pbHeapRC = *ppHeapGC + MMYPERHEAP_HDR_SIZE;
         /* Reserve a page for fencing. */
-        MMR3HyperReserve(pVM, PAGE_SIZE, "fence", NULL);
+        MMR3HyperReserveFence(pVM);
 
         /* We won't need these any more. */
@@ -1014 +1047 @@
                               0 /*fFlags*/,
                               &pvPages,
-#ifdef VBOX_WITH_MORE_RING0_MEM_MAPPINGS
                               &pvR0,
-#else
-                              fFlags & MMHYPER_AONR_FLAGS_KERNEL_MAPPING ? &pvR0 : NULL,
-#endif
                               paPages);
     if (RT_SUCCESS(rc))
     {
-#ifdef VBOX_WITH_MORE_RING0_MEM_MAPPINGS
         Assert(pvR0 != NIL_RTR0PTR);
-#else
-        if (!(fFlags & MMHYPER_AONR_FLAGS_KERNEL_MAPPING))
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
-            pvR0 = NIL_RTR0PTR;
-# else
-            pvR0 = (RTR0PTR)pvPages;
-# endif
-#endif
-
         memset(pvPages, 0, cbAligned);
 
@@ -1050 +1069 @@
             Log2(("MMR3HyperAllocOnceNoRel: cbAligned=%#x uAlignment=%#x returns VINF_SUCCESS and *ppv=%p\n",
                   cbAligned, uAlignment, *ppv));
-            MMR3HyperReserve(pVM, PAGE_SIZE, "fence", NULL);
+            MMR3HyperReserveFence(pVM);
             return rc;
         }
@@ -1165 +1184 @@
     if (fSet)
     {
+#ifndef PGM_WITHOUT_MAPPINGS
         rc = PGMMapSetPage(pVM, MMHyperR3ToRC(pVM, pvStart), cb, 0);
+#else
+        rc = VINF_SUCCESS;
+#endif
         SUPR3PageProtect(pbR3, R0Ptr, off, (uint32_t)cb, RTMEM_PROT_NONE);
     }
     else
     {
+#ifndef PGM_WITHOUT_MAPPINGS
         rc = PGMMapSetPage(pVM, MMHyperR3ToRC(pVM, pvStart), cb, X86_PTE_P | X86_PTE_A | X86_PTE_D | X86_PTE_RW);
+#else
+        rc = VINF_SUCCESS;
+#endif
         SUPR3PageProtect(pbR3, R0Ptr, off, (uint32_t)cb, RTMEM_PROT_READ | RTMEM_PROT_WRITE);
     }
@@ -1228 +1255 @@
 }
 
+#ifndef PGM_WITHOUT_MAPPINGS
 
 /**
@@ -1314 +1342 @@
 
 
-#if 0 /* unused, not implemented */
-/**
- * Convert hypervisor HC physical address to HC virtual address.
- *
- * @returns HC virtual address.
- * @param   pVM         The cross context VM structure.
- * @param   HCPhys      Host context physical address.
- */
-VMMR3DECL(void *) MMR3HyperHCPhys2HCVirt(PVM pVM, RTHCPHYS HCPhys)
-{
-    void *pv;
-    int rc = MMR3HyperHCPhys2HCVirtEx(pVM, HCPhys, &pv);
-    if (RT_SUCCESS(rc))
-        return pv;
-    AssertMsgFailed(("Invalid address HCPhys=%x rc=%d\n", HCPhys, rc));
-    return NULL;
-}
-
-
-/**
- * Convert hypervisor HC physical address to HC virtual address.
- *
- * @returns VBox status code.
- * @param   pVM         The cross context VM structure.
- * @param   HCPhys      Host context physical address.
- * @param   ppv         Where to store the HC virtual address.
- */
-VMMR3DECL(int)   MMR3HyperHCPhys2HCVirtEx(PVM pVM, RTHCPHYS HCPhys, void **ppv)
-{
-    /*
-     * Linear search.
-     */
-    /** @todo implement when actually used. */
-    return VERR_INVALID_POINTER;
-}
-#endif /* unused, not implemented */
-
-
 /**
  * Read hypervisor memory from GC virtual address.
@@ -1370 +1360 @@
 }
 
+#endif /* !PGM_WITHOUT_MAPPINGS */
 
 /**