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

Timestamp:

May 6, 2010 11:49:48 AM (15 years ago)

Author:

vboxsync

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

61205

Message:

Shared paging updates

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GMMR0.cpp (modified) (4 diffs)
• GMMR0Internal.h (modified) (3 diffs)
• PGMR0.cpp (modified) (4 diffs)

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

@@ -3414 +3414 @@
 
             pRecVM->Core.Key = GCBaseAddr;
+            pRecVM->cRegions = cRegions;
+            for (unsigned i = 0; i < cRegions; i++)
+            {
+                pRecVM->aRegions[i].GCRegionAddr      = pRegions[i].GCRegionAddr;
+                pRecVM->aRegions[i].cbRegion          = pRegions[i].cbRegion;
+                pRecVM->aRegions[i].u32Alignment      = 0;
+                pRecVM->aRegions[i].paHCPhysAndPageID = 0; /* uninitialized. */
+            }
 
             bool ret = RTAvlGCPtrInsert(&pGVM->gmm.s.pSharedModuleTree, &pRecVM->Core);
@@ -3448 +3456 @@
 
             for (unsigned i = 0; i < cRegions; i++)
-                pRec->aRegions[i] = pRegions[i];
+            {
+                pRec->aRegions[i].GCRegionAddr      = pRegions[i].GCRegionAddr;
+                pRec->aRegions[i].cbRegion          = pRegions[i].cbRegion;
+                pRec->aRegions[i].u32Alignment      = 0;
+                pRec->aRegions[i].paHCPhysAndPageID = 0; /* uninitialized. */
+            }
 
             /* Save reference. */
@@ -3553 +3566 @@
             goto end;
         }
-        PGMMSHAREDMODULE pRec = pRecVM->pSharedModule;
-        Assert(pRec);
-        Assert(pRec->cUsers);
-
-        pRec->cUsers--;
-        if (pRec->cUsers == 0)
-        {
-            /* @todo free shared pages. */
-            RTMemFree(pRec);
-        }
+        /* Force pRec to go out of scope after freeing it. */
+        {
+            PGMMSHAREDMODULE pRec = pRecVM->pSharedModule;
+            Assert(pRec);
+            Assert(pRec->cUsers);
+
+            pRec->cUsers--;
+            if (pRec->cUsers == 0)
+            {
+                /* @todo free shared pages. */
+                for (unsigned i = 0; i < pRec->cRegions; i++)
+                    if (pRec->aRegions[i].paHCPhysAndPageID)
+                        RTMemFree(pRec->aRegions[i].paHCPhysAndPageID);
+
+                RTMemFree(pRec);
+            }
+        }
+
+        for (unsigned i = 0; i < pRecVM->cRegions; i++)
+            if (pRecVM->aRegions[i].paHCPhysAndPageID)
+                RTMemFree(pRecVM->aRegions[i].paHCPhysAndPageID);
         RTMemFree(pRecVM);
 
@@ -3599 +3623 @@
 
 
+#ifdef VBOX_WITH_PAGE_SHARING
+/**
+ * Checks specified shared module range for changes
+ *
+ * @returns VBox status code.
+ * @param   pVM                 VM handle
+ * @param   idCpu               VCPU id
+ * @param   pReq                Module description
+ * @param   idxRegion           Region index
+ * @param   cPages              Number of entries in the paHCPhysAndPageID array
+ * @param   paHCPhysAndPageID   Host physical address and the Page ID array
+ */
+GMMR0DECL(int)  GMMR0SharedModuleCheckRange(PVM pVM, VMCPUID idCpu, PGMMREGISTERSHAREDMODULEREQ pReq, unsigned idxRegion, unsigned cPages, PRTHCPHYS paHCPhysAndPageID)
+{
+    AssertReturn(idxRegion < pReq->cRegions, VERR_INVALID_PARAMETER);
+    AssertReturn(cPages == (pReq->aRegions[idxRegion].cbRegion >> PAGE_SHIFT), VERR_INVALID_PARAMETER);
+
+    /*
+     * Validate input and get the basics.
+     */
+    PGMM pGMM;
+    GMM_GET_VALID_INSTANCE(pGMM, VERR_INTERNAL_ERROR);
+    PGVM pGVM;
+    int rc = GVMMR0ByVMAndEMT(pVM, idCpu, &pGVM);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /*
+     * Take the sempahore and do some more validations.
+     */
+    rc = RTSemFastMutexRequest(pGMM->Mtx);
+    AssertRC(rc);
+    if (GMM_CHECK_SANITY_UPON_ENTERING(pGMM))
+    {
+        PGMMSHAREDMODULEPERVM pRecVM = (PGMMSHAREDMODULEPERVM)RTAvlGCPtrGet(&pGVM->gmm.s.pSharedModuleTree, pReq->GCBaseAddr);
+        if (!pRecVM)
+        {
+            rc = VERR_PGM_SHARED_MODULE_NOT_FOUND;
+            goto end;
+        }
+
+        for (unsigned i = 0; i < cPages; i++)
+        {
+        }
+
+        GMM_CHECK_SANITY_UPON_LEAVING(pGMM);
+    }
+    else
+        rc = VERR_INTERNAL_ERROR_5;
+
+end:
+    RTSemFastMutexRelease(pGMM->Mtx);
+    return rc;
+}
+#endif
+
 /**
  * Checks registered modules for shared pages

trunk/src/VBox/VMM/VMMR0/GMMR0Internal.h

@@ -35 +35 @@
     uint32_t        cFixedPages;
 } GMMVMSIZES;
+/** Pointer to a GMMVMSIZES. */
 typedef GMMVMSIZES *PGMMVMSIZES;
 
