Changeset 10283 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jul 5, 2008 3:24:20 PM (17 years ago)

Author:

vboxsync

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

32895

Message:

Backed out 32892-32894

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (10 diffs)
• PGMAllPool.cpp (modified) (11 diffs)

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

@@ -65 +65 @@
 #ifdef IN_RING0 /* no mappings in VT-x and AMD-V mode */
 # define PGM_WITHOUT_MAPPINGS
-#endif
-
-/* There's no need for tracking physical pages when there's no guest paging involved. */
-#ifdef PGMPOOL_WITH_USER_TRACKING
-# if PGM_WITH_PAGING(PGM_GST_TYPE)
-# define PGMPOOL_WITH_USER_TRACKING_ACTIVE
-# endif
 #endif
 
@@ -1141 +1134 @@
                 if (pPT->a[iPTEDst].n.u1Present)
                 {
-#  ifdef PGMPOOL_WITH_USER_TRACKING_ACTIVE
+#  ifdef PGMPOOL_WITH_USER_TRACKING
                     /* This is very unlikely with caching/monitoring enabled. */
                     PGM_BTH_NAME(SyncPageWorkerTrackDeref)(pVM, pShwPage, pPT->a[iPTEDst].u & SHW_PTE_PG_MASK);
@@ -1250 +1243 @@
 
 
-#ifdef PGMPOOL_WITH_USER_TRACKING_ACTIVE
+#ifdef PGMPOOL_WITH_USER_TRACKING
 /**
  * Update the tracking of shadowed pages.
@@ -1340 +1333 @@
         pShwPage->iFirstPresent = iPTDst;
 }
-#endif /* PGMPOOL_WITH_USER_TRACKING_ACTIVE */
+#endif /* PGMPOOL_WITH_USER_TRACKING */
 
 
@@ -1422 +1415 @@
             }
 
-#ifdef PGMPOOL_WITH_USER_TRACKING_ACTIVE
+#ifdef PGMPOOL_WITH_USER_TRACKING
             /*
              * Keep user track up to date.
@@ -1442 +1435 @@
                 PGM_BTH_NAME(SyncPageWorkerTrackDeref)(pVM, pShwPage, pPteDst->u & SHW_PTE_PG_MASK);
             }
-#endif /* PGMPOOL_WITH_USER_TRACKING_ACTIVE */
+#endif /* PGMPOOL_WITH_USER_TRACKING */
 
             /*
@@ -1460 +1453 @@
          */
         LogFlow(("SyncPageWorker: page not present in Pte\n"));
-#ifdef PGMPOOL_WITH_USER_TRACKING_ACTIVE
+#ifdef PGMPOOL_WITH_USER_TRACKING
         /* Keep user track up to date. */
         if (pPteDst->n.u1Present)
@@ -1467 +1460 @@
             PGM_BTH_NAME(SyncPageWorkerTrackDeref)(pVM, pShwPage, pPteDst->u & SHW_PTE_PG_MASK);
         }
-#endif /* PGMPOOL_WITH_USER_TRACKING_ACTIVE */
+#endif /* PGMPOOL_WITH_USER_TRACKING */
         pPteDst->u = 0;
         /** @todo count these. */
@@ -1695 +1688 @@
                     }
                     const unsigned iPTDst = (GCPtrPage >> SHW_PT_SHIFT) & SHW_PT_MASK;
-# ifdef PGMPOOL_WITH_USER_TRACKING_ACTIVE
+# ifdef PGMPOOL_WITH_USER_TRACKING
                     if (PteDst.n.u1Present && !pPTDst->a[iPTDst].n.u1Present)
                         PGM_BTH_NAME(SyncPageWorkerTrackAddref)(pVM, pShwPage, HCPhys >> MM_RAM_FLAGS_IDX_SHIFT, pPage, iPTDst);
@@ -2565 +2558 @@
                         else
                             PteDst.u = PGM_PAGE_GET_HCPHYS(pPage) | PteDstBase.u;
-# ifdef PGMPOOL_WITH_USER_TRACKING_ACTIVE
+# ifdef PGMPOOL_WITH_USER_TRACKING
                         if (PteDst.n.u1Present)
                             PGM_BTH_NAME(SyncPageWorkerTrackAddref)(pVM, pShwPage, pPage->HCPhys >> MM_RAM_FLAGS_IDX_SHIFT, pPage, iPTDst); /** @todo PAGE FLAGS */

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

