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

Timestamp:

Jul 9, 2012 6:04:54 AM (13 years ago)

Author:

vboxsync

Message:

VMM/HWVMXR0: Fix for acquiring/signaling new ASIDs during host CPU suspend/resumes.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HWACCMR0.cpp (modified) (2 diffs)
• VMMR0/HWVMXR0.cpp (modified) (9 diffs)
• include/HWACCMInternal.h (modified) (3 diffs)

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

@@ -867 +867 @@
     pCpu->uCurrentASID  = 0;    /* we'll aways increment this the first time (host uses ASID 0) */
     pCpu->cTLBFlushes   = 0;
+    pCpu->fASIDState    = true;
 
     /* Should never happen */
@@ -1239 +1240 @@
         pVCpu->hwaccm.s.idLastCpu           = NIL_RTCPUID;
 
-        /* we'll aways increment this the first time (host uses ASID 0) */
+        /* We'll aways increment this the first time (host uses ASID 0) */
         pVCpu->hwaccm.s.uCurrentASID        = 0;
     }

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->uCurrentASID = 0;
+    pCpu->fASIDState = !pCpu->fASIDState;
 
     return VINF_SUCCESS;
@@ -2401 +2401 @@
     if (   pVCpu->hwaccm.s.idLastCpu != pCpu->idCpu
         || pVCpu->hwaccm.s.cTLBFlushes != pCpu->cTLBFlushes
-        || pCpu->uCurrentASID == 0)
+        || pVCpu->hwaccm.s.fASIDState != pCpu->fASIDState)
     {
         pVCpu->hwaccm.s.fForceTLBFlush = true;
@@ -2452 +2452 @@
         }
 
+        pVCpu->hwaccm.s.fASIDState     = pCpu->fASIDState;
         pVCpu->hwaccm.s.cTLBFlushes    = pCpu->cTLBFlushes;
         pVCpu->hwaccm.s.fForceTLBFlush = false;
@@ -2458 +2459 @@
     {
         AssertMsg(pVCpu->hwaccm.s.uCurrentASID && pCpu->uCurrentASID,
-                  ("hwaccm->uCurrentASID=%lu hwaccm->cTLBFlushes=%lu cpu->uCurrentASID=%lu cpu->cTLBFlushes=%lu\n",
+                  ("hwaccm->uCurrentASID=%lu hwaccm->cTLBFlushes=%lu cpu->uCurrentASID=%lu cpu->cTLBFlushes=%lu"
+                   "hwaccm->fASIDState=%d cpu->fASIDState=%d\n",
                    pVCpu->hwaccm.s.uCurrentASID, pVCpu->hwaccm.s.cTLBFlushes,
-                   pCpu->uCurrentASID, pCpu->cTLBFlushes));
+                   pCpu->uCurrentASID, pCpu->cTLBFlushes, pVCpu->hwaccm.s.fASIDState, pCpu->fASIDState));
 
         /** @todo We never set VMCPU_FF_TLB_SHOOTDOWN anywhere so this path should
@@ -2527 +2529 @@
     if (   pVCpu->hwaccm.s.idLastCpu != pCpu->idCpu
         || pVCpu->hwaccm.s.cTLBFlushes != pCpu->cTLBFlushes
-        || pCpu->uCurrentASID == 0)
+        || pVCpu->hwaccm.s.fASIDState != pCpu->fASIDState)
     {
         pVCpu->hwaccm.s.fForceTLBFlush = true;
@@ -2540 +2542 @@
     pVCpu->hwaccm.s.idLastCpu   = pCpu->idCpu;
     pVCpu->hwaccm.s.cTLBFlushes = pCpu->cTLBFlushes;
+    pVCpu->hwaccm.s.fASIDState  = pCpu->fASIDState;
 
     if (pVCpu->hwaccm.s.fForceTLBFlush)
@@ -2593 +2596 @@
     if (   pVCpu->hwaccm.s.idLastCpu != pCpu->idCpu
         || pVCpu->hwaccm.s.cTLBFlushes != pCpu->cTLBFlushes
-        || pCpu->uCurrentASID == 0)
+        || pVCpu->hwaccm.s.fASIDState != pCpu->fASIDState)
     {
         /* Force a TLB flush on VM entry. */
@@ -2622 +2625 @@
         pVCpu->hwaccm.s.cTLBFlushes    = pCpu->cTLBFlushes;
         pVCpu->hwaccm.s.uCurrentASID   = pCpu->uCurrentASID;
+        pVCpu->hwaccm.s.fASIDState     = pCpu->fASIDState;
         if (pCpu->fFlushASIDBeforeUse)
             hmR0VmxFlushVPID(pVM, pVCpu, pVM->hwaccm.s.vmx.enmFlushVPID, 0 /* GCPtr */);
@@ -2627 +2631 @@
     else
     {
-        Assert(pVCpu->hwaccm.s.uCurrentASID && pCpu->uCurrentASID);
+        AssertMsg(pVCpu->hwaccm.s.uCurrentASID && pCpu->uCurrentASID,
+                  ("hwaccm->uCurrentASID=%lu hwaccm->cTLBFlushes=%lu cpu->uCurrentASID=%lu cpu->cTLBFlushes=%lu"
+                   "hwaccm->fASIDState=%d cpu->fASIDState=%d\n",
+                   pVCpu->hwaccm.s.uCurrentASID, pVCpu->hwaccm.s.cTLBFlushes,
+                   pCpu->uCurrentASID, pCpu->cTLBFlushes, pVCpu->hwaccm.s.fASIDState, pCpu->fASIDState));
 
         /** @todo We never set VMCPU_FF_TLB_SHOOTDOWN anywhere so this path should

trunk/src/VBox/VMM/include/HWACCMInternal.h

@@ -149 +149 @@
     /** TLB flush count. */
     uint32_t            cTLBFlushes;
-
     /** Whether to flush each new ASID/VPID before use. */
     bool                fFlushASIDBeforeUse;
-
     /** Configured for VT-x or AMD-V. */
     bool                fConfigured;
-
     /** Set if the VBOX_HWVIRTEX_IGNORE_SVM_IN_USE hack is active. */
     bool                fIgnoreAMDVInUseError;
-
     /** In use by our code. (for power suspend) */
     volatile bool       fInUse;
+    /** Toggle bit for signaling new ASIDs (during suspend/resume)  */
+    bool                fASIDState;
 } HMGLOBLCPUINFO;
 /** Pointer to the per-cpu global information. */
@@ -548 +546 @@
     bool                        fForceTLBFlush;
 
+    /** Toggle bit for acquiring a new ASID (during host CPU suspend/resume) */
+    bool                        fASIDState;
+
     /** Set when we're using VT-x or AMD-V at that moment. */
     bool                        fActive;
@@ -553 +554 @@
     /** Set when the TLB has been checked until we return from the world switch. */
     volatile bool               fCheckedTLBFlush;
-    uint8_t                     bAlignment[3];
+    uint8_t                     bAlignment[2];
 
     /** World switch exit counter. */