Changeset 14589 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 25, 2008 6:16:51 PM (16 years ago)

Author:

vboxsync

Message:

VMM,SUPLib: Updated SUPLib API spec, turned out we don't get zero-filled memory from ring-0. Switched the heap to use the new api.

Location:

trunk/src/VBox/VMM

Files:

• MMHyper.cpp (modified) (5 diffs)
• MMInternal.h (modified) (1 diff)
• MMPagePool.cpp (modified) (1 diff)
• PGMPhys.cpp (modified) (1 diff)

trunk/src/VBox/VMM/MMHyper.cpp

@@ -783 +783 @@
     const uint32_t  cbAligned = RT_ALIGN_32(cb, PAGE_SIZE);
     AssertReturn(cbAligned >= cb, VERR_INVALID_PARAMETER);
+    uint32_t const  cPages = cb >> PAGE_SHIFT;
     int             rc;
     void           *pv;
-    RTR0PTR         pvR0;
-#if 1
+    RTR0PTR         pvR0 = NIL_RTR0PTR;
+#if 0
+    PSUPPAGE        paPages = NULL;
     rc = SUPPageAlloc(cbAligned >> PAGE_SHIFT, &pv); /** @todo #1865: heap allocation must be changed for osx (only). */
-    pvR0 = (uintptr_t)pv;
 #else /**@todo resume here. */
-    if (VMMIsHwVirtExtForced(pVM))
-        rc = SUPPageAllocKernel((cbAligned >> PAGE_SHIFT, &pv, &pvR0, paPages);
-    else
-    {
-        rc = SUPPageAllocLocked((cbAligned >> PAGE_SHIFT, &pv, paPages);
-        pvR0 = (uintptr_t)pv;
-    }
+    PSUPPAGE        paPages = (PSUPPAGE)MMR3HeapAlloc(pVM, MM_TAG_MM, cPages * sizeof(paPages[0]));
+    if (!paPages)
+        return VERR_NO_MEMORY;
+    rc = SUPR3PageAllocEx(cPages,
+                          0 /*fFlags*/,
+                          &pv,
+                          VMMIsHwVirtExtForced(pVM) ? &pvR0 : NULL,
+                          paPages);
 #endif
     if (RT_SUCCESS(rc))
     {
+        if (!VMMIsHwVirtExtForced(pVM))
+            pvR0 = (uintptr_t)pv;
+        memset(pv, 0, cbAligned);
+
         /*
          * Initialize the heap and first free chunk.
@@ -806 +812 @@
         pHeap->u32Magic             = MMHYPERHEAP_MAGIC;
         pHeap->pbHeapR3             = (uint8_t *)pHeap + MMYPERHEAP_HDR_SIZE;
-        pHeap->pbHeapR0             = (uintptr_t)pHeap->pbHeapR3; /** @todo #1865: Map heap into ring-0 on darwin. */
-        //pHeap->pbHeapGC           = 0; // set by mmR3HyperHeapMap()
+        pHeap->pbHeapR0             = pvR0             + MMYPERHEAP_HDR_SIZE;
+        //pHeap->pbHeapRC           = 0; // set by mmR3HyperHeapMap()
         pHeap->pVMR3                = pVM;
         pHeap->pVMR0                = pVM->pVMR0;
@@ -817 +823 @@
         pHeap->offPageAligned       = pHeap->cbHeap;
         //pHeap->HyperHeapStatTree  = 0;
+        pHeap->paPages              = paPages;
 
         PMMHYPERCHUNKFREE pFree = (PMMHYPERCHUNKFREE)pHeap->pbHeapR3;
@@ -844 +851 @@
 static int mmR3HyperHeapMap(PVM pVM, PMMHYPERHEAP pHeap, PRTGCPTR ppHeapGC)
 {
-    int rc = MMR3HyperMapHCRam(pVM, pHeap, pHeap->cbHeap + MMYPERHEAP_HDR_SIZE, true, "Heap", ppHeapGC);
+    Assert(RT_ALIGN_Z(pHeap->cbHeap + MMYPERHEAP_HDR_SIZE, PAGE_SIZE) == pHeap->cbHeap + MMYPERHEAP_HDR_SIZE);
+    Assert(pHeap->paPages);
+    int rc = MMR3HyperMapPages(pVM,
+                               pHeap,
+                               pHeap->pbHeapR0 - MMYPERHEAP_HDR_SIZE,
+                               (pHeap->cbHeap + MMYPERHEAP_HDR_SIZE) >> PAGE_SHIFT,
+                               pHeap->paPages,
+                               "Heap", ppHeapGC);
     if (RT_SUCCESS(rc))
     {
@@ -851 +865 @@
         /* Reserve a page for fencing. */
         MMR3HyperReserve(pVM, PAGE_SIZE, "fence", NULL);
+
+        /* We won't need these any more. */
+        MMR3HeapFree(pHeap->paPages);
+        pHeap->paPages = NULL;
     }
     return rc;

trunk/src/VBox/VMM/MMInternal.h

@@ -281 +281 @@
     uint32_t                u32Padding0;
 #endif
+    /** The heap physical pages. */
+    R3PTRTYPE(PSUPPAGE)     paPages;
+#if HC_ARCH_BITS == 32
+    /** Padding the structure to a 64-bit aligned size. */
+    uint32_t                u32Padding1;
+#endif
 } MMHYPERHEAP;
 /** Pointer to the hypervisor heap. */

trunk/src/VBox/VMM/MMPagePool.cpp

@@ -68 +68 @@
      *        ring-0. Need to change the wasy we allocate it... */
     AssertReleaseReturn(sizeof(*pVM->mm.s.pPagePoolR3) + sizeof(*pVM->mm.s.pPagePoolLowR3) < PAGE_SIZE, VERR_INTERNAL_ERROR);
-    int rc = SUPPageAllocLocked(1, (void **)&pVM->mm.s.pPagePoolR3);
+    int rc = SUPPageAllocLockedEx(1, (void **)&pVM->mm.s.pPagePoolR3, NULL);
     if (RT_FAILURE(rc))
         return rc;

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -677 +677 @@
     if (RT_SUCCESS(rc))
     {
+        memset(pvPages, 0, cPages * PAGE_SIZE);
+
         /*
          * Create the MMIO2 range record for it.