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

Timestamp:

Aug 9, 2011 1:37:41 PM (13 years ago)

Author:

vboxsync

Message:

Don't issue instructions rescheduling to RAW or HWACCM mode when recompilation is forced.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• EM.cpp (modified) (3 diffs)
• TRPM.cpp (modified) (2 diffs)

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

@@ -1578 +1578 @@
         /*
          * The instruction following an emulated STI should *always* be executed!
+         * 
+         * Note! We intentionally don't clear VM_FF_INHIBIT_INTERRUPTS here if
+         *       the eip is the same as the inhibited instr address.  Before we
+         *       are able to execute this instruction in raw mode (iret to
+         *       guest code) an external interrupt might force a world switch
+         *       again.  Possibly allowing a guest interrupt to be dispatched
+         *       in the process.  This could break the guest.  Sounds very
+         *       unlikely, but such timing sensitive problem are not as rare as
+         *       you might think.
          */
         if (    VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS)
@@ -1584 +1593 @@
             Log(("VMCPU_FF_INHIBIT_INTERRUPTS at %RGv successor %RGv\n", (RTGCPTR)CPUMGetGuestRIP(pVCpu), EMGetInhibitInterruptsPC(pVCpu)));
             if (CPUMGetGuestRIP(pVCpu) != EMGetInhibitInterruptsPC(pVCpu))
-            {
-                /* Note: we intentionally don't clear VM_FF_INHIBIT_INTERRUPTS here if the eip is the same as the inhibited instr address.
-                 *  Before we are able to execute this instruction in raw mode (iret to guest code) an external interrupt might
-                 *  force a world switch again. Possibly allowing a guest interrupt to be dispatched in the process. This could
-                 *  break the guest. Sounds very unlikely, but such timing sensitive problem are not as rare as you might think.
-                 */
                 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS);
-            }
-            if (HWACCMR3IsActive(pVCpu))
+
+            if (EMIsSupervisorCodeRecompiled(pVM))
+                rc2 = VINF_EM_RESCHEDULE_REM;
+            else if (HWACCMR3IsActive(pVCpu))
                 rc2 = VINF_EM_RESCHEDULE_HWACC;
             else
@@ -1842 +1847 @@
             {
                 rc = emR3ForcedActions(pVM, pVCpu, rc);
-                if (    (   rc == VINF_EM_RESCHEDULE_REM
-                         || rc == VINF_EM_RESCHEDULE_HWACC)
-                    &&  pVCpu->em.s.fForceRAW)
+                if (   (   rc == VINF_EM_RESCHEDULE_REM
+                        || rc == VINF_EM_RESCHEDULE_HWACC)
+                    && pVCpu->em.s.fForceRAW)
                     rc = VINF_EM_RESCHEDULE_RAW;
             }

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

@@ -79 +79 @@
 #include <VBox/vmm/ssm.h>
 #include <VBox/vmm/pdmapi.h>
+#include <VBox/vmm/em.h>
 #include <VBox/vmm/pgm.h>
 #include "internal/pgm.h"
@@ -1454 +1455 @@
     Assert(enmEvent == TRPM_HARDWARE_INT);
 
-    if (REMR3QueryPendingInterrupt(pVM, pVCpu) == REM_NO_PENDING_IRQ)
+    if (   REMR3QueryPendingInterrupt(pVM, pVCpu) == REM_NO_PENDING_IRQ
+        && !EMIsSupervisorCodeRecompiled(pVM))
     {
 #ifdef TRPM_FORWARD_TRAPS_IN_GC