Changeset 69914 in vbox

Timestamp:

Dec 4, 2017 5:22:55 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Flushing TLB in nested hw.virt fix.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (3 diffs)

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

@@ -884 +884 @@
 static void hmR0SvmFlushTaggedTlb(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMVMCB pVmcb)
 {
+#ifndef VBOX_WITH_NESTED_HWVIRT
+    RT_NOREF(pCtx);
+#endif
+
     PVM pVM               = pVCpu->CTX_SUFF(pVM);
     PHMGLOBALCPUINFO pCpu = hmR0GetCurrentCpu();
@@ -896 +900 @@
     Assert(pCpu->idCpu != NIL_RTCPUID);
     if (   pVCpu->hm.s.idLastCpu   != pCpu->idCpu
-        || pVCpu->hm.s.cTlbFlushes != pCpu->cTlbFlushes)
+        || pVCpu->hm.s.cTlbFlushes != pCpu->cTlbFlushes
+#ifdef VBOX_WITH_NESTED_HWVIRT
+        || CPUMIsGuestInSvmNestedHwVirtMode(pCtx)
+#endif
+        )
     {
         STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushTlbWorldSwitch);
@@ -902 +910 @@
         fNewAsid = true;
     }
-
-#ifdef VBOX_WITH_NESTED_HWVIRT
-    if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-        fNewAsid = true;
-#else
-    RT_NOREF(pCtx);
-#endif
 
     /* Set TLB flush state as checked until we return from the world switch. */