Changeset 27540 in vbox for trunk/src

Timestamp:

Mar 19, 2010 3:24:22 PM (15 years ago)

Author:

vboxsync

Message:

Step one in dealing with ballooned pages in shadow paging

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (8 diffs)
• PGMAllPhys.cpp (modified) (3 diffs)
• PGMAllPool.cpp (modified) (1 diff)

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

@@ -807 +807 @@
                         Log(("PGM #PF: Make writable: %RGp %R[pgmpage] pvFault=%RGp uErr=%#x\n", GCPhys, pPage, pvFault, uErr));
                         Assert(!PGM_PAGE_IS_ZERO(pPage));
+                        AssertFatalMsg(!PGM_PAGE_IS_BALLOONED(pPage), ("Unexpected ballooned page at %RGp\n", GCPhys));
 
                         rc = pgmPhysPageMakeWritable(pVM, pPage, GCPhys);
@@ -1402 +1403 @@
         if (RT_SUCCESS(rc))
         {
+            /* Ignore ballooned pages. Don't return errors or use a fatal assert here as part of a shadow sync range might included ballooned pages. */
+            if (PGM_PAGE_IS_BALLOONED(pPage))
+                return;
+
 #ifndef VBOX_WITH_NEW_LAZY_PAGE_ALLOC
             /* Try to make the page writable if necessary. */
@@ -1411 +1416 @@
                          && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_WRITE_MONITORED
 # endif
-                         && PGM_PAGE_GET_TYPE(pPage)  == PGMPAGETYPE_RAM)
+                        )
                      )
                )
@@ -1795 +1800 @@
                 if (RT_SUCCESS(rc))
                 {
+                    AssertFatalMsg(!PGM_PAGE_IS_BALLOONED(pPage), ("Unexpected ballooned page at %RGp\n", GCPhys));
+
 # ifndef VBOX_WITH_NEW_LAZY_PAGE_ALLOC
                     /* Try to make the page writable if necessary. */
@@ -1804 +1811 @@
                                  && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_WRITE_MONITORED
 #  endif
-                                 && PGM_PAGE_GET_TYPE(pPage)  == PGMPAGETYPE_RAM)
+                                 )
                              )
                        )
@@ -1826 +1833 @@
                             PteDst.u = 0;
                     }
+
                     const unsigned iPTDst = (GCPtrPage >> SHW_PT_SHIFT) & SHW_PT_MASK;
-                    if (PteDst.n.u1Present && !pPTDst->a[iPTDst].n.u1Present)
+                    if (    PteDst.n.u1Present 
+                        &&  !pPTDst->a[iPTDst].n.u1Present)
                         PGM_BTH_NAME(SyncPageWorkerTrackAddref)(pVCpu, pShwPage, PGM_PAGE_GET_TRACKING(pPage), pPage, iPTDst);
 
@@ -2833 +2842 @@
                                      && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_WRITE_MONITORED
 #  endif
-                                     && PGM_PAGE_GET_TYPE(pPage)  == PGMPAGETYPE_RAM)
+                                     && !PGM_PAGE_IS_BALLOONED(pPage))
                                  )
                            )
@@ -2853 +2862 @@
                             else
                                 PteDst.u = 0;
+                        }
+                        else
+                        if (PGM_PAGE_IS_BALLOONED(pPage))
+                        {
+                            /* Skip ballooned pages. */
+                            PteDst.u = 0;
                         }
 # ifndef IN_RING0

trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

@@ -673 +673 @@
         case PGM_PAGE_STATE_SHARED:
             return pgmPhysAllocPage(pVM, pPage, GCPhys);
+
+        /* Not allowed to write to ballooned pages. */
+        case PGM_PAGE_STATE_BALLOONED:
+            return VERR_PGM_PHYS_PAGE_BALLOONED;
     }
 }
@@ -1009 +1013 @@
     PPGMPAGE pPage = &pRam->aPages[off >> PAGE_SHIFT];
     PPGMPAGEMAPTLBE pTlbe = &pPGM->CTXSUFF(PhysTlb).aEntries[PGM_PAGEMAPTLB_IDX(GCPhys)];
-    if (!PGM_PAGE_IS_ZERO(pPage))
+    if (    !PGM_PAGE_IS_ZERO(pPage)
+        &&  !PGM_PAGE_IS_BALLOONED(pPage))
     {
         void *pv;
@@ -1058 +1063 @@
      */
     PPGMPAGEMAPTLBE pTlbe = &pPGM->CTXSUFF(PhysTlb).aEntries[PGM_PAGEMAPTLB_IDX(GCPhys)];
-    if (!PGM_PAGE_IS_ZERO(pPage))
+    if (    !PGM_PAGE_IS_ZERO(pPage)
+        &&  !PGM_PAGE_IS_BALLOONED(pPage))
     {
         void *pv;

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

@@ -3381 +3381 @@
          * will be needed for this problem of course, but it will have to wait...
          */
-        if (PGM_PAGE_IS_ZERO(pPhysPage))
+        if (    PGM_PAGE_IS_ZERO(pPhysPage)
+            ||  PGM_PAGE_IS_BALLOONED(pPhysPage))
             rc = VINF_PGM_GCPHYS_ALIASED;
         else