Changeset 69763 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Nov 20, 2017 4:36:39 AM (7 years ago)

Author:

vboxsync

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

119163

Message:

VMM/HMSVMR0: Nested Hw.virt: Force using a new ASID each time when executing the nested-guest.

File:

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

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

@@ -903 +903 @@
     }
 
+#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. */
     ASMAtomicWriteBool(&pVCpu->hm.s.fCheckedTLBFlush, true);
@@ -933 +940 @@
     else
     {
-#ifdef VBOX_WITH_NESTED_HWVIRT
-        /*
-         * Only if the nested hypervisor says it does not need to flush anything in the TLB,
-         * can we possibly apply it on the host. Otherwise, the nested-guest TLB flush setting
-         * should be used and then the host settings be added on top.
-         */
-        if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-        {
-            PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-            if (pVmcbNstGstCache->TLBCtrl.n.u8TLBFlush == SVM_TLB_FLUSH_NOTHING)
-                pVmcb->ctrl.TLBCtrl.n.u8TLBFlush = SVM_TLB_FLUSH_NOTHING;
-            else
-                pVmcb->ctrl.TLBCtrl.n.u8TLBFlush = pVmcbNstGstCache->TLBCtrl.n.u8TLBFlush;
-        }
-#else
-        RT_NOREF(pCtx);
         pVmcb->ctrl.TLBCtrl.n.u8TLBFlush = SVM_TLB_FLUSH_NOTHING;
-#endif
         if (pVCpu->hm.s.fForceTLBFlush)
         {
@@ -997 +987 @@
         pVmcb->ctrl.u64VmcbCleanBits &= ~HMSVM_VMCB_CLEAN_ASID;
     }
-
-#ifdef VBOX_WITH_NESTED_HWVIRT
-    Assert(CPUMIsGuestInSvmNestedHwVirtMode(pCtx) || pVmcb->ctrl.TLBCtrl.n.u8TLBFlush != SVM_TLB_FLUSH_NOTHING);
-#endif
 
     AssertMsg(pVCpu->hm.s.idLastCpu == pCpu->idCpu,