Changeset 11474 in vbox

Timestamp:

Aug 19, 2008 8:11:20 AM (17 years ago)

Author:

vboxsync

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

34951

Message:

AMD-V: Corrected current asid handling. (multiple VMs could end up using each other's ASID)

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (1 diff)
• VMMInternal.h (modified) (1 diff)
• VMMR0/HWSVMR0.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -274 +274 @@
         /* TLB flush count */
         uint32_t                    cTLBFlushes;
+
+        /* Current ASID in use by the VM */
+        uint32_t                    uCurrentASID;
 
         /** R0 memory object for the VM control block (VMCB). */

trunk/src/VBox/VMM/VMMInternal.h

@@ -88 +88 @@
     uint32_t                    u32Alignment;
 #endif
-    /** The ring-0 logger instance. This extends beyon the size.*/
+    /** The ring-0 logger instance. This extends beyond the size.*/
     RTLOGGER                    Logger;
 } VMMR0LOGGER, *PVMMR0LOGGER;

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

@@ -196 +196 @@
 
     /* Invalidate the last cpu we were running on. */
-    pVM->hwaccm.s.svm.idLastCpu = NIL_RTCPUID;
+    pVM->hwaccm.s.svm.idLastCpu    = NIL_RTCPUID;
+
+    /* we'll aways increment this the first time (host uses ASID 0) */
+    pVM->hwaccm.s.svm.uCurrentASID = 0;
     return VINF_SUCCESS;
 }
@@ -951 +954 @@
             STAM_COUNTER_INC(&pVM->hwaccm.s.StatFlushASID);
 
-        pVM->hwaccm.s.svm.cTLBFlushes = pCpu->cTLBFlushes;
+        pVM->hwaccm.s.svm.cTLBFlushes  = pCpu->cTLBFlushes;
+        pVM->hwaccm.s.svm.uCurrentASID = pCpu->uCurrentASID;
     }
     else
@@ -959 +963 @@
         /* We never increase uCurrentASID in the fAlwaysFlushTLB (erratum 170) case. */
         if (!pCpu->uCurrentASID)
-            pCpu->uCurrentASID = 1;
+            pVM->hwaccm.s.svm.uCurrentASID = pCpu->uCurrentASID = 1;
 
         pVMCB->ctrl.TLBCtrl.n.u1TLBFlush = pVM->hwaccm.s.svm.fForceTLBFlush;
@@ -965 +969 @@
     AssertMsg(pVM->hwaccm.s.svm.cTLBFlushes == pCpu->cTLBFlushes, ("Flush count mismatch for cpu %d (%x vs %x)\n", pCpu->idCpu, pVM->hwaccm.s.svm.cTLBFlushes, pCpu->cTLBFlushes));
     AssertMsg(pCpu->uCurrentASID >= 1 && pCpu->uCurrentASID < pVM->hwaccm.s.svm.u32MaxASID, ("cpu%d uCurrentASID = %x\n", pCpu->idCpu, pCpu->uCurrentASID));
-    pVMCB->ctrl.TLBCtrl.n.u32ASID = pCpu->uCurrentASID;
+    AssertMsg(pVM->hwaccm.s.svm.uCurrentASID >= 1 && pVM->hwaccm.s.svm.uCurrentASID < pVM->hwaccm.s.svm.u32MaxASID, ("cpu%d VM uCurrentASID = %x\n", pCpu->idCpu, pVM->hwaccm.s.svm.uCurrentASID));
+    pVMCB->ctrl.TLBCtrl.n.u32ASID = pVM->hwaccm.s.svm.uCurrentASID;
 
 #ifdef VBOX_WITH_STATISTICS
@@ -1920 +1925 @@
     Assert(pVM->hwaccm.s.svm.fSupported);
 
-    LogFlow(("SVMR0Enter cpu%d last=%d asid=%d\n", pCpu->idCpu, pVM->hwaccm.s.svm.idLastCpu, pCpu->uCurrentASID));
+    LogFlow(("SVMR0Enter cpu%d last=%d asid=%d\n", pCpu->idCpu, pVM->hwaccm.s.svm.idLastCpu, pVM->hwaccm.s.svm.uCurrentASID));
     pVM->hwaccm.s.svm.fResumeVM = false;