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

Timestamp:

Jun 30, 2011 11:52:19 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

72585

Message:

VBoxRecompiler.c: tlb_flush_page may trigger a full tlb flush during invlpg replay in REMR3State if large pages are affected, so we must ignore the CR3 reload notifications as well as the invalidate page ones. Also, skip the replay if a global TLB flush is pending.

File:

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

trunk/src/recompiler/VBoxRecompiler.c

@@ -220 +220 @@
 #endif
 
-/** Prologue code, must be in lower 4G to simplify jumps to/from generated code. */
+/** Prologue code, must be in lower 4G to simplify jumps to/from generated code.
+ * @todo huh??? That cannot be the case on the mac... So, this 
+ *       point is probably not valid any longer. */
 uint8_t *code_gen_prologue;
 
@@ -2112 +2114 @@
 
     /*
-     * Replay invlpg?
-     */
+     * Replay invlpg?  Only if we're not flushing the TLB.
+     */
+    fFlags = CPUMR3RemEnter(pVCpu, &uCpl);
+    LogFlow(("CPUMR3RemEnter %x %x\n", fFlags, uCpl));
     if (pVM->rem.s.cInvalidatedPages)
     {
-        RTUINT i;
-
-        pVM->rem.s.fIgnoreInvlPg = true;
-        for (i = 0; i < pVM->rem.s.cInvalidatedPages; i++)
+        if (!(fFlags & CPUM_CHANGED_GLOBAL_TLB_FLUSH))
         {
-            Log2(("REMR3State: invlpg %RGv\n", pVM->rem.s.aGCPtrInvalidatedPages[i]));
-            tlb_flush_page(&pVM->rem.s.Env, pVM->rem.s.aGCPtrInvalidatedPages[i]);
+            RTUINT i;
+
+            pVM->rem.s.fIgnoreCR3Load = true;
+            pVM->rem.s.fIgnoreInvlPg  = true;
+            for (i = 0; i < pVM->rem.s.cInvalidatedPages; i++)
+            {
+                Log2(("REMR3State: invlpg %RGv\n", pVM->rem.s.aGCPtrInvalidatedPages[i]));
+                tlb_flush_page(&pVM->rem.s.Env, pVM->rem.s.aGCPtrInvalidatedPages[i]);
+            }
+            pVM->rem.s.fIgnoreInvlPg  = false;
+            pVM->rem.s.fIgnoreCR3Load = false;
         }
-        pVM->rem.s.fIgnoreInvlPg = false;
         pVM->rem.s.cInvalidatedPages = 0;
     }
@@ -2151 +2160 @@
      * Registers which are rarely changed and require special handling / order when changed.
      */
-    fFlags = CPUMR3RemEnter(pVCpu, &uCpl);
-    LogFlow(("CPUMR3RemEnter %x %x\n", fFlags, uCpl));
     if (fFlags & (  CPUM_CHANGED_GLOBAL_TLB_FLUSH
                   | CPUM_CHANGED_CR4