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

Timestamp:

Jan 29, 2018 5:24:06 AM (7 years ago)

Author:

vboxsync

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

120554

Message:

VMM: Nested Hw.virt: Clean up interrupt injection for nested-guests.

File:

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

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

@@ -3505 +3505 @@
              * by the physical CPU.
              */
+            /** @todo later explore this for performance reasons. Right now the hardware
+             *        takes care of virtual interrupt injection for nested-guest. */
 #if 0
             if (   VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST)
                 && (pVmcbNstGstCache->u64InterceptCtrl & SVM_CTRL_INTERCEPT_VINTR)
-                && CPUMCanSvmNstGstTakeVirtIntr(pCtx))
+                && CPUMCanSvmNstGstTakeVirtIntr(pVCpu, pCtx))
             {
                 Log4(("Intercepting virtual interrupt -> #VMEXIT\n"));
@@ -3641 +3643 @@
     if (fGif)
     {
+        /*
+         * For nested-guests we have no way to determine if we're injecting a physical or virtual
+         * interrupt at this point. Hence the partial verification below.
+         */
         if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-            fAllowInt = CPUMCanSvmNstGstTakePhysIntr(pVCpu, pCtx);
+            fAllowInt = CPUMCanSvmNstGstTakePhysIntr(pVCpu, pCtx) || CPUMCanSvmNstGstTakeVirtIntr(pVCpu, pCtx);
         else
             fAllowInt = RT_BOOL(pCtx->eflags.u32 & X86_EFL_IF);
@@ -3681 +3687 @@
     }
     else
-    {
-#ifdef VBOX_WITH_NESTED_HWVIRT
-        /*
-         * If IEM emulated VMRUN and injected an event, it would not clear the EVENTINJ::Valid bit
-         * as a physical CPU clears it in the VMCB as part of the #VMEXIT (if the AMD spec. is to
-         * believed, real behavior might differ). Regardless, IEM does it only on #VMEXIT for now
-         * and since we are continuing nested-guest execution using hardware-assisted SVM, we need
-         * to clear this field otherwise we will inject the event twice, see @bugref{7243#78}.
-         */
-        if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-            pVmcb->ctrl.EventInject.n.u1Valid = 0;
-#endif
         Assert(pVmcb->ctrl.EventInject.n.u1Valid == 0);
-    }
 
     /*