+/**
+ * Shared region descriptor
+ */
+typedef struct GMMSHAREDREGIONDESC
+{
+    /** Region base address. */
+    RTGCPTR64           GCRegionAddr;
+    /** Region size. */
+    uint32_t            cbRegion;
+    /** Alignment. */
+    uint32_t            u32Alignment;
+    /** Pointer to physical page address array. */
+    PRTHCPHYS           paHCPhysAndPageID;
+} GMMSHAREDREGIONDESC;
+/** Pointer to a GMMSHAREDREGIONDESC. */
+typedef GMMSHAREDREGIONDESC *PGMMSHAREDREGIONDESC;
 
 /**
@@ -58 +75 @@
     char                        szVersion[GMM_SHARED_MODULE_MAX_VERSION_STRING];
     /** Shared region descriptor(s). */
-    VMMDEVSHAREDREGIONDESC      aRegions[1];
+    GMMSHAREDREGIONDESC         aRegions[1];
 } GMMSHAREDMODULE;
 /** Pointer to a GMMSHAREDMODULE. */
@@ -76 +93 @@
     /* Set if another VM registered a different shared module at the same base address. */
     bool                        fCollision;
+    /** Align at 8 byte boundary */
+    bool                        abAlignment[7];
 
+    /** Number of regions in the aRegions array. */
+    unsigned                    cRegions;
+
+    /** Shared region descriptor(s). */
+    GMMSHAREDREGIONDESC         aRegions[1];
 } GMMSHAREDMODULEPERVM;
 /** Pointer to a GMMSHAREDMODULEPERVM. */

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

@@ -27 +27 @@
 #include <VBox/err.h>
 #include <iprt/assert.h>
+#include <iprt/mem.h>
 
 RT_C_DECLS_BEGIN
@@ -313 +314 @@
 {
     int rc = VINF_SUCCESS;
+    PRTHCPHYS paHCPhysAndPageID = NULL;
+    uint32_t  cbPreviousRegion  = 0;
 
     /*
@@ -328 +331 @@
         Assert((pReq->aRegions[i].GCRegionAddr & 0xfff) == 0);
 
-        RTGCPTR GCRegion  = pReq->aRegions[i].GCRegionAddr;
-        uint32_t cbRegion = pReq->aRegions[i].cbRegion & ~0xfff;
+        RTGCPTR  GCRegion  = pReq->aRegions[i].GCRegionAddr;
+        unsigned cbRegion = pReq->aRegions[i].cbRegion & ~0xfff;
+        unsigned idxPage = 0;
+        bool     fValidChanges = false;
+
+        if (cbPreviousRegion < cbRegion)
+        {
+            if (paHCPhysAndPageID)
+                RTMemFree(paHCPhysAndPageID);
+
+            paHCPhysAndPageID = (PRTHCPHYS)RTMemAlloc((cbRegion << PAGE_SHIFT) * sizeof(*paHCPhysAndPageID));
+            if (!paHCPhysAndPageID)
+            {
+                AssertFailed();
+                rc = VERR_NO_MEMORY;
+                goto end;
+            }
+            cbPreviousRegion  = cbRegion;
+        }
 
         while (cbRegion)
@@ -344 +364 @@
                     &&  !PGM_PAGE_IS_SHARED(pPage))
                 {
+                    fValidChanges = true;
+                    paHCPhysAndPageID[idxPage] = pPage->HCPhysAndPageID;
                 }
+                else
+                    paHCPhysAndPageID[idxPage] = NIL_RTHCPHYS;
             }
-
+            else
+                paHCPhysAndPageID[idxPage] = NIL_RTHCPHYS;
+
+            idxPage++;
             GCRegion += PAGE_SIZE;
             cbRegion -= PAGE_SIZE;
         }
-    }
-
+
+        if (fValidChanges)
+        {
+            rc = GMMR0SharedModuleCheckRange(pVM, pVCpu->idCpu, pReq, i, idxPage, paHCPhysAndPageID);
+            AssertRC(rc);
+            if (RT_FAILURE(rc))
+                break;
+        }
+    }
+
+end:
     pgmUnlock(pVM);
+    if (paHCPhysAndPageID)
+        RTMemFree(paHCPhysAndPageID);
+
     return rc;
 }