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

Timestamp:

Jul 6, 2012 4:17:50 AM (13 years ago)

Author:

vboxsync

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

78928

Message:

VMM/HWVMXR0: Fix guru meditation on resume with VPIDs.

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (4 diffs)

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

@@ -166 +166 @@
      * Ensure each VCPU scheduled on this CPU gets a new VPID on resume. See @bugref{6255}.
      */
-    pCpu->cTLBFlushes++;
+    pCpu->uCurrentASID = 0;
 
     return VINF_SUCCESS;
@@ -2399 +2399 @@
      */
     bool fNewASID = false;
-    if (    pVCpu->hwaccm.s.idLastCpu != pCpu->idCpu
-        ||  pVCpu->hwaccm.s.cTLBFlushes != pCpu->cTLBFlushes)
+    if (   pVCpu->hwaccm.s.idLastCpu != pCpu->idCpu
+        || pVCpu->hwaccm.s.cTLBFlushes != pCpu->cTLBFlushes
+        || pCpu->uCurrentASID == 0)
     {
         pVCpu->hwaccm.s.fForceTLBFlush = true;
@@ -2524 +2525 @@
      * If the TLB flush count shouldn't really change in this EPT-only case.
      */
-    if (    pVCpu->hwaccm.s.idLastCpu != pCpu->idCpu
-        ||  pVCpu->hwaccm.s.cTLBFlushes != pCpu->cTLBFlushes)
+    if (   pVCpu->hwaccm.s.idLastCpu != pCpu->idCpu
+        || pVCpu->hwaccm.s.cTLBFlushes != pCpu->cTLBFlushes
+        || pCpu->uCurrentASID == 0)
     {
         pVCpu->hwaccm.s.fForceTLBFlush = true;
@@ -2589 +2591 @@
      * so we cannot reuse the current ASID anymore.
      */
-    if (    pVCpu->hwaccm.s.idLastCpu != pCpu->idCpu
-        ||  pVCpu->hwaccm.s.cTLBFlushes != pCpu->cTLBFlushes)
+    if (   pVCpu->hwaccm.s.idLastCpu != pCpu->idCpu
+        || pVCpu->hwaccm.s.cTLBFlushes != pCpu->cTLBFlushes
+        || pCpu->uCurrentASID == 0)
     {
         /* Force a TLB flush on VM entry. */