Changeset 41189 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

May 7, 2012 3:39:30 PM (13 years ago)

Author:

vboxsync

Message:

VMM/VMMR0/HWVMXR0: Implemented EPT+VPID TLB flushing before VM entry.

File:

• trunk/src/VBox/VMM/VMMR3/HWACCM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/HWACCM.cpp

@@ -1103 +1103 @@
             }
 
-#ifdef HWACCM_VTX_WITH_EPT
             if (pVM->hwaccm.s.vmx.msr.vmx_proc_ctls2.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC2_EPT)
                 pVM->hwaccm.s.fNestedPaging = pVM->hwaccm.s.fAllowNestedPaging;
-#endif /* HWACCM_VTX_WITH_EPT */
-#ifdef HWACCM_VTX_WITH_VPID
-            if (    (pVM->hwaccm.s.vmx.msr.vmx_proc_ctls2.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC2_VPID)
-                &&  !pVM->hwaccm.s.fNestedPaging)    /* VPID and EPT are mutually exclusive. */
+
+            if (pVM->hwaccm.s.vmx.msr.vmx_proc_ctls2.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC2_VPID)
                 pVM->hwaccm.s.vmx.fVPID = pVM->hwaccm.s.vmx.fAllowVPID;
-#endif /* HWACCM_VTX_WITH_VPID */
 
             /* Unrestricted guest execution relies on EPT. */
@@ -1212 +1208 @@
                     }
 #endif
+                    LogRel(("HWACCM: enmFlushEPT    %d\n", pVM->hwaccm.s.vmx.enmFlushEPT));
                 }
                 else
@@ -1217 +1214 @@
 
                 if (pVM->hwaccm.s.vmx.fVPID)
+                {
                     LogRel(("HWACCM: Enabled VPID\n"));
-
-                if (   pVM->hwaccm.s.fNestedPaging
-                    || pVM->hwaccm.s.vmx.fVPID)
-                {
-                    LogRel(("HWACCM: enmFlushPage    %d\n", pVM->hwaccm.s.vmx.enmFlushPage));
-                    LogRel(("HWACCM: enmFlushContext %d\n", pVM->hwaccm.s.vmx.enmFlushContext));
+                    LogRel(("HWACCM: enmFlushVPID   %d\n", pVM->hwaccm.s.vmx.enmFlushVPID));
                 }
+                else if (pVM->hwaccm.s.vmx.enmFlushVPID == VMX_FLUSH_VPID_NOT_SUPPORTED)
+                    LogRel(("HWACCM: Ignoring VPID capabilities of CPU.\n"));
 
                 /* TPR patching status logging. */