@@ -1777 +1777 @@
                 case PGMPOOLKIND_PAE_PT_FOR_PAE_PT:
                 case PGMPOOLKIND_PAE_PT_FOR_PAE_2MB:
+                case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
+                case PGMPOOLKIND_PAE_PT_FOR_PHYS:
                 {
 #ifdef PGMPOOL_WITH_USER_TRACKING
@@ -2233 +2235 @@
         case PGMPOOLKIND_32BIT_PT_FOR_32BIT_PT:
         case PGMPOOLKIND_32BIT_PT_FOR_32BIT_4MB:
+        case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
         {
             const uint32_t  u32 = PGM_PAGE_GET_HCPHYS(pPhysPage) | X86_PTE_P;
@@ -2262 +2265 @@
         case PGMPOOLKIND_PAE_PT_FOR_PAE_PT:
         case PGMPOOLKIND_PAE_PT_FOR_PAE_2MB:
+        case PGMPOOLKIND_PAE_PT_FOR_PHYS:
         {
             const uint64_t  u64 = PGM_PAGE_GET_HCPHYS(pPhysPage) | X86_PTE_P;
@@ -2287 +2291 @@
         }
 
-        case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
-        case PGMPOOLKIND_PAE_PT_FOR_PHYS:
-            break;  /* nothing to do */
-
         default:
             AssertFatalMsgFailed(("enmKind=%d iShw=%d\n", pPage->enmKind, iShw));
@@ -2409 +2409 @@
                 case PGMPOOLKIND_32BIT_PT_FOR_32BIT_PT:
                 case PGMPOOLKIND_32BIT_PT_FOR_32BIT_4MB:
+                case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
                 {
                     unsigned    cPresent = pPage->cPresent;
@@ -2430 +2431 @@
                 case PGMPOOLKIND_PAE_PT_FOR_PAE_PT:
                 case PGMPOOLKIND_PAE_PT_FOR_PAE_2MB:
+                case PGMPOOLKIND_PAE_PT_FOR_PHYS:
                 {
                     unsigned  cPresent = pPage->cPresent;
@@ -3156 +3158 @@
         }
 
+        case PGMPOOLKIND_32BIT_PT_FOR_PHYS: /* treat it like a 4 MB page */
         case PGMPOOLKIND_32BIT_PT_FOR_32BIT_4MB:
         {
@@ -3164 +3167 @@
         }
 
+        case PGMPOOLKIND_PAE_PT_FOR_PHYS:   /* treat it like a 4 MB page */
         case PGMPOOLKIND_PAE_PT_FOR_PAE_2MB:
         case PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB:
@@ -3180 +3184 @@
         case PGMPOOLKIND_PAE_PT_FOR_PAE_2MB:
         case PGMPOOLKIND_PAE_PT_FOR_32BIT_4MB:
+        case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
+        case PGMPOOLKIND_PAE_PT_FOR_PHYS:
             break;
 #endif /* !PGMPOOL_WITH_GCPHYS_TRACKING */
@@ -3186 +3192 @@
         case PGMPOOLKIND_PAE_PD_FOR_PAE_PD:
         case PGMPOOLKIND_64BIT_PD_FOR_64BIT_PD:
+        case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
             pgmPoolTrackDerefPDPae(pPool, pPage, (PX86PDPAE)pvShw);
             break;
 
+        case PGMPOOLKIND_64BIT_PDPT_FOR_PHYS:
         case PGMPOOLKIND_64BIT_PDPT_FOR_64BIT_PDPT:
             pgmPoolTrackDerefPDPT64Bit(pPool, pPage, (PX86PDPT)pvShw);
@@ -3195 +3203 @@
         case PGMPOOLKIND_64BIT_PML4_FOR_64BIT_PML4:
             pgmPoolTrackDerefPML464Bit(pPool, pPage, (PX86PML4)pvShw);
-            break;
-
-        case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
-        case PGMPOOLKIND_64BIT_PDPT_FOR_PHYS:
-        case PGMPOOLKIND_PAE_PT_FOR_PHYS:
-        case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
-            /* No tracking here. */
             break;