Changeset 17135 in vbox for trunk

Timestamp:

Feb 25, 2009 3:27:37 PM (16 years ago)

Author:

vboxsync

Message:

VBOX_WITH_PGMPOOL_PAGING_ONLY: Disallow ring 3 jumps when in an inconsistent state during CR3 switching.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

-              r17134
+              r17135
     rc = VINF_SUCCESS;
+#  ifdef IN_RC
+    /** NOTE: We can't deal with jumps to ring 3 here as we're now in an inconsistent state! */
+#  endif
     pVM->pgm.s.iShwUser      = SHW_POOL_ROOT_IDX;
     pVM->pgm.s.iShwUserTable = GCPhysCR3 >> PAGE_SHIFT;
 …
     CPUMSetHyperCR3(pVM, PGMGetHyperCR3(pVM));
+#  ifdef IN_RC
+    /** NOTE: Everything safe again. */
+#  endif
     /* Clean up the old CR3 root. */
     if (pOldShwPageCR3)

-              r17133
+              r17135
+ *
  * @param   pPool       The pool.
+ * @param   enmKind     Page table kind
  * @param   iUser       The user of the page.
  */
 static int pgmPoolMakeMoreFreePages(PPGMPOOL pPool, uint16_t iUser)
+static int pgmPoolMakeMoreFreePages(PPGMPOOL pPool, PGMPOOLKIND enmKind, uint16_t iUser)
+{
     LogFlow(("pgmPoolMakeMoreFreePages: iUser=%#x\n", iUser));
 …
      * If the pool isn't full grown yet, expand it.
      */
+    if (pPool->cCurPages < pPool->cMaxPages)
+    if (    pPool->cCurPages < pPool->cMaxPages
+#if defined(VBOX_WITH_PGMPOOL_PAGING_ONLY) && defined(IN_RC)
+        /* Hack alert: we can't deal with jumps to ring 3 when called from MapCR3 and allocating pages for PAE PDs. */
+        &&  enmKind != PGMPOOLKIND_PAE_PD_FOR_PAE_PD
+        &&  (enmKind < PGMPOOLKIND_PAE_PD0_FOR_32BIT_PD || enmKind > PGMPOOLKIND_PAE_PD3_FOR_32BIT_PD)
+#endif
+        )
+    {
         STAM_PROFILE_ADV_SUSPEND(&pPool->StatAlloc, a);
 …
     if (iNew == NIL_PGMPOOL_IDX)
+    {
         rc = pgmPoolMakeMoreFreePages(pPool, iUser);
+        rc = pgmPoolMakeMoreFreePages(pPool, enmKind, iUser);
         if (RT_FAILURE(rc))
+        {

Note: See TracChangeset for help on using the changeset viewer.