Changeset 77159 in vbox for trunk/src/VBox

Timestamp:

Feb 5, 2019 7:32:22 AM (6 years ago)

Author:

vboxsync

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

128634

Message:

VMM/EM: Nested VMX: bugref:9180 Fix injecting interrupts into the nested-guest.

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -1736 +1736 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
     Assert(CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx));
-    if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_INT_WINDOW_EXIT))
+
+    /* Handle the "interrupt-window" VM-exit intercept. */
+    if (   CPUMIsGuestPhysIntrEnabled(pVCpu)
+        && CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_INT_WINDOW_EXIT))
     {
         CPUM_IMPORT_EXTRN_RET(pVCpu, IEM_CPUMCTX_EXTRN_VMX_VMEXIT_MASK);
@@ -1742 +1745 @@
         if (RT_SUCCESS(rcStrict))
         {
-            Assert(rcStrict != VINF_PGM_CHANGE_MODE);
-            Assert(rcStrict != VINF_VMX_VMEXIT);
+            AssertMsg(   rcStrict != VINF_PGM_CHANGE_MODE
+                      && rcStrict != VINF_VMX_VMEXIT
+                      && rcStrict != VINF_NO_CHANGE, ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
             return VBOXSTRICTRC_VAL(rcStrict);
         }
-        AssertMsgFailed(("Interrupt-window Vm-exit failed! rc=%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
+
+        AssertMsgFailed(("Interrupt-window VM-exit failed! rc=%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
         return VINF_EM_TRIPLE_FAULT;
     }
+
     /* Handle the "external interrupt" VM-exit intercept. */
-    else if (CPUMIsGuestVmxPinCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PIN_CTLS_EXT_INT_EXIT))
-    {
+    if (CPUMIsGuestVmxPinCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PIN_CTLS_EXT_INT_EXIT))
+    {
+        CPUM_IMPORT_EXTRN_RET(pVCpu, IEM_CPUMCTX_EXTRN_VMX_VMEXIT_MASK);
         VBOXSTRICTRC rcStrict = IEMExecVmxVmexitExtInt(pVCpu, 0 /* uVector */, true /* fIntPending */);
-        Assert(rcStrict != VINF_PGM_CHANGE_MODE);
-        Assert(rcStrict != VINF_VMX_VMEXIT);
+        AssertMsg(   rcStrict != VINF_PGM_CHANGE_MODE
+                  && rcStrict != VINF_VMX_VMEXIT
+                  && rcStrict != VINF_NO_CHANGE, ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
         if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
             return VBOXSTRICTRC_TODO(rcStrict);
@@ -1775 +1783 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_SVM
     Assert(CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx));
-    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, &pVCpu->cpum.GstCtx, SVM_CTRL_INTERCEPT_INTR))
+
+    /* Handle the physical interrupt intercept (can be masked by the guest hypervisor). */
+    if (   CPUMIsGuestPhysIntrEnabled(pVCpu)
+        && CPUMIsGuestSvmCtrlInterceptSet(pVCpu, &pVCpu->cpum.GstCtx, SVM_CTRL_INTERCEPT_INTR))
     {
         CPUM_IMPORT_EXTRN_RET(pVCpu, IEM_CPUMCTX_EXTRN_SVM_VMEXIT_MASK);
@@ -1781 +1792 @@
         if (RT_SUCCESS(rcStrict))
         {
-            Assert(rcStrict != VINF_PGM_CHANGE_MODE);
-            Assert(rcStrict != VINF_SVM_VMEXIT);
+            AssertMsg(   rcStrict != VINF_PGM_CHANGE_MODE
+                      && rcStrict != VINF_SVM_VMEXIT
+                      && rcStrict != VINF_NO_CHANGE, ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
             return VBOXSTRICTRC_VAL(rcStrict);
         }
+
         AssertMsgFailed(("INTR #VMEXIT failed! rc=%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
         return VINF_EM_TRIPLE_FAULT;
@@ -2218 +2231 @@
                         rc2 = VINF_NO_CHANGE;
                     }
-                    else if (   VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC)
-                             && CPUMIsGuestPhysIntrEnabled(pVCpu))
+                    else if (VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC))
                     {
                         bool fInjected = false;
                         Assert(pVCpu->em.s.enmState != EMSTATE_WAIT_SIPI);
 
-                        if (CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx))
+                        if (!CPUMIsGuestInNestedHwvirtMode(&pVCpu->cpum.GstCtx))
+                        {
+                            if (CPUMIsGuestPhysIntrEnabled(pVCpu))
+                                rc2 = VINF_NO_CHANGE;
+                            else
+                                rc2 = VINF_SUCCESS;
+                        }
+                        else if (CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx))
                             rc2 = emR3VmxNstGstIntrIntercept(pVCpu);
-                        else if (CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx))
+                        else
+                        {
+                            Assert(CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx));
                             rc2 = emR3SvmNstGstIntrIntercept(pVCpu);
-                        else
-                            rc2 = VINF_NO_CHANGE;
-
+                        }
+
+                        /* If no interrupt has been injected so far, do so now. */
                         if (rc2 == VINF_NO_CHANGE)
                         {