Changeset 76856 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jan 17, 2019 1:07:33 PM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Fix external interrupt intercept. Also, no need to do this in TRPMR3InjectEvent as it will be handled in IEMInjectTrap eventually.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• EM.cpp (modified) (4 diffs)
• TRPM.cpp (modified) (1 diff)

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

@@ -606 +606 @@
                 AssertFailedReturn(VERR_INVALID_PARAMETER);
         }
-        LogRel(("EM: Set execution policy (fRecompileUser=%RTbool fRecompileSupervisor=%RTbool fIemExecutesAll=%RTbool)\n",
-                pVM->fRecompileUser, pVM->fRecompileSupervisor, pVM->em.s.fIemExecutesAll));
+        Log(("EM: Set execution policy (fRecompileUser=%RTbool fRecompileSupervisor=%RTbool fIemExecutesAll=%RTbool)\n",
+             pVM->fRecompileUser, pVM->fRecompileSupervisor, pVM->em.s.fIemExecutesAll));
     }
 
@@ -1726 +1726 @@
 
 /**
- * Helper for emR3ForcedActions() for VMX interrupt-window VM-exits.
+ * Helper for emR3ForcedActions() for VMX interrupt-window VM-exit and VMX external
+ * interrupt VM-exit.
  *
  * @returns VBox status code.
  * @param   pVCpu       The cross context virtual CPU structure.
  */
-static int emR3VmxNstGstIntrWindowExit(PVMCPU pVCpu)
+static int emR3VmxNstGstIntrIntercept(PVMCPU pVCpu)
 {
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
@@ -1747 +1748 @@
         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))
+    {
+        VBOXSTRICTRC rcStrict = IEMExecVmxVmexitExtInt(pVCpu, 0 /* uVector */, true /* fIntPending */);
+        Assert(rcStrict != VINF_PGM_CHANGE_MODE);
+        Assert(rcStrict != VINF_VMX_VMEXIT);
+        if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
+            return VBOXSTRICTRC_TODO(rcStrict);
     }
 #else
@@ -2215 +2225 @@
 
                         if (CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx))
-                            rc2 = emR3VmxNstGstIntrWindowExit(pVCpu);
+                            rc2 = emR3VmxNstGstIntrIntercept(pVCpu);
                         else if (CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx))
                             rc2 = emR3SvmNstGstIntrIntercept(pVCpu);

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

@@ -1591 +1591 @@
     if (RT_SUCCESS(rc))
     {
-#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-        /* Handle the "acknowledge interrupt on exit" VM-exit intercept. */
-        if (CPUMIsGuestInVmxNonRootMode(pCtx))
-        {
-            if (   CPUMIsGuestVmxExitCtlsSet(pVCpu, pCtx, VMX_EXIT_CTLS_ACK_EXT_INT)
-                && CPUMIsGuestVmxPinCtlsSet(pVCpu, pCtx, VMX_PIN_CTLS_EXT_INT_EXIT))
-            {
-                VBOXSTRICTRC rcStrict = IEMExecVmxVmexitExtInt(pVCpu, u8Interrupt, false /* fIntPending */);
-                Assert(rcStrict != VINF_PGM_CHANGE_MODE);
-                if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
-                    return VBOXSTRICTRC_TODO(rcStrict);
-            }
-        }
-#endif
         *pfInjected = true;
         if (!VM_IS_NEM_ENABLED(pVM))