Changeset 37702 in vbox for trunk/src/recompiler/VBoxRecompiler.c

Timestamp:

Jun 30, 2011 10:09:59 AM (13 years ago)

Author:

vboxsync

Message:

REM/VMM: Don't flush the TLB if you don't hold the EM/REM lock, some other EMT may be executing code in the recompiler and could be really surprised by a TLB flush.

File:

• trunk/src/recompiler/VBoxRecompiler.c (modified) (8 diffs)

trunk/src/recompiler/VBoxRecompiler.c

@@ -311 +311 @@
     CPUMGetGuestCpuId(pVCpu, 0x80000001, &u32Dummy, &u32Dummy, &pVM->rem.s.Env.cpuid_ext3_features, &pVM->rem.s.Env.cpuid_ext2_features);
 
+    EMRemLock(pVM);
     cpu_reset(&pVM->rem.s.Env);
+    EMRemUnlock(pVM);
 
     /* allocate code buffer for single instruction emulation. */
@@ -607 +609 @@
 REMR3DECL(void) REMR3Reset(PVM pVM)
 {
+    EMRemLock(pVM); /* Only pro forma, we're in a rendezvous. */
+
     /*
      * Reset the REM cpu.
@@ -622 +626 @@
     /* Flush the TBs the next time we execute code here. */
     pVM->rem.s.fFlushTBs = true;
+
+    EMRemUnlock(pVM);
 }
 
@@ -764 +770 @@
 
     /*
-     * Sync the Load Flush the TLB
-     */
-    tlb_flush(&pRem->Env, 1);
-
-    /*
      * Stop ignoring ignorable notifications.
      */
@@ -814 +815 @@
      */
     interrupt_request = pVM->rem.s.Env.interrupt_request;
-    Assert(!(interrupt_request & ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB | CPU_INTERRUPT_TIMER  | CPU_INTERRUPT_EXTERNAL_HARD | CPU_INTERRUPT_EXTERNAL_EXIT | CPU_INTERRUPT_EXTERNAL_TIMER)));
+    Assert(!(interrupt_request & ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB | CPU_INTERRUPT_TIMER  | CPU_INTERRUPT_EXTERNAL_HARD | CPU_INTERRUPT_EXTERNAL_EXIT | CPU_INTERRUPT_EXTERNAL_FLUSH_TLB | CPU_INTERRUPT_EXTERNAL_TIMER)));
     pVM->rem.s.Env.interrupt_request = 0;
     cpu_single_step(&pVM->rem.s.Env, 1);
@@ -954 +955 @@
     {
         int interrupt_request = pVM->rem.s.Env.interrupt_request;
-        Assert(!(interrupt_request & ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB | CPU_INTERRUPT_TIMER | CPU_INTERRUPT_EXTERNAL_HARD | CPU_INTERRUPT_EXTERNAL_EXIT | CPU_INTERRUPT_EXTERNAL_TIMER)));
+        Assert(!(interrupt_request & ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB | CPU_INTERRUPT_TIMER | CPU_INTERRUPT_EXTERNAL_HARD | CPU_INTERRUPT_EXTERNAL_EXIT | CPU_INTERRUPT_EXTERNAL_FLUSH_TLB | CPU_INTERRUPT_EXTERNAL_TIMER)));
 #ifdef REM_USE_QEMU_SINGLE_STEP_FOR_LOGGING
         cpu_single_step(&pVM->rem.s.Env, 0);
@@ -1677 +1678 @@
     int rc;
 
+    Assert(EMRemIsLockOwner(env->pVM));
+
     /*
      * When we're replaying invlpg instructions or restoring a saved
@@ -1786 +1789 @@
 void remR3FlushTLB(CPUX86State *env, bool fGlobal)
 {
-    PVM pVM = env->pVM;
+    PVM      pVM = env->pVM;
     PCPUMCTX pCtx;
+    Assert(EMRemIsLockOwner(pVM));
 
     /*