Changeset 19278 in vbox for trunk

Timestamp:

Apr 30, 2009 3:55:16 PM (16 years ago)

Author:

vboxsync

Message:

Critical section for REM execution added

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (12 diffs)
• EMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/EM.cpp

@@ -109 +109 @@
 static int emR3SingleStepExecRem(PVM pVM, uint32_t cIterations);
 static EMSTATE emR3Reschedule(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
+static void emR3RemLock(PVM pVM);
+static void emR3RemUnlock(PVM pVM);
 
 /**
@@ -138 +140 @@
         pVM->fRawR0Enabled = true;
     Log(("EMR3Init: fRawR3Enabled=%d fRawR0Enabled=%d\n", pVM->fRawR3Enabled, pVM->fRawR0Enabled));
+
+    /*
+     * Initialize the REM critical section.
+     */
+    rc = PDMR3CritSectInit(pVM, &pVM->em.s.CritSectREM, "EM-REM");
+    AssertRCReturn(rc, rc);
 
     /*
@@ -476 +484 @@
 {
     AssertMsg(pVM->em.s.offVM, ("bad init order!\n"));
+
+    PDMR3CritSectDelete(&pVM->em.s.CritSectREM);
     return VINF_SUCCESS;
 }
@@ -837 +847 @@
 }
 
+/**
+ * Locks REM execution to a single VCpu
+ *
+ * @param   pVM         VM handle.
+ */
+static void emR3RemLock(PVM pVM)
+{
+    int rc = PDMCritSectEnter(&pVM->em.s.CritSectREM, VERR_SEM_BUSY);
+    AssertMsg(rc == VINF_SUCCESS, ("%Rrc\n", rc));
+}
+
+/**
+ * Unlocks REM execution
+ *
+ * @param   pVM         VM handle.
+ */
+static void emR3RemUnlock(PVM pVM)
+{
+    PDMCritSectLeave(&pVM->em.s.CritSectREM);
+}
 
 /**
@@ -851 +881 @@
     LogFlow(("emR3RemStep: cs:eip=%04x:%08x\n", CPUMGetGuestCS(pVCpu),  CPUMGetGuestEIP(pVCpu)));
 
+    emR3RemLock(pVM);
+
     /*
      * Switch to REM, step instruction, switch back.
@@ -860 +892 @@
         REMR3StateBack(pVM, pVCpu);
     }
+    emR3RemUnlock(pVM);
+
     LogFlow(("emR3RemStep: returns %Rrc cs:eip=%04x:%08x\n", rc, CPUMGetGuestCS(pVCpu),  CPUMGetGuestEIP(pVCpu)));
     return rc;
@@ -899 +933 @@
 #endif
 
+    /* Big lock, but you are not supposed to own any lock when coming in here. */
+    emR3RemLock(pVM);
+
     /*
      * Spin till we get a forced action which returns anything but VINF_SUCCESS
@@ -906 +943 @@
     bool    fInREMState = false;
     int     rc = VINF_SUCCESS;
+
+    /* Flush the recompiler TLB if the VCPU has changed. */
+    if (pVM->em.s.idLastRemCpu != pVCpu->idCpu)
+        REMFlushTBs(pVM);
+    pVM->em.s.idLastRemCpu = pVCpu->idCpu;
+
     for (;;)
     {
@@ -1008 +1051 @@
         STAM_PROFILE_STOP(&pVCpu->em.s.StatREMSync, e);
     }
+    emR3RemUnlock(pVM);
 
     STAM_REL_PROFILE_ADV_STOP(&pVCpu->em.s.StatREMTotal, a);
@@ -1412 +1456 @@
     STAM_PROFILE_START(&pVCpu->em.s.StatREMEmu, a);
     Log(("EMINS: %04x:%RGv RSP=%RGv\n", pCtx->cs, (RTGCPTR)pCtx->rip, (RTGCPTR)pCtx->rsp));
+    emR3RemLock(pVM);
     rc = REMR3EmulateInstruction(pVM, pVCpu);
+    emR3RemUnlock(pVM);
     STAM_PROFILE_STOP(&pVCpu->em.s.StatREMEmu, a);
 
@@ -2420 +2466 @@
         case VERR_REM_FLUSHED_PAGES_OVERFLOW:
             Assert((pCtx->ss & X86_SEL_RPL) != 1);
+            emR3RemLock(pVM);
             REMR3ReplayInvalidatedPages(pVM, pVCpu);
+            emR3RemUnlock(pVM);
             rc = VINF_SUCCESS;
             break;
@@ -3354 +3402 @@
         /* Replay the handler notification changes. */
         if (VM_FF_IS_PENDING_EXCEPT(pVM, VM_FF_REM_HANDLER_NOTIFY, VM_FF_PGM_NO_MEMORY))
+        {
+            emR3RemLock(pVM);
             REMR3ReplayHandlerNotifications(pVM);
+            emR3RemUnlock(pVM);
+        }
 
         /* check that we got them all  */

trunk/src/VBox/VMM/EMInternal.h

@@ -29 +29 @@
 #include <VBox/patm.h>
 #include <VBox/dis.h>
+#include <VBox/pdmcritsect.h>
 #include <iprt/avl.h>
 #include <setjmp.h>
@@ -289 +290 @@
      * See EM2VM(). */
     RTUINT                  offVM;
+
+    /** Id of the VCPU that last executed code in the recompiler. */
+    VMCPUID                 idLastRemCpu;
+
+    /** PGM critical section.
+     * This protects recompiler usage
+     */
+    PDMCRITSECT             CritSectREM;
 } EM;
 /** Pointer to EM VM instance data. */