Changeset 29091 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

May 5, 2010 4:12:10 PM (15 years ago)

Author:

vboxsync

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

61150

Message:

More updates

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GMMR0.cpp (modified) (4 diffs)
• PGMR0.cpp (modified) (1 diff)
• VMMR0.cpp (modified) (1 diff)

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

@@ -3399 +3399 @@
     if (GMM_CHECK_SANITY_UPON_ENTERING(pGMM))
     {
+        bool fNewModule = false;
+
         /* Check if this module is already locally registered. */
         PGMMSHAREDMODULEPERVM pRecVM = (PGMMSHAREDMODULEPERVM)RTAvlGCPtrGet(&pGVM->gmm.s.pSharedModuleTree, GCBaseAddr);
@@ -3415 +3417 @@
             bool ret = RTAvlGCPtrInsert(&pGVM->gmm.s.pSharedModuleTree, &pRecVM->Core);
             Assert(ret);
+
+            fNewModule = true;
         }
         else
@@ -3423 +3427 @@
         if (!pRec)
         {
-            Assert(rc != VINF_PGM_SHARED_MODULE_ALREADY_REGISTERED);
+            Assert(fNewModule);
             Assert(!pRecVM->fCollision);
 
@@ -3466 +3470 @@
                 pRecVM->pSharedModule = pRec;
                 pRecVM->fCollision    = false;
-                pRec->cUsers++;
+                if (fNewModule)
+                    pRec->cUsers++;
                 rc = VINF_SUCCESS;
             }

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

@@ -300 +300 @@
 }
 
+#ifdef VBOX_WITH_PAGE_SHARING
+/**
+ * Check a registered module for shared page changes
+ *
+ * @returns The following VBox status codes.
+ *
+ * @param   pVM         The VM handle.
+ * @param   pVCpu       The VMCPU handle.
+ * @param   pReq        Module request packet
+ */
+VMMR0DECL(int) PGMR0SharedModuleCheck(PVM pVM, PVMCPU pVCpu, PGMMREGISTERSHAREDMODULEREQ pReq)
+{
+    int rc = VINF_SUCCESS;
+
+    /*
+     * Validate input.
+     */
+    AssertPtrReturn(pReq, VERR_INVALID_POINTER);
+    AssertMsgReturn(pReq->Hdr.cbReq >= sizeof(*pReq) && pReq->Hdr.cbReq == RT_UOFFSETOF(GMMREGISTERSHAREDMODULEREQ, aRegions[pReq->cRegions]), ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(*pReq)), VERR_INVALID_PARAMETER);
+
+    pgmLock(pVM);
+
+    /* Check every region of the shared module. */
+    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, &GCPhys, &fFlags);
+            if (    rc == VINF_SUCCESS
+                &&  !(fFlags & X86_PTE_RW))
+            {
+                PPGMPAGE pPage = pgmPhysGetPage(&pVM->pgm.s, GCPhys);
+                if (    pPage
+                    &&  !PGM_PAGE_IS_SHARED(pPage))
+                {
+                }
+            }
+
+            GCRegion += PAGE_SIZE;
+            cbRegion -= PAGE_SIZE;
+        }
+    }
+
+    pgmUnlock(pVM);
+    return rc;
+}
+#endif

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

@@ -877 +877 @@
             return PGMR0PhysAllocateLargeHandyPage(pVM, &pVM->aCpus[idCpu]);
 
+#ifdef VBOX_WITH_PAGE_SHARING
+        case VMMR0_DO_PGM_CHECK_SHARED_MODULE:
+        {
+            if (idCpu == NIL_VMCPUID)
+                return VERR_INVALID_CPU_ID;
+
+            PVMCPU pVCpu = &pVM->aCpus[idCpu];
+
+            /* Select a valid VCPU context. */
+            ASMAtomicWriteU32(&pVCpu->idHostCpu, RTMpCpuId());
+
+            int rc = PGMR0SharedModuleCheck(pVM, pVCpu, (PGMMREGISTERSHAREDMODULEREQ)pReqHdr);
+
+            /* Clear the VCPU context. */
+            ASMAtomicWriteU32(&pVCpu->idHostCpu, NIL_RTCPUID);
+            return rc;
+        }
+#endif
+
         /*
          * GMM wrappers.