Changeset 25935 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jan 20, 2010 2:43:56 PM (15 years ago)

Author:

vboxsync

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

56774

Message:

PGM,CPUM: Be more careful and flexible with guest mappings on restore. (#4362)

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (7 diffs)
• PGMAllBth.h (modified) (5 diffs)
• PGMAllMap.cpp (modified) (7 diffs)

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

@@ -723 +723 @@
      * Check for conflicts and pending CR3 monitoring updates.
      */
-    if (!pVM->pgm.s.fMappingsFixed)
+    if (pgmMapAreMappingsFloating(&pVM->pgm.s))
     {
         if (    pgmGetMapping(pVM, GCPtrPage)
@@ -763 +763 @@
     {
         pVCpu->pgm.s.fSyncFlags &= ~PGM_SYNC_MONITOR_CR3;
-        Assert(!pVM->pgm.s.fMappingsFixed);
+        Assert(!pVM->pgm.s.fMappingsFixed); Assert(!pVM->pgm.s.fMappingsDisabled);
     }
 
@@ -1690 +1690 @@
         if (RT_LIKELY(rc == VINF_SUCCESS))
         {
-            if (!pVM->pgm.s.fMappingsFixed)
-            {
+            if (pgmMapAreMappingsFloating(&pVM->pgm.s))
                 pVCpu->pgm.s.fSyncFlags &= ~PGM_SYNC_MONITOR_CR3;
-            }
         }
         else
@@ -1701 +1699 @@
             pVCpu->pgm.s.GCPhysCR3 = GCPhysOldCR3;
             pVCpu->pgm.s.fSyncFlags |= PGM_SYNC_MAP_CR3;
-            if (!pVM->pgm.s.fMappingsFixed)
+            if (pgmMapAreMappingsFloating(&pVM->pgm.s))
                 pVCpu->pgm.s.fSyncFlags |= PGM_SYNC_MONITOR_CR3;
         }
@@ -1727 +1725 @@
         {
             pVCpu->pgm.s.fSyncFlags &= ~PGM_SYNC_MONITOR_CR3;
-            Assert(!pVM->pgm.s.fMappingsFixed);
+            Assert(!pVM->pgm.s.fMappingsFixed); Assert(!pVM->pgm.s.fMappingsDisabled);
         }
         if (fGlobal)
@@ -1764 +1762 @@
 
     /* We assume we're only called in nested paging mode. */
-    Assert(pVM->pgm.s.fMappingsFixed);
+    Assert(HWACCMIsNestedPagingActive(pVM) || pVCpu->pgm.s.enmShadowMode == PGMMODE_EPT);
+    Assert(pVM->pgm.s.fMappingsDisabled);
     Assert(!(pVCpu->pgm.s.fSyncFlags & PGM_SYNC_MONITOR_CR3));
-    Assert(HWACCMIsNestedPagingActive(pVM) || pVCpu->pgm.s.enmShadowMode == PGMMODE_EPT);
 
     /*
@@ -1911 +1909 @@
         {
             pVCpu->pgm.s.fSyncFlags &= ~PGM_SYNC_MONITOR_CR3;
-            Assert(!pVM->pgm.s.fMappingsFixed);
+            Assert(!pVM->pgm.s.fMappingsFixed); Assert(!pVM->pgm.s.fMappingsDisabled);
         }
     }

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -291 +291 @@
                  * The first thing we check is if we've got an undetected conflict.
                  */
-                if (!pVM->pgm.s.fMappingsFixed)
+                if (pgmMapAreMappingsFloating(&pVM->pgm.s))
                 {
                     unsigned iPT = pMapping->cb >> GST_PD_SHIFT;
@@ -2599 +2599 @@
 #  endif
     }
-# else  /* PGM_WITHOUT_MAPPINGS */
-    Assert(!pgmMapAreMappingsEnabled(&pVM->pgm.s));
-# endif /* PGM_WITHOUT_MAPPINGS */
+# endif /* !PGM_WITHOUT_MAPPINGS */
     Assert(!PdeDst.n.u1Present); /* We're only supposed to call SyncPT on PDE!P and conflicts.*/
 
@@ -3449 +3447 @@
     STAM_PROFILE_STOP(&pVCpu->pgm.s.CTX_MID_Z(Stat,SyncCR3Handlers), h);
     pgmUnlock(pVM);
-#endif
+#endif /* !NESTED && !EPT */
 
 #if PGM_SHW_TYPE == PGM_TYPE_NESTED || PGM_SHW_TYPE == PGM_TYPE_EPT
@@ -3457 +3455 @@
     /** @todo check if this is really necessary; the call does it as well... */
     HWACCMFlushTLB(pVCpu);
+    Assert(!pgmMapAreMappingsEnabled(&pVM->pgm.s));
     return VINF_SUCCESS;
 
@@ -3464 +3463 @@
      * out the shadow parts when the guest modifies its tables.
      */
+    Assert(!pgmMapAreMappingsEnabled(&pVM->pgm.s));
     return VINF_SUCCESS;
 
 #else /* PGM_SHW_TYPE != PGM_TYPE_NESTED && PGM_SHW_TYPE != PGM_TYPE_EPT && PGM_SHW_TYPE != PGM_TYPE_AMD64 */
 
-#  ifdef PGM_WITHOUT_MAPPINGS
-    Assert(pVM->pgm.s.fMappingsFixed);
-    return VINF_SUCCESS;
+#  ifndef PGM_WITHOUT_MAPPINGS
+    /*
+     * Check for and resolve conflicts with our guest mappings if they
+     * are enabled and not fixed.
+     */
+    if (pgmMapAreMappingsFloating(&pVM->pgm.s))
+    {
+        int rc = pgmMapResolveConflicts(pVM);
+        Assert(rc == VINF_SUCCESS || rc == VINF_PGM_SYNC_CR3);
+        if (rc == VINF_PGM_SYNC_CR3)
+        {
+            LogFlow(("SyncCR3: detected conflict -> VINF_PGM_SYNC_CR3\n"));
+            return VINF_PGM_SYNC_CR3;
+        }
+    }
 #  else
-    /* Nothing to do when mappings are fixed. */
-    if (pVM->pgm.s.fMappingsFixed)
-        return VINF_SUCCESS;
-
-    int rc = PGMMapResolveConflicts(pVM);
-    Assert(rc == VINF_SUCCESS || rc == VINF_PGM_SYNC_CR3);
-    if (rc == VINF_PGM_SYNC_CR3)
-    {
-        LogFlow(("SyncCR3: detected conflict -> VINF_PGM_SYNC_CR3\n"));
-        return VINF_PGM_SYNC_CR3;
-    }
+    Assert(!pgmMapAreMappingsEnabled(&pVM->pgm.s));
 #  endif
     return VINF_SUCCESS;

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

@@ -389 +389 @@
     Log(("pgmMapClearShadowPDEs: old pde %x (cPTs=%x) (mappings enabled %d) fDeactivateCR3=%RTbool\n", iOldPDE, pMap->cPTs, pgmMapAreMappingsEnabled(&pVM->pgm.s), fDeactivateCR3));
 
+    /*
+     * Skip this if disabled or if it doesn't apply.
+     */
     if (    !pgmMapAreMappingsEnabled(&pVM->pgm.s)
         ||  pVM->cCpus > 1)
@@ -602 +605 @@
         return;
 
+    /* This only applies to raw mode where we only support 1 VCPU. */
     Assert(pVM->cCpus == 1);
-
-    /* This only applies to raw mode where we only support 1 VCPU. */
     PVMCPU pVCpu = VMMGetCpu0(pVM);
     Assert(pVCpu->pgm.s.CTX_SUFF(pShwPageCR3));
@@ -633 +635 @@
 {
     /*
-     * Can skip this if mappings are disabled.
+     * Skip this if disabled or if it doesn't apply.
      */
     if (    !pgmMapAreMappingsEnabled(&pVM->pgm.s)
@@ -639 +641 @@
         return VINF_SUCCESS;
 
-    /* Note. A log flush (in RC) can cause problems when called from MapCR3 (inconsistent state will trigger assertions). */
-    Log4(("pgmMapActivateCR3: fixed mappings=%d idxShwPageCR3=%#x\n", pVM->pgm.s.fMappingsFixed, pShwPageCR3 ? pShwPageCR3->idx : NIL_PGMPOOL_IDX));
+    /* Note! This might not be logged successfully in RC because we usually
+             cannot flush the log at this point. */
+    Log4(("pgmMapActivateCR3: fixed mappings=%RTbool idxShwPageCR3=%#x\n", pVM->pgm.s.fMappingsFixed, pShwPageCR3 ? pShwPageCR3->idx : NIL_PGMPOOL_IDX));
 
 #ifdef VBOX_STRICT
@@ -669 +672 @@
 {
     /*
-     * Can skip this if mappings are disabled.
+     * Skip this if disabled or if it doesn't apply.
      */
     if (    !pgmMapAreMappingsEnabled(&pVM->pgm.s)
@@ -702 +705 @@
      * Can skip this if mappings are safely fixed.
      */
-    if (pVM->pgm.s.fMappingsFixed)
+    if (!pgmMapAreMappingsFloating(&pVM->pgm.s))
         return false;
 
@@ -788 +791 @@
 
 /**
- * Checks and resolves (ring 3 only) guest conflicts with VMM GC mappings.
+ * Checks and resolves (ring 3 only) guest conflicts with the guest mappings.
  *
  * @returns VBox status.
  * @param   pVM                 The virtual machine.
  */
-VMMDECL(int) PGMMapResolveConflicts(PVM pVM)
-{
-    /*
-     * Can skip this if mappings are safely fixed.
-     */
-    if (pVM->pgm.s.fMappingsFixed)
-        return VINF_SUCCESS;
-
+int pgmMapResolveConflicts(PVM pVM)
+{
+    /* The caller is expected to check these two conditions. */
+    Assert(!pVM->pgm.s.fMappingsFixed);
+    Assert(!pVM->pgm.s.fMappingsDisabled);
+
+    /* This only applies to raw mode where we only support 1 VCPU. */
     Assert(pVM->cCpus == 1);
-
-    /* This only applies to raw mode where we only support 1 VCPU. */
-    PVMCPU pVCpu = &pVM->aCpus[0];
-
-    PGMMODE const enmGuestMode = PGMGetGuestMode(pVCpu);
+    PVMCPU          pVCpu        = &pVM->aCpus[0];
+    PGMMODE const   enmGuestMode = PGMGetGuestMode(pVCpu);
     Assert(enmGuestMode <= PGMMODE_PAE_NX);