Changeset 29424 in vbox for trunk/src/VBox/VMM/PGMSharedPage.cpp

Timestamp:

May 12, 2010 3:11:09 PM (15 years ago)

Author:

vboxsync

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

61539

Message:

Shared paging updates

File:

• trunk/src/VBox/VMM/PGMSharedPage.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PGMSharedPage.cpp

@@ -35 +35 @@
 #include <iprt/mem.h>
 
-
-#ifdef VBOX_WITH_PAGE_SHARING
-/**
- * Rendezvous callback that will be called once.
- *
- * @returns VBox strict status code.
- * @param   pVM                 VM handle.
- * @param   pVCpu               The VMCPU handle for the calling EMT.
- * @param   pvUser              PGMMREGISTERSHAREDMODULEREQ
- */
-static DECLCALLBACK(VBOXSTRICTRC) pgmR3SharedModuleRegRendezvous(PVM pVM, PVMCPU pVCpu, void *pvUser)
-{
-    PGMMREGISTERSHAREDMODULEREQ pReq = (PGMMREGISTERSHAREDMODULEREQ)pvUser;
-
-    return VMMR3CallR0(pVM, VMMR0_DO_PGM_CHECK_SHARED_MODULE, 0, &pReq->Hdr);
-}
-
-/**
- * Shared module registration helper (called on the way out).
- *
- * @param   pVM         The VM handle.
- * @param   pReq        Registration request info
- */
-static DECLCALLBACK(void) pgmR3SharedModuleRegisterHelper(PVM pVM, PGMMREGISTERSHAREDMODULEREQ pReq)
-{
-    int rc;
-    
-    rc = GMMR3RegisterSharedModule(pVM, pReq);
-    Assert(rc == VINF_SUCCESS || rc == VINF_PGM_SHARED_MODULE_COLLISION || rc == VINF_PGM_SHARED_MODULE_ALREADY_REGISTERED);
-    if (rc == VINF_PGM_SHARED_MODULE_ALREADY_REGISTERED)
-    {
-        PVMCPU   pVCpu = VMMGetCpu(pVM);
-        unsigned cFlushedPages = 0;
-
-        /** todo count copy-on-write actions in the trap handler so we don't have to check everything all the time! */
-
-        /* Count the number of shared pages that were changed (copy-on-write). */
-        for (unsigned i = 0; i < pReq->cRegions; i++)
-        {
-            Assert((pReq->aRegions[i].cbRegion & 0xfff) == 0);
-            Assert((pReq->aRegions[i].GCRegionAddr & 0xfff) == 0);
-
-            RTGCPTR GCRegion  = pReq->aRegions[i].GCRegionAddr;
-            uint32_t cbRegion = pReq->aRegions[i].cbRegion & ~0xfff;
-
-            while (cbRegion)
-            {
-                RTGCPHYS GCPhys;
-                uint64_t fFlags;
-
-                rc = PGMGstGetPage(pVCpu, GCRegion, &fFlags, &GCPhys);
-                if (    rc == VINF_SUCCESS
-                    &&  !(fFlags & X86_PTE_RW))
-                {
-                    PPGMPAGE pPage = pgmPhysGetPage(&pVM->pgm.s, GCPhys);
-                    if (    pPage
-                        &&  !PGM_PAGE_IS_SHARED(pPage))
-                    {
-                        cFlushedPages++;
-                    }
-                }
-
-                GCRegion += PAGE_SIZE;
-                cbRegion -= PAGE_SIZE;
-            }
-        }
-
-        if (cFlushedPages > 32)
-            rc = VINF_SUCCESS;  /* force recheck below */
-    }
-    /* Full (re)check needed? */
-    if (rc == VINF_SUCCESS)
-    {
-        pReq->Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-        pReq->Hdr.cbReq = RT_OFFSETOF(GMMREGISTERSHAREDMODULEREQ, aRegions[pReq->cRegions]);
-
-        /* We must stall other VCPUs as we'd otherwise have to send IPI flush commands for every single change we make. */
-        rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONCE, pgmR3SharedModuleRegRendezvous, pReq);
-        AssertRC(rc);
-    }
-    RTMemFree(pReq);
-    return;
-}
-#endif
 
 /**
@@ -161 +77 @@
     }
 
-    /* Queue the actual registration as we are under the IOM lock right now. Perform this operation on the way out. */
-    return VMR3ReqCallNoWait(pVM, VMMGetCpuId(pVM), (PFNRT)pgmR3SharedModuleRegisterHelper, 2, pVM, pReq);
+    int rc = GMMR3RegisterSharedModule(pVM, pReq);
+    RTMemFree(pReq);
+    Assert(rc == VINF_SUCCESS || rc == VINF_PGM_SHARED_MODULE_COLLISION || rc == VINF_PGM_SHARED_MODULE_ALREADY_REGISTERED);
+    if (RT_FAILURE(rc))
+        return rc;
+    return VINF_SUCCESS;
 #else
     return VERR_NOT_IMPLEMENTED;
 #endif
 }
