Changeset 72266 in vbox for trunk/src/VBox/VMM/VMMR3/TRPM.cpp

Timestamp:

May 20, 2018 4:14:53 PM (7 years ago)

Author:

vboxsync

Message:

TRPMR3InjectEvent: Don't reschedule to REM when in NEM mode. bugref:9044

File:

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

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

@@ -87 +87 @@
 #include <VBox/vmm/csam.h>
 #include <VBox/vmm/patm.h>
+#include <VBox/vmm/iem.h>
 #include "TRPMInternal.h"
 #include <VBox/vmm/vm.h>
@@ -1520 +1521 @@
         if (EMIsSupervisorCodeRecompiled(pVM) || !VM_IS_RAW_MODE_ENABLED(pVM))
         {
-            rc = TRPMAssertTrap(pVCpu, u8Interrupt, enmEvent);
-            AssertRC(rc);
             STAM_COUNTER_INC(&pVM->trpm.s.paStatForwardedIRQR3[u8Interrupt]);
-            return HMR3IsActive(pVCpu) ? VINF_EM_RESCHEDULE_HM : VINF_EM_RESCHEDULE_REM;
-        }
+            if (!VM_IS_NEM_ENABLED(pVM))
+            {
+                rc = TRPMAssertTrap(pVCpu, u8Interrupt, enmEvent);
+                AssertRC(rc);
+                return HMR3IsActive(pVCpu) ? VINF_EM_RESCHEDULE_HM : VINF_EM_RESCHEDULE_REM;
+            }
+            VBOXSTRICTRC rcStrict = IEMInjectTrap(pVCpu, u8Interrupt, enmEvent, 0, 0, 0);
+            if (rcStrict == VINF_SUCCESS)
+                return VINF_EM_RESCHEDULE;
+            return VBOXSTRICTRC_TODO(rcStrict);
+        }
+
         /* If the guest gate is not patched, then we will check (again) if we can patch it. */
         if (pVM->trpm.s.aGuestTrapHandler[u8Interrupt] == TRPM_INVALID_HANDLER)
@@ -1559 +1568 @@
         /* Can happen if the interrupt is masked by TPR or APIC is disabled. */
         AssertMsg(rc == VERR_APIC_INTR_MASKED_BY_TPR || rc == VERR_NO_DATA, ("PDMGetInterrupt failed. rc=%Rrc\n", rc));
-        return HMR3IsActive(pVCpu) ? VINF_EM_RESCHEDULE_HM : VINF_EM_RESCHEDULE_REM; /* (Heed the halted state if this is changed!) */
+        return HMR3IsActive(pVCpu)    ? VINF_EM_RESCHEDULE_HM
+             : VM_IS_NEM_ENABLED(pVM) ? VINF_EM_RESCHEDULE
+             :                          VINF_EM_RESCHEDULE_REM; /* (Heed the halted state if this is changed!) */
     }
 
@@ -1577 +1588 @@
     if (RT_SUCCESS(rc))
     {
-        rc = TRPMAssertTrap(pVCpu, u8Interrupt, TRPM_HARDWARE_INT);
-        AssertRC(rc);
+        if (!VM_IS_NEM_ENABLED(pVM))
+        {
+            rc = TRPMAssertTrap(pVCpu, u8Interrupt, TRPM_HARDWARE_INT);
+            AssertRC(rc);
+        }
+        else
+        {
+            VBOXSTRICTRC rcStrict = IEMInjectTrap(pVCpu, u8Interrupt, enmEvent, 0, 0, 0);
+            if (rcStrict != VINF_SUCCESS)
+                return VBOXSTRICTRC_TODO(rcStrict);
+        }
         STAM_COUNTER_INC(&pVM->trpm.s.paStatForwardedIRQR3[u8Interrupt]);
     }
@@ -1586 +1606 @@
         AssertMsg(rc == VERR_APIC_INTR_MASKED_BY_TPR || rc == VERR_NO_DATA, ("PDMGetInterrupt failed. rc=%Rrc\n", rc));
     }
-    return HMR3IsActive(pVCpu) ? VINF_EM_RESCHEDULE_HM : VINF_EM_RESCHEDULE_REM; /* (Heed the halted state if this is changed!) */
+    return HMR3IsActive(pVCpu)    ? VINF_EM_RESCHEDULE_HM
+         : VM_IS_NEM_ENABLED(pVM) ? VINF_EM_RESCHEDULE
+         :                          VINF_EM_RESCHEDULE_REM; /* (Heed the halted state if this is changed!) */
 #endif /* !TRPM_FORWARD_TRAPS_IN_GC || IEM_VERIFICATION_MODE */
-
 }