Changeset 41223 in vbox for trunk/src

Timestamp:

May 9, 2012 9:57:35 AM (13 years ago)

Author:

vboxsync

Message:

VMM/VMMR0/HWVMXR0: minor cleanups.

File:

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

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

@@ -139 +139 @@
 
     /*
-     * 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.
+     * Flush all VPIDs (in case we or any other hypervisor have been using VPIDs) so that
+     * we can avoid an explicit flush while using new VPIDs. We would still need to flush
+     * each time while reusing a VPID after hitting the MaxASID limit once.
      */
     if (   pVM
@@ -391 +392 @@
     AssertReturn(pVM, VERR_INVALID_PARAMETER);
 
-    /* Initialize these always.*/
+    /* Initialize these always, see hwaccmR3InitFinalizeR0().*/
     pVM->hwaccm.s.vmx.enmFlushEPT  = VMX_FLUSH_EPT_NONE;
     pVM->hwaccm.s.vmx.enmFlushVPID = VMX_FLUSH_VPID_NONE;
@@ -4567 +4568 @@
         else
         {
+            AssertPtr(pVCpu);
             Assert(pVCpu->hwaccm.s.uCurrentASID != 0);
             descriptor[0] = pVCpu->hwaccm.s.uCurrentASID;
@@ -4572 +4574 @@
         }
         int rc = VMXR0InvVPID(enmFlush, &descriptor[0]); NOREF(rc);
-        AssertMsg(rc == VINF_SUCCESS, ("VMXR0InvVPID %x %x %RGv failed with %d\n", enmFlush, pVCpu->hwaccm.s.uCurrentASID, GCPtr, rc));
+        AssertMsg(rc == VINF_SUCCESS,
+                  ("VMXR0InvVPID %x %x %RGv failed with %d\n", enmFlush, pVCpu ? pVCpu->hwaccm.s.uCurrentASID : 0, GCPtr, rc));
     }
 }
@@ -4619 +4622 @@
 /**
  * Invalidates a guest page by physical address. Only relevant for EPT/VPID,
- * otherwise ther eis nothing really to invalidate.
+ * otherwise there is nothing really to invalidate.
  *
  * NOTE: Assumes the current instruction references this physical page though a virtual address!!
@@ -4630 +4633 @@
 VMMR0DECL(int) VMXR0InvalidatePhysPage(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys)
 {
-    bool fFlushPending = VMCPU_FF_ISSET(pVCpu, VMCPU_FF_TLB_FLUSH);
-
     LogFlow(("VMXR0InvalidatePhysPage %RGp\n", GCPhys));