-
-
-#ifdef VBOX_WITH_PAGE_SHARING
-/**
- * Shared module unregistration helper (called on the way out).
- *
- * @param   pVM         The VM handle.
- * @param   pReq        Unregistration request info
- */
-static DECLCALLBACK(void) pgmR3SharedModuleUnregisterHelper(PVM pVM, PGMMREGISTERSHAREDMODULEREQ pReq)
-{
-    int rc;
-    
-    rc = GMMR3UnregisterSharedModule(pVM, pReq);
-    RTMemFree(pReq);
-    return;
-}
-#endif
 
 /**
@@ -212 +114 @@
         ||  RTStrCopy(pReq->szVersion, sizeof(pReq->szVersion), pszVersion) != VINF_SUCCESS)
     {
+        RTMemFree(pReq);
         return VERR_BUFFER_OVERFLOW;
     }
-    /* Queue the actual registration as we are under the IOM lock right now. Perform this operation on the way out. */
-    return VMR3ReqCallNoWait(pVM, VMMGetCpuId(pVM), (PFNRT)pgmR3SharedModuleUnregisterHelper, 2, pVM, pReq);
+    int rc = GMMR3UnregisterSharedModule(pVM, pReq);
+    RTMemFree(pReq);
+    return rc;
 #else 
     return VERR_NOT_IMPLEMENTED;
 #endif
 }
+
+#ifdef VBOX_WITH_PAGE_SHARING
+/**
+ * Rendezvous callback that will be called once.
+ *
+ * @returns VBox strict status code.
+ * @param   pVM                 VM handle.
+ * @param   pVCpu               The VMCPU handle for the calling EMT.
+ * @param   pvUser              Not used;
+ */
+static DECLCALLBACK(VBOXSTRICTRC) pgmR3SharedModuleRegRendezvous(PVM pVM, PVMCPU pVCpu, void *pvUser)
+{
+    return GMMR3CheckSharedModules(pVM);
+}
+
+/**
+ * Shared module unregistration helper (called on the way out).
+ *
+ * @param   pVM         The VM handle.
+ */
+static DECLCALLBACK(void) pgmR3CheckSharedModulesHelper(PVM pVM)
+{   
+    /* We must stall other VCPUs as we'd otherwise have to send IPI flush commands for every single change we make. */
+    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONCE, pgmR3SharedModuleRegRendezvous, NULL);
+    AssertRC(rc);
+}
+#endif
+
+/**
+ * Check all registered modules for changes.
+ *
+ * @returns VBox status code.
+ * @param   pVM                 VM handle
+ */
+VMMR3DECL(int) PGMR3SharedModuleCheckAll(PVM pVM)
+{
+#ifdef VBOX_WITH_PAGE_SHARING
+    /* Queue the actual registration as we are under the IOM lock right now. Perform this operation on the way out. */
+    return VMR3ReqCallNoWait(pVM, VMMGetCpuId(pVM), (PFNRT)pgmR3CheckSharedModulesHelper, 1, pVM);
+#else 
+    return VERR_NOT_IMPLEMENTED;
+#endif
+}