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

Timestamp:

Mar 23, 2010 1:48:50 PM (15 years ago)

Author:

vboxsync

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

59186

Message:

PGM,HWACCM: Fix for panic on 32-bit mac os x when using nested paging. The dynamic mapping set was used without being started during HWACCMR0Enter by VMXR0LoadGuestState/vmxR0PrefetchPAEPdptrs. The fix is to start + stop it in HWACCMR0Enter. (defect 4741)

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWACCMR0.cpp (modified) (2 diffs)
• PGMR0DynMap.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

@@ -1096 +1096 @@
     }
 
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
+    bool fStartedSet = PGMDynMapStartOrMigrateAutoSet(pVCpu);
+#endif
+
     rc  = HWACCMR0Globals.pfnEnterSession(pVM, pVCpu, pCpu);
     AssertRC(rc);
@@ -1104 +1108 @@
     AssertRC(rc);
 
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
+    if (fStartedSet)
+        PGMDynMapReleaseAutoSet(pVCpu);
+#endif
+
     /* keep track of the CPU owning the VMCS for debugging scheduling weirdness and ring-3 calls. */
-    if (RT_SUCCESS(rc))
-    {
-#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
-        PGMDynMapMigrateAutoSet(pVCpu);
-#endif
-    }
-    else
+    if (RT_FAILURE(rc))
         pVCpu->hwaccm.s.idEnteredCpu = NIL_RTCPUID;
     return rc;

trunk/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp

@@ -1518 +1518 @@
 
 /**
+ * Starts or migrates the autoset of a virtual CPU.
+ *
+ * This is used by HWACCMR0Enter.  When we've longjumped out of the HWACCM
+ * execution loop with the set open, we'll migrate it when re-entering.  While
+ * under normal circumstances, we'll start it so VMXR0LoadGuestState can access
+ * guest memory.
+ *
+ * @returns @c true if started, @c false if migrated.
+ * @param   pVCpu       The shared data for the current virtual CPU.
+ * @thread  EMT
+ */
+VMMDECL(bool) PGMDynMapStartOrMigrateAutoSet(PVMCPU pVCpu)
+{
+    bool fStartIt = pVCpu->pgm.s.AutoSet.cEntries == PGMMAPSET_CLOSED;
+    if (fStartIt)
+        PGMDynMapStartAutoSet(pVCpu);
+    else
+        PGMDynMapMigrateAutoSet(pVCpu);
+    return fStartIt;
+}
+
+
+/**
  * Worker that performs the actual flushing of the set.
  *