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

Timestamp:

Jun 4, 2009 1:14:37 PM (16 years ago)

Author:

vboxsync

Message:

Shadow page mode exit fix for AMD-V nested paging. (not called with type nested)

Location:

trunk/src/VBox/VMM

Files:

• PGMShw.h (modified) (2 diffs)
• VMMAll/PGMAllMap.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PGMShw.h

@@ -229 +229 @@
 PGM_SHW_DECL(int, Exit)(PVMCPU pVCpu)
 {
-#if PGM_SHW_TYPE == PGM_TYPE_NESTED || PGM_SHW_TYPE == PGM_TYPE_EPT
-    if (pVCpu->pgm.s.CTX_SUFF(pShwPageCR3))
+    PVM pVM = pVCpu->pVMR3;
+
+    if (    HWACCMIsNestedPagingActive(pVM)
+        &&  pVCpu->pgm.s.CTX_SUFF(pShwPageCR3))
     {
-        PVM      pVM   = pVCpu->pVMR3;
         PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
 
@@ -246 +247 @@
         pVCpu->pgm.s.iShwUser      = 0;
         pVCpu->pgm.s.iShwUserTable = 0;
+
+        Log(("Leave nested shadow paging mode\n"));
     }
-    Log(("Leave nested shadow paging mode\n"));
-#endif
-    return VINF_SUCCESS;
-}
-
-
-
+    return VINF_SUCCESS;
+}
+
+
+

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

@@ -221 +221 @@
     Log4(("pgmMapSetShadowPDEs new pde %x (mappings enabled %d)\n", iNewPDE, pgmMapAreMappingsEnabled(&pVM->pgm.s)));
 
-    if (    !pgmMapAreMappingsEnabled(&pVM->pgm.s)
-        ||  pVM->cCPUs > 1)
+    if (!pgmMapAreMappingsEnabled(&pVM->pgm.s))
         return;
 
@@ -389 +388 @@
     Log(("pgmMapClearShadowPDEs: old pde %x (cPTs=%x) (mappings enabled %d) fDeactivateCR3=%RTbool\n", iOldPDE, pMap->cPTs, pgmMapAreMappingsEnabled(&pVM->pgm.s), fDeactivateCR3));
 
-    if (    !pgmMapAreMappingsEnabled(&pVM->pgm.s)
-        ||  pVM->cCPUs > 1)
+    if (!pgmMapAreMappingsEnabled(&pVM->pgm.s))
         return;
 
@@ -633 +631 @@
      * Can skip this if mappings are disabled.
      */
-    if (    !pgmMapAreMappingsEnabled(&pVM->pgm.s)
-        ||  pVM->cCPUs > 1)
+    if (!pgmMapAreMappingsEnabled(&pVM->pgm.s))
         return VINF_SUCCESS;
 
@@ -669 +666 @@
      * Can skip this if mappings are disabled.
      */
-    if (    !pgmMapAreMappingsEnabled(&pVM->pgm.s)
-        ||  pVM->cCPUs > 1)
+    if (!pgmMapAreMappingsEnabled(&pVM->pgm.s))
         return VINF_SUCCESS;