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

Timestamp:

Jan 24, 2018 9:00:50 AM (7 years ago)

Author:

vboxsync

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

120466

Message:

VMM/HMSVMR0: Nested Hw.virt: Exclude VINTR intercept of the outer guest while executing the nested-guest. It will remain in the outer guest's VMCB and
thus should be used when switching to the outer guest.

File:

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

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

@@ -1979 +1979 @@
     if (HMCPU_CF_IS_PENDING(pVCpu, HM_CHANGED_GUEST_XCPT_INTERCEPTS))
     {
-        /* First, load the guest intercepts into the guest VMCB. */
+        /* First, load the guest exception intercepts into the guest VMCB. */
         PSVMVMCB pVmcb = pVCpu->hm.s.svm.pVmcb;
-        Assert(!(pVmcb->ctrl.u64InterceptCtrl & SVM_CTRL_INTERCEPT_VINTR));
         hmR0SvmLoadGuestXcptIntercepts(pVCpu, pVmcb, pCtx);
 
@@ -2004 +2003 @@
         pVmcbNstGst->ctrl.u16InterceptWrDRx |= 0xffff;
 
+        /* Exclude the VINTR intercept of the outer guest as we don't need to cause VINTR #VMEXITs
+           that belong to the nested-guest to the outer guest. */
         pVmcbNstGst->ctrl.u32InterceptXcpt  |= pVmcb->ctrl.u32InterceptXcpt;
-        pVmcbNstGst->ctrl.u64InterceptCtrl  |= pVmcb->ctrl.u64InterceptCtrl
+        pVmcbNstGst->ctrl.u64InterceptCtrl  |= (pVmcb->ctrl.u64InterceptCtrl & ~SVM_CTRL_INTERCEPT_VINTR)
                                             |  HMSVM_MANDATORY_GUEST_CTRL_INTERCEPTS;