Changeset 43466 in vbox

Timestamp:

Sep 28, 2012 2:47:29 PM (12 years ago)

Author:

vboxsync

Message:

VMM: HM bits.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/HMAll.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (5 diffs)
• VMMR3/HM.cpp (modified) (1 diff)
• include/HMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/HMAll.cpp

@@ -305 +305 @@
 
             if (idThisCpu == idCpu)
+            {
+                /** @todo r=ramshankar: Intel does not support flushing by guest physical
+                 *        address either. See comment in VMXR0InvalidatePhysPage(). Fix this. */
                 VMXR0InvalidatePhysPage(pVM, pVCpu, GCPhys);
+            }
             else
             {

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

@@ -2513 +2513 @@
             pVCpu->hm.s.uCurrentASID = pCpu->uCurrentASID;
             if (pCpu->fFlushASIDBeforeUse)
-            {
                 hmR0VmxFlushVPID(pVM, pVCpu, pVM->hm.s.vmx.enmFlushVPID, 0 /* GCPtr */);
-#ifdef VBOX_WITH_STATISTICS
-                STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushASID);
-#endif
-            }
         }
         else
@@ -2526 +2521 @@
             else
                 hmR0VmxFlushEPT(pVM, pVCpu, pVM->hm.s.vmx.enmFlushEPT);
-
-#ifdef VBOX_WITH_STATISTICS
-            /*
-             * This is not terribly accurate (i.e. we don't have any StatFlushEPT counter). We currently count these
-             * as ASID flushes too, better than including them under StatFlushTLBWorldSwitch.
-             */
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushASID);
-#endif
         }
 
@@ -2698 +2685 @@
             pCpu->fFlushASIDBeforeUse        = true;
         }
-        else
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushASID);
 
         pVCpu->hm.s.fForceTLBFlush = false;
@@ -5011 +4996 @@
     int rc = VMXR0InvEPT(enmFlush, &descriptor[0]);
     AssertMsg(rc == VINF_SUCCESS, ("VMXR0InvEPT %x %RGv failed with %d\n", enmFlush, pVCpu->hm.s.vmx.GCPhysEPTP, rc));
+#ifdef VBOX_WITH_STATISTICS
+    STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushNP);
+#endif
 }
 
@@ -5046 +5034 @@
     AssertMsg(rc == VINF_SUCCESS,
               ("VMXR0InvVPID %x %x %RGv failed with %d\n", enmFlush, pVCpu ? pVCpu->hm.s.uCurrentASID : 0, GCPtr, rc));
+#ifdef VBOX_WITH_STATISTICS
+    if (pVCpu)
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushASID);
+#endif
 }
 

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

@@ -557 +557 @@
         HM_REG_COUNTER(&pVCpu->hm.s.StatNoFlushTLBWorldSwitch,  "/HM/CPU%d/Flush/TLB/Skipped");
         HM_REG_COUNTER(&pVCpu->hm.s.StatFlushASID,              "/HM/CPU%d/Flush/TLB/ASID");
+        HM_REG_COUNTER(&pVCpu->hm.s.StatFlushNP,                "/HM/CPU%d/Flush/TLB/NP");
         HM_REG_COUNTER(&pVCpu->hm.s.StatFlushTLBInvlpga,        "/HM/CPU%d/Flush/TLB/PhysInvl");
         HM_REG_COUNTER(&pVCpu->hm.s.StatTlbShootdown,           "/HM/CPU%d/Flush/Shootdown/Page");

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

@@ -828 +828 @@
     STAMCOUNTER             StatFlushTLBCRxChange;
     STAMCOUNTER             StatFlushASID;
+    STAMCOUNTER             StatFlushNP;
     STAMCOUNTER             StatFlushTLBInvlpga;
     STAMCOUNTER             StatTlbShootdown;