Changeset 49003 in vbox

Timestamp:

Oct 9, 2013 1:36:17 PM (11 years ago)

Author:

vboxsync

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

89730

Message:

VMM/HMVMXR0, HMSVMR0: Comment out unused code paths in TLB shootdown.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (2 diffs)
• HMVMXR0.cpp (modified) (8 diffs)

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

@@ -927 +927 @@
         pVCpu->hm.s.fForceTLBFlush = false;
     }
+    /** @todo We never set VMCPU_FF_TLB_SHOOTDOWN anywhere so this path should
+     *        not be executed. See hmQueueInvlPage() where it is commented
+     *        out. Support individual entry flushing someday. */
+#if 0
     else
     {
-        /** @todo We never set VMCPU_FF_TLB_SHOOTDOWN anywhere so this path should
-         *        not be executed. See hmQueueInvlPage() where it is commented
-         *        out. Support individual entry flushing someday. */
         if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TLB_SHOOTDOWN))
         {
@@ -938 +939 @@
             for (uint32_t i = 0; i < pVCpu->hm.s.TlbShootdown.cPages; i++)
                 SVMR0InvlpgA(pVCpu->hm.s.TlbShootdown.aPages[i], pVmcb->ctrl.TLBCtrl.n.u32ASID);
-        }
-    }
-
-    pVCpu->hm.s.TlbShootdown.cPages = 0;
-    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TLB_SHOOTDOWN);
+
+            pVCpu->hm.s.TlbShootdown.cPages = 0;
+            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TLB_SHOOTDOWN);
+        }
+    }
+#endif
+
 
     /* Update VMCB with the ASID. */

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

@@ -1313 +1313 @@
 
     VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TLB_FLUSH);
+
+    /** @todo TLB shootdown is currently not used. See hmQueueInvlPage(). */
+#if 0
     VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TLB_SHOOTDOWN);
-
     pVCpu->hm.s.TlbShootdown.cPages = 0;
+#endif
+
     pVCpu->hm.s.idLastCpu           = pCpu->idCpu;
     pVCpu->hm.s.cTlbFlushes         = pCpu->cTlbFlushes;
@@ -1402 +1406 @@
     }
 
-    /** @todo We never set VMCPU_FF_TLB_SHOOTDOWN anywhere so this path should
-     *        not be executed. See hmQueueInvlPage() where it is commented
-     *        out. Support individual entry flushing someday. */
+    /** @todo We never set VMCPU_FF_TLB_SHOOTDOWN anywhere. See hmQueueInvlPage()
+     *        where it is commented out. Support individual entry flushing
+     *        someday. */
+#if 0
     if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TLB_SHOOTDOWN))
     {
@@ -1423 +1428 @@
         HMVMX_SET_TAGGED_TLB_FLUSHED();
         VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TLB_SHOOTDOWN);
-    }
-
-    pVCpu->hm.s.TlbShootdown.cPages = 0;
+        pVCpu->hm.s.TlbShootdown.cPages = 0;
+    }
+#endif
+
     pVCpu->hm.s.fForceTLBFlush = false;
 
@@ -1491 +1497 @@
         pVCpu->hm.s.fForceTLBFlush = false;
     }
+    /** @todo We never set VMCPU_FF_TLB_SHOOTDOWN anywhere. See hmQueueInvlPage()
+     *        where it is commented out. Support individual entry flushing
+     *        someday. */
+#if 0
     else
     {
-        /** @todo We never set VMCPU_FF_TLB_SHOOTDOWN anywhere so this path should
-         *        not be executed. See hmQueueInvlPage() where it is commented
-         *        out. Support individual entry flushing someday. */
         if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TLB_SHOOTDOWN))
         {
@@ -1504 +1511 @@
         else
             STAM_COUNTER_INC(&pVCpu->hm.s.StatNoFlushTlbWorldSwitch);
-    }
-
-    pVCpu->hm.s.TlbShootdown.cPages = 0;
-    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TLB_SHOOTDOWN);
+
+        pVCpu->hm.s.TlbShootdown.cPages = 0;
+        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TLB_SHOOTDOWN);
+    }
+#endif
 }
 
@@ -1570 +1578 @@
             hmR0VmxFlushVpid(pVM, pVCpu, pVM->hm.s.vmx.enmFlushVpid, 0 /* GCPtr */);
     }
+    /** @todo We never set VMCPU_FF_TLB_SHOOTDOWN anywhere. See hmQueueInvlPage()
+     *        where it is commented out. Support individual entry flushing
+     *        someday. */
+#if 0
     else
     {
@@ -1577 +1589 @@
                    pCpu->uCurrentAsid, pCpu->cTlbFlushes));
 
-        /** @todo We never set VMCPU_FF_TLB_SHOOTDOWN anywhere so this path should
-         *        not be executed. See hmQueueInvlPage() where it is commented
-         *        out. Support individual entry flushing someday. */
         if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TLB_SHOOTDOWN))
         {
@@ -1590 +1599 @@
             else
                 hmR0VmxFlushVpid(pVM, pVCpu, pVM->hm.s.vmx.enmFlushVpid, 0 /* GCPtr */);
+
+            pVCpu->hm.s.TlbShootdown.cPages = 0;
+            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TLB_SHOOTDOWN);
         }
         else
             STAM_COUNTER_INC(&pVCpu->hm.s.StatNoFlushTlbWorldSwitch);
     }
-
-    pVCpu->hm.s.TlbShootdown.cPages = 0;
-    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TLB_SHOOTDOWN);
+#endif
 
     AssertMsg(pVCpu->hm.s.cTlbFlushes == pCpu->cTlbFlushes,