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

Timestamp:

Feb 17, 2010 12:40:42 PM (15 years ago)

Author:

vboxsync

Message:

Large page work

Location:

trunk/src/VBox/VMM

Files:

• GMM.cpp (modified) (1 diff)
• PGMInternal.h (modified) (3 diffs)
• PGMPhys.cpp (modified) (1 diff)
• VMM.cpp (modified) (1 diff)
• VMMR0/GMMR0.cpp (modified) (4 diffs)
• VMMR0/PGMR0.cpp (modified) (1 diff)
• VMMR0/VMMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/GMM.cpp

@@ -315 +315 @@
 
 /**
- * @see GMMR0AllocateLargePage
- */
-GMMR3DECL(int)  GMMR3AllocateLargePage(PVM pVM,  uint32_t cbPage, uint32_t *pidPage, RTHCPHYS *pHCPhys)
-{
-    GMMALLOCLARGEPAGEREQ Req;
-    Req.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-    Req.Hdr.cbReq = sizeof(Req);
-    Req.cbPage = cbPage;
-    Req.idPage = NIL_GMM_PAGEID;
-    int rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_ALLOC_LARGE_PAGE, 0, &Req.Hdr);
-    if (RT_SUCCESS(rc) && pidPage)
-        *pidPage = Req.idPage;
-    
-    if (RT_SUCCESS(rc) && pHCPhys)
-        *pHCPhys = Req.HCPhys;
-    return rc;
-}
-
-/**
  * @see GMMR0FreeLargePage
  */

trunk/src/VBox/VMM/PGMInternal.h

@@ -612 +612 @@
      *  - [8-9]: u2HandlerVirtStateY - the virtual handler state
      *    (PGM_PAGE_HNDL_VIRT_STATE_*).
+     *  - [14]:  u1LargePage - flag indicating that it's part of a large (2 MB) page 
      *  - [15]:  fWrittenToY - flag indicating that a write monitored page was
      *    written to when set.
-     *  - [10-14]: 5 unused bits.
+     *  - [10-13]: 4 unused bits.
      * @remarks Warning! All accesses to the bits are hardcoded.
      *
@@ -813 +814 @@
 
 /**
- * Marks the paget as written to (for GMM change monitoring).
+ * Marks the page as written to (for GMM change monitoring).
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
@@ -831 +832 @@
 #define PGM_PAGE_IS_WRITTEN_TO(pPage)       ( !!((pPage)->u16MiscY.au8[1] & UINT8_C(0x80)) )
 
+/**
+ * Marks the page as part of a large continuous page
+ * @param   pPage       Pointer to the physical guest page tracking structure.
+ */
+#define PGM_PAGE_SET_LARGE_PAGE(pPage)      do { (pPage)->u16MiscY.au8[1] |= UINT8_C(0x40); } while (0)
+
+/**
+ * Clears the page as part of a large continuous page indicator.
+ * @param   pPage       Pointer to the physical guest page tracking structure.
+ */
+#define PGM_PAGE_CLEAR_LARGE_PAGE(pPage)    do { (pPage)->u16MiscY.au8[1] &= UINT8_C(0xbf); } while (0)
+
+/**
+ * Checks if the page was marked being part of a large page
+ * @returns true/false.
+ * @param   pPage       Pointer to the physical guest page tracking structure.
+ */
+#define PGM_PAGE_IS_LARGE_PAGE(pPage)       ( !!((pPage)->u16MiscY.au8[1] & UINT8_C(0x40)) )
 
 /** Enabled optimized access handler tests.

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -3174 +3174 @@
  * @param   pVM         The VM handle.
  */
-VMMR3DECL(int) PGMR3PhysAllocateLargePage(PVM pVM)
-{
-    int      rc = VINF_SUCCESS;
-    uint32_t idPage;
-    RTHCPHYS HCPhys;
-    void    *pvDummy;
-
+VMMR3DECL(int) PGMR3PhysAllocateLargeHandyPage(PVM pVM)
+{
     pgmLock(pVM);
 
-    rc = GMMR3AllocateLargePage(pVM, _2M, &idPage, &HCPhys);
+    int rc = VMMR3CallR0(pVM, VMMR0_DO_PGM_ALLOCATE_LARGE_HANDY_PAGE, 0, NULL);
     if (RT_SUCCESS(rc))
     {
-        /* Map the large page into our address space. */
-        rc = pgmPhysPageMapByPageID(pVM, idPage, HCPhys, &pvDummy);
+        Assert(pVM->pgm.s.cLargeHandyPages == 1);
+
+        uint32_t idPage = pVM->pgm.s.aLargeHandyPage[0].idPage;
+        RTHCPHYS HCPhys = pVM->pgm.s.aLargeHandyPage[0].HCPhysGCPhys;
+
+        /*
+         * Clear the pages.
+         */
+        for (unsigned i = 0; i < _2M/PAGE_SIZE; i++)
+        {
+            void *pv;
+
+            /* Map the large page into our address space. Could only fail the first time */
+            rc = pgmPhysPageMapByPageID(pVM, idPage, HCPhys, &pv);
+            AssertLogRelMsgBreak(RT_SUCCESS(rc), ("idPage=%#x HCPhysGCPhys=%RHp rc=%Rrc", idPage, HCPhys, rc));
+            ASMMemZeroPage(pv);
+            idPage++;
+            HCPhys += PAGE_SIZE;
+            Log3(("PGMR3PhysAllocateLargePage: idPage=%#x HCPhys=%RGp\n", idPage, HCPhys));
+        }
+        pVM->pgm.s.cLargeHandyPages = 0;
     }
 

trunk/src/VBox/VMM/VMM.cpp

@@ -2073 +2073 @@
          * Allocates a large page.
          */
-        case VMMCALLRING3_PGM_ALLOCATE_LARGE_PAGE:
-        {
-            pVCpu->vmm.s.rcCallRing3 = PGMR3PhysAllocateLargePage(pVM);
+        case VMMCALLRING3_PGM_ALLOCATE_LARGE_HANDY_PAGE:
+        {
+            pVCpu->vmm.s.rcCallRing3 = PGMR3PhysAllocateLargeHandyPage(pVM);
             break;
         }

trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

@@ -2290 +2290 @@
  * @param   idCpu           VCPU id
  * @param   cbPage          Large page size
- * @param   pidPage         Id of the page (out)
- * @param   HCPhys          Host physical address of the page (out)
- */
-GMMR0DECL(int)  GMMR0AllocateLargePage(PVM pVM, VMCPUID idCpu, uint32_t cbPage, uint32_t *pidPage, RTHCPHYS *pHCPhys)
+ */
+GMMR0DECL(int)  GMMR0AllocateLargePage(PVM pVM, VMCPUID idCpu, uint32_t cbPage, uint32_t *pIdPage, RTHCPHYS *pHCPhys)
 {
     LogFlow(("GMMR0AllocateLargePage: pVM=%p cbPage=%x\n", pVM, cbPage));
 
     AssertReturn(cbPage == GMM_CHUNK_SIZE, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pidPage, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pIdPage, VERR_INVALID_PARAMETER);
     AssertPtrReturn(pHCPhys, VERR_INVALID_PARAMETER);
 
@@ -2315 +2313 @@
         return VERR_NOT_SUPPORTED;
 
-    *pidPage = NIL_GMM_PAGEID;
     *pHCPhys = NIL_RTHCPHYS;
+    *pIdPage = NIL_GMM_PAGEID;
 
     rc = RTSemFastMutexRequest(pGMM->Mtx);
@@ -2348 +2346 @@
         gmmR0AllocatePage(pGMM, pGVM->hSelf, pChunk, &PageDesc);
         /* Return the first page as we'll use the whole chunk as one big page. */
-        *pidPage = PageDesc.idPage;
+        *pIdPage = PageDesc.idPage;
         *pHCPhys = PageDesc.HCPhysGCPhys;
 
@@ -2367 +2365 @@
     LogFlow(("GMMR0AllocatePages: returns %Rrc\n", rc));
     return rc;
-}
-
-
-/**
- * VMMR0 request wrapper for GMMR0AllocateLargePage.
- *
- * @returns see GMMR0AllocateLargePage.
- * @param   pVM             Pointer to the shared VM structure.
- * @param   idCpu           VCPU id
- * @param   pReq            The request packet.
- */
-GMMR0DECL(int) GMMR0AllocateLargePageReq(PVM pVM, VMCPUID idCpu, PGMMALLOCLARGEPAGEREQ pReq)
-{
-    /*
-     * Validate input and pass it on.
-     */
-    AssertPtrReturn(pVM, VERR_INVALID_POINTER);
-    AssertPtrReturn(pReq, VERR_INVALID_POINTER);
-    AssertMsgReturn(pReq->Hdr.cbReq == sizeof(GMMALLOCATEPAGESREQ),
-                    ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(GMMALLOCATEPAGESREQ)),
-                    VERR_INVALID_PARAMETER);
-
-    return GMMR0AllocateLargePage(pVM, idCpu, pReq->cbPage, &pReq->idPage, &pReq->HCPhys);
 }
 

trunk/src/VBox/VMM/VMMR0/PGMR0.cpp

@@ -164 +164 @@
 }
 
+/**
+ * Worker function for PGMR3PhysAllocateLargeHandyPage
+ *
+ * @returns The following VBox status codes.
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VINF_EM_NO_MEMORY if we're out of memory.
+ *
+ * @param   pVM         The VM handle.
+ * @param   pVCpu       The VMCPU handle.
+ *
+ * @remarks Must be called from within the PGM critical section. The caller
+ *          must clear the new pages.
+ */
+VMMR0DECL(int) PGMR0PhysAllocateLargeHandyPage(PVM pVM, PVMCPU pVCpu)
+{
+    Assert(PDMCritSectIsOwnerEx(&pVM->pgm.s.CritSect, pVCpu->idCpu));
+
+    Assert(!pVM->pgm.s.cLargeHandyPages);
+    int rc = GMMR0AllocateLargePage(pVM, pVCpu->idCpu, _2M, &pVM->pgm.s.aLargeHandyPage[0].idPage, &pVM->pgm.s.aLargeHandyPage[0].HCPhysGCPhys);
+    if (RT_SUCCESS(rc))
+        pVM->pgm.s.cLargeHandyPages = 1;
+
+    return rc;
+}
 
 /**

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -877 +877 @@
             return PGMR0PhysAllocateHandyPages(pVM, &pVM->aCpus[idCpu]);
 
+        case VMMR0_DO_PGM_ALLOCATE_LARGE_HANDY_PAGE:
+            if (idCpu == NIL_VMCPUID)
+                return VERR_INVALID_CPU_ID;
+            return PGMR0PhysAllocateLargeHandyPage(pVM, &pVM->aCpus[idCpu]);
+
         /*
          * GMM wrappers.
@@ -894 +899 @@
                 return VERR_INVALID_PARAMETER;
             return GMMR0AllocatePagesReq(pVM, idCpu, (PGMMALLOCATEPAGESREQ)pReqHdr);
-
-        case VMMR0_DO_GMM_ALLOC_LARGE_PAGE:
-            if (u64Arg)
-                return VERR_INVALID_PARAMETER;
-            return GMMR0AllocateLargePageReq(pVM, idCpu, (PGMMALLOCLARGEPAGEREQ)pReqHdr);
 
         case VMMR0_DO_GMM_FREE_PAGES: