Changeset 20071 in vbox for trunk/src/VBox/VMM

Timestamp:

May 27, 2009 12:07:38 PM (16 years ago)

Author:

vboxsync

Message:

Bit more REM locking

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (11 diffs)
• PGMPhys.cpp (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);
 
 /**
@@ -872 +870 @@
  * @param   pVM         VM handle.
  */
-static void emR3RemLock(PVM pVM)
+VMMR3DECL(void) EMR3RemLock(PVM pVM)
 {
     int rc = PDMCritSectEnter(&pVM->em.s.CritSectREM, VERR_SEM_BUSY);
@@ -883 +881 @@
  * @param   pVM         VM handle.
  */
-static void emR3RemUnlock(PVM pVM)
+VMMR3DECL(void) EMR3RemUnlock(PVM pVM)
 {
     PDMCritSectLeave(&pVM->em.s.CritSectREM);
@@ -901 +899 @@
     LogFlow(("emR3RemStep: cs:eip=%04x:%08x\n", CPUMGetGuestCS(pVCpu),  CPUMGetGuestEIP(pVCpu)));
 
-    emR3RemLock(pVM);
+    EMR3RemLock(pVM);
 
     /*
@@ -912 +910 @@
         REMR3StateBack(pVM, pVCpu);
     }
-    emR3RemUnlock(pVM);
+    EMR3RemUnlock(pVM);
 
     LogFlow(("emR3RemStep: returns %Rrc cs:eip=%04x:%08x\n", rc, CPUMGetGuestCS(pVCpu),  CPUMGetGuestEIP(pVCpu)));
@@ -954 +952 @@
 
     /* Big lock, but you are not supposed to own any lock when coming in here. */
-    emR3RemLock(pVM);
+    EMR3RemLock(pVM);
 
     /*
@@ -1077 +1075 @@
         STAM_PROFILE_STOP(&pVCpu->em.s.StatREMSync, e);
     }
-    emR3RemUnlock(pVM);
+    EMR3RemUnlock(pVM);
 
     STAM_REL_PROFILE_ADV_STOP(&pVCpu->em.s.StatREMTotal, a);
@@ -1482 +1480 @@
     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);
+    EMR3RemLock(pVM);
     /* Flush the recompiler TLB if the VCPU has changed. */
     if (pVM->em.s.idLastRemCpu != pVCpu->idCpu)
@@ -1489 +1487 @@
 
     rc = REMR3EmulateInstruction(pVM, pVCpu);
-    emR3RemUnlock(pVM);
+    EMR3RemUnlock(pVM);
     STAM_PROFILE_STOP(&pVCpu->em.s.StatREMEmu, a);
 
@@ -2497 +2495 @@
         case VERR_REM_FLUSHED_PAGES_OVERFLOW:
             Assert((pCtx->ss & X86_SEL_RPL) != 1);
-            emR3RemLock(pVM);
+            EMR3RemLock(pVM);
             REMR3ReplayInvalidatedPages(pVM, pVCpu);
-            emR3RemUnlock(pVM);
+            EMR3RemUnlock(pVM);
             rc = VINF_SUCCESS;
             break;
@@ -3450 +3448 @@
         if (VM_FF_IS_PENDING_EXCEPT(pVM, VM_FF_REM_HANDLER_NOTIFY, VM_FF_PGM_NO_MEMORY))
         {
-            emR3RemLock(pVM);
+            EMR3RemLock(pVM);
             REMR3ReplayHandlerNotifications(pVM);
-            emR3RemUnlock(pVM);
+            EMR3RemUnlock(pVM);
         }
 

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -1841 +1841 @@
         }
         GMMR3FreePagesCleanup(pReq);
+        pgmUnlock(pVM);
     }
     else
@@ -1846 +1847 @@
         /* link in the ram range */
         pgmR3PhysLinkRamRange(pVM, &pCur->RamRange, pRamPrev);
+        pgmUnlock(pVM);
         REMR3NotifyPhysRamRegister(pVM, GCPhys, pCur->RamRange.cb, REM_NOTIFY_PHYS_RAM_FLAGS_MMIO2);
     }
 
-    pgmUnlock(pVM);
 
     return VINF_SUCCESS;