Changeset 16889 in vbox for trunk

Timestamp:

Feb 18, 2009 10:53:14 AM (16 years ago)

Author:

vboxsync

Message:

PGMR3HasMappingConflicts -> PGMHasMappingConflicts. Prepare for resolving conflicts there too.

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (2 diffs)
• src/VBox/VMM/EM.cpp (modified) (2 diffs)
• src/VBox/VMM/PGMMap.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllMap.cpp (modified) (1 diff)

trunk/include/VBox/pgm.h

@@ -331 +331 @@
 VMMDECL(int)        PGMMapActivateAll(PVM pVM);
 VMMDECL(int)        PGMMapDeactivateAll(PVM pVM);
+VMMDECL(bool)       PGMMapHasConflicts(PVM pVM, uint64_t cr3, bool fResolveConflicts);
 
 VMMDECL(int)        PGMShwGetPage(PVM pVM, RTGCPTR GCPtr, uint64_t *pfFlags, PRTHCPHYS pHCPhys);
@@ -549 +550 @@
 VMMR3DECL(int)      PGMR3MappingsDisable(PVM pVM);
 VMMR3DECL(int)      PGMR3MapIntermediate(PVM pVM, RTUINTPTR Addr, RTHCPHYS HCPhys, unsigned cbPages);
-VMMR3DECL(bool)     PGMR3MapHasConflicts(PVM pVM, uint64_t cr3, bool fRawR0);
 VMMR3DECL(int)      PGMR3MapRead(PVM pVM, void *pvDst, RTGCPTR GCPtrSrc, size_t cb);
 

trunk/src/VBox/VMM/EM.cpp

@@ -2607 +2607 @@
                   ("Tried to execute code with IF at EIP=%08x!\n", pCtx->eip));
         if (    !VM_FF_ISPENDING(pVM, VM_FF_PGM_SYNC_CR3 | VM_FF_PGM_SYNC_CR3_NON_GLOBAL)
-            &&  PGMR3MapHasConflicts(pVM, pCtx->cr3, pVM->fRawR0Enabled))
+            &&  PGMMapHasConflicts(pVM, pCtx->cr3, false))
         {
             AssertMsgFailed(("We should not get conflicts any longer!!!\n"));
@@ -2720 +2720 @@
          */
         if (    !VM_FF_ISPENDING(pVM, VM_FF_PGM_SYNC_CR3 | VM_FF_PGM_SYNC_CR3_NON_GLOBAL)
-            &&  PGMR3MapHasConflicts(pVM, pCtx->cr3, pVM->fRawR0Enabled))
+            &&  PGMMapHasConflicts(pVM, pCtx->cr3, false))
         {
             AssertMsgFailed(("We should not get conflicts any longer!!!\n"));

trunk/src/VBox/VMM/PGMMap.cpp

@@ -1303 +1303 @@
 }
 
-
-/**
- * Checks guest PD for conflicts with VMM GC mappings.
- *
- * @returns true if conflict detected.
- * @returns false if not.
- * @param   pVM         The virtual machine.
- * @param   cr3         Guest context CR3 register.
- * @param   fRawR0      Whether RawR0 is enabled or not.
- */
-VMMR3DECL(bool) PGMR3MapHasConflicts(PVM pVM, uint64_t cr3, bool fRawR0) /** @todo how many HasConflict constructs do we really need? */
-{
-    /*
-     * Can skip this if mappings are safely fixed.
-     */
-    if (pVM->pgm.s.fMappingsFixed)
-        return false;
-
-    PGMMODE const enmGuestMode = PGMGetGuestMode(pVM);
-    Assert(enmGuestMode <= PGMMODE_PAE_NX);
-
-    /*
-     * Iterate mappings.
-     */
-    if (enmGuestMode == PGMMODE_32_BIT)
-    {
-        /*
-         * Resolve the page directory.
-         */
-        PX86PD pPD = pVM->pgm.s.pGst32BitPdR3;
-        Assert(pPD);
-        Assert(pPD == (PX86PD)PGMPhysGCPhys2R3PtrAssert(pVM, cr3 & X86_CR3_PAGE_MASK, sizeof(*pPD)));
-
-        for (PPGMMAPPING pCur = pVM->pgm.s.pMappingsR3; pCur; pCur = pCur->pNextR3)
-        {
-            unsigned iPDE = pCur->GCPtr >> X86_PD_SHIFT;
-            unsigned iPT = pCur->cPTs;
-            while (iPT-- > 0)
-                if (    pPD->a[iPDE + iPT].n.u1Present /** @todo PGMGstGetPDE. */
-                    &&  (fRawR0 || pPD->a[iPDE + iPT].n.u1User))
-                {
-                    STAM_COUNTER_INC(&pVM->pgm.s.StatR3DetectedConflicts);
-                    Log(("PGMR3HasMappingConflicts: Conflict was detected at %08RX32 for mapping %s (32 bits)\n"
-                         "                          iPDE=%#x iPT=%#x PDE=%RGp.\n",
-                        (iPT + iPDE) << X86_PD_SHIFT, pCur->pszDesc,
-                        iPDE, iPT, pPD->a[iPDE + iPT].au32[0]));
-                    return true;
-                }
-        }
-    }
-    else if (   enmGuestMode == PGMMODE_PAE
-             || enmGuestMode == PGMMODE_PAE_NX)
-    {
-        for (PPGMMAPPING pCur = pVM->pgm.s.pMappingsR3; pCur; pCur = pCur->pNextR3)
-        {
-            RTGCPTR   GCPtr = pCur->GCPtr;
-
-            unsigned  iPT = pCur->cb >> X86_PD_PAE_SHIFT;
-            while (iPT-- > 0)
-            {
-                X86PDEPAE Pde = pgmGstGetPaePDE(&pVM->pgm.s, GCPtr);
-
-                if (   Pde.n.u1Present
-                    && (fRawR0 || Pde.n.u1User))
-                {
-                    STAM_COUNTER_INC(&pVM->pgm.s.StatR3DetectedConflicts);
-                    Log(("PGMR3HasMappingConflicts: Conflict was detected at %RGv for mapping %s (PAE)\n"
-                         "                          PDE=%016RX64.\n",
-                        GCPtr, pCur->pszDesc, Pde.u));
-                    return true;
-                }
-                GCPtr += (1 << X86_PD_PAE_SHIFT);
-            }
-        }
-    }
-    else
-        AssertFailed();
-
-    return false;
-}
-
 /**
  * Read memory from the guest mappings.

trunk/src/VBox/VMM/VMMAll/PGMAllMap.cpp

@@ -524 +524 @@
 #endif /* IN_RING0 */
 }
+
+/**
+ * Checks guest PD for conflicts with VMM GC mappings.
+ *
+ * @returns true if conflict detected.
+ * @returns false if not.
+ * @param   pVM                 The virtual machine.
+ * @param   cr3                 Guest context CR3 register.
+ * @param   fResolveConflicts   Whether to resolve found conflicts or not (only valid in ring 3)
+ */
+VMMDECL(bool) PGMMapHasConflicts(PVM pVM, uint64_t cr3, bool fResolveConflicts)
+{
+    /*
+     * Can skip this if mappings are safely fixed.
+     */
+    if (pVM->pgm.s.fMappingsFixed)
+        return false;
+
+    PGMMODE const enmGuestMode = PGMGetGuestMode(pVM);
+    Assert(enmGuestMode <= PGMMODE_PAE_NX);
+
+    /*
+     * Iterate mappings.
+     */
+    if (enmGuestMode == PGMMODE_32_BIT)
+    {
+        /*
+         * Resolve the page directory.
+         */
+        PX86PD pPD = pVM->pgm.s.CTX_SUFF(pGst32BitPd);
+        Assert(pPD);
+        Assert(pPD == (PX86PD)PGMPhysGCPhys2R3PtrAssert(pVM, cr3 & X86_CR3_PAGE_MASK, sizeof(*pPD)));
+
+        for (PPGMMAPPING pCur = pVM->pgm.s.CTX_SUFF(pMappings); pCur; pCur = pCur->CTX_SUFF(pNext))
+        {
+            unsigned iPDE = pCur->GCPtr >> X86_PD_SHIFT;
+            unsigned iPT = pCur->cPTs;
+            while (iPT-- > 0)
+                if (    pPD->a[iPDE + iPT].n.u1Present /** @todo PGMGstGetPDE. */
+                    &&  (pVM->fRawR0Enabled || pPD->a[iPDE + iPT].n.u1User))
+                {
+                    STAM_COUNTER_INC(&pVM->pgm.s.StatR3DetectedConflicts);
+                    Log(("PGMHasMappingConflicts: Conflict was detected at %08RX32 for mapping %s (32 bits)\n"
+                         "                        iPDE=%#x iPT=%#x PDE=%RGp.\n",
+                        (iPT + iPDE) << X86_PD_SHIFT, pCur->pszDesc,
+                        iPDE, iPT, pPD->a[iPDE + iPT].au32[0]));
+                    return true;
+                }
+        }
+    }
+    else if (   enmGuestMode == PGMMODE_PAE
+             || enmGuestMode == PGMMODE_PAE_NX)
+    {
+        for (PPGMMAPPING pCur = pVM->pgm.s.CTX_SUFF(pMappings); pCur; pCur = pCur->CTX_SUFF(pNext))
+        {
+            RTGCPTR   GCPtr = pCur->GCPtr;
+
+            unsigned  iPT = pCur->cb >> X86_PD_PAE_SHIFT;
+            while (iPT-- > 0)
+            {
+                X86PDEPAE Pde = pgmGstGetPaePDE(&pVM->pgm.s, GCPtr);
+
+                if (   Pde.n.u1Present
+                    && (pVM->fRawR0Enabled || Pde.n.u1User))
+                {
+                    STAM_COUNTER_INC(&pVM->pgm.s.StatR3DetectedConflicts);
+                    Log(("PGMHasMappingConflicts: Conflict was detected at %RGv for mapping %s (PAE)\n"
+                         "                        PDE=%016RX64.\n",
+                        GCPtr, pCur->pszDesc, Pde.u));
+                    return true;
+                }
+                GCPtr += (1 << X86_PD_PAE_SHIFT);
+            }
+        }
+    }
+    else
+        AssertFailed();
+
+    return false;
+}