Changeset 41205 in vbox for trunk/src

Timestamp:

May 8, 2012 1:01:09 PM (13 years ago)

Author:

vboxsync

Message:

VMM/VMMR0/HWVMXR0: VPID optimization+fix: use VPIDs without flushing whenever possible (VPID, VPID+EPT). Fixes incorrect flushing of old VPID (VPID-only).

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HWVMXR0.cpp (modified) (6 diffs)
• include/HWACCMInternal.h (modified) (1 diff)

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

@@ -137 +137 @@
         return VERR_VMX_VMXON_FAILED;
     }
+
+    /*
+     * Flush all VPIDs (in case we or anyother hypervisor have been using VPIDs) so that
+     * we can avoid an explicit flush while using new VPIDs.
+     */
+    if (   pVM
+        && pVM->hwaccm.s.vmx.fVPID
+        && (pVM->hwaccm.s.vmx.msr.vmx_eptcaps & MSR_IA32_VMX_EPT_CAPS_INVVPID_CAPS_ALL_CONTEXTS))
+    {
+        hmR0VmxFlushVPID(pVM, NULL /* pvCpu */, VMX_FLUSH_VPID_ALL_CONTEXTS, 0 /* GCPtr */);
+        pCpu->fFlushASIDBeforeUse = false;
+    }
+    else
+        pCpu->fFlushASIDBeforeUse = true;
+
     return VINF_SUCCESS;
 }
@@ -2207 +2222 @@
                 pCpu->uCurrentASID = 1;       /* start at 1; host uses 0 */
                 pCpu->cTLBFlushes++;
+                pCpu->fFlushASIDBeforeUse = true;
             }
 
             pVCpu->hwaccm.s.uCurrentASID = pCpu->uCurrentASID;
-            hmR0VmxFlushVPID(pVM, pVCpu, pVM->hwaccm.s.vmx.enmFlushVPID, 0 /* GCPtr */);
+            if (pCpu->fFlushASIDBeforeUse)
+                hmR0VmxFlushVPID(pVM, pVCpu, pVM->hwaccm.s.vmx.enmFlushVPID, 0 /* GCPtr */);
         }
         else
+        {
+            /** @todo is it better to flush by EPT or VPID here? find out which is less
+             *        expensive. */
             hmR0VmxFlushEPT(pVM, pVCpu, pVM->hwaccm.s.vmx.enmFlushEPT);
+        }
 
         pVCpu->hwaccm.s.cTLBFlushes    = pCpu->cTLBFlushes;
@@ -2363 +2384 @@
     if (pVCpu->hwaccm.s.fForceTLBFlush)
     {
-        if (    ++pCpu->uCurrentASID >= pVM->hwaccm.s.uMaxASID
+        ++pCpu->uCurrentASID;
+        if (    pCpu->uCurrentASID >= pVM->hwaccm.s.uMaxASID
             ||  pCpu->fFlushTLB)
         {
@@ -2369 +2391 @@
             pCpu->uCurrentASID               = 1;       /* start at 1; host uses 0 */
             pCpu->cTLBFlushes++;
-            hmR0VmxFlushVPID(pVM, pVCpu, pVM->hwaccm.s.vmx.enmFlushVPID, 0 /* GCPtr */);
+            pCpu->fFlushASIDBeforeUse        = true;
         }
         else
@@ -2377 +2399 @@
         pVCpu->hwaccm.s.cTLBFlushes    = pCpu->cTLBFlushes;
         pVCpu->hwaccm.s.uCurrentASID   = pCpu->uCurrentASID;
+        if (pCpu->fFlushASIDBeforeUse)
+            hmR0VmxFlushVPID(pVM, pVCpu, pVM->hwaccm.s.vmx.enmFlushVPID, 0 /* GCPtr */);
     }
     else
@@ -2410 +2434 @@
     int rc  = VMXWriteVMCS(VMX_VMCS16_GUEST_FIELD_VPID, pVCpu->hwaccm.s.uCurrentASID);
     AssertRC(rc);
-
-    if (pVCpu->hwaccm.s.fForceTLBFlush)
-        hmR0VmxFlushVPID(pVM, pVCpu, pVM->hwaccm.s.vmx.enmFlushVPID, 0 /* GCPtr */);
 
 # ifdef VBOX_WITH_STATISTICS

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

@@ -165 +165 @@
     /** TLB flush count. */
     uint32_t            cTLBFlushes;
+
+    /** Whether to flush each new ASID/VPID before use. */
+    bool                fFlushASIDBeforeUse;
 
     /** Set the first time a cpu is used to make sure we start with a clean TLB. */