Changeset 32785 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

Timestamp:

Sep 28, 2010 9:38:35 AM (14 years ago)

Author:

vboxsync

Message:

Cleaned up SyncPageWorker for non-paging modes.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (15 diffs)

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

@@ -37 +37 @@
 static int PGM_BTH_NAME(CheckDirtyPageFault)(PVMCPU pVCpu, uint32_t uErr, PSHWPDE pPdeDst, GSTPDE const *pPdeSrc, RTGCPTR GCPtrPage);
 static int PGM_BTH_NAME(SyncPT)(PVMCPU pVCpu, unsigned iPD, PGSTPD pPDSrc, RTGCPTR GCPtrPage);
+#if PGM_WITH_PAGING(PGM_GST_TYPE, PGM_SHW_TYPE)
 static void PGM_BTH_NAME(SyncPageWorker)(PVMCPU pVCpu, PSHWPTE pPteDst, GSTPDE PdeSrc, GSTPTE PteSrc, PPGMPOOLPAGE pShwPage, unsigned iPTDst);
+#else
+static void PGM_BTH_NAME(SyncPageWorker)(PVMCPU pVCpu, PSHWPTE pPteDst, RTGCPHYS GCPhysPage, PPGMPOOLPAGE pShwPage, unsigned iPTDst);
+#endif
 PGM_BTH_DECL(int, VerifyAccessSyncPage)(PVMCPU pVCpu, RTGCPTR Addr, unsigned fPage, unsigned uErr);
 PGM_BTH_DECL(int, PrefetchPage)(PVMCPU pVCpu, RTGCPTR GCPtrPage);
@@ -1581 +1585 @@
  * @remark  Not used for 2/4MB pages!
  */
+#if PGM_WITH_PAGING(PGM_GST_TYPE, PGM_SHW_TYPE)
 static void PGM_BTH_NAME(SyncPageWorker)(PVMCPU pVCpu, PSHWPTE pPteDst, GSTPDE PdeSrc, GSTPTE PteSrc,
                                          PPGMPOOLPAGE pShwPage, unsigned iPTDst)
+#else
+static void PGM_BTH_NAME(SyncPageWorker)(PVMCPU pVCpu, PSHWPTE pPteDst, RTGCPHYS GCPhysPage, PPGMPOOLPAGE pShwPage, unsigned iPTDst)
+#endif
 {
     PVM      pVM = pVCpu->CTX_SUFF(pVM);
@@ -1604 +1612 @@
 #endif
 
+#if PGM_WITH_PAGING(PGM_GST_TYPE, PGM_SHW_TYPE)
     if (   PteSrc.n.u1Present
         && GST_IS_PTE_VALID(pVCpu, PteSrc))
-    {
+#endif
+    {
+# if PGM_WITH_PAGING(PGM_GST_TYPE, PGM_SHW_TYPE)
+        RTGCPHYS GCPhysPage = GST_GET_PTE_GCPHYS(PteSrc);
+# endif
         /*
          * Find the ram range.
          */
         PPGMPAGE pPage;
-        int rc = pgmPhysGetPageEx(&pVM->pgm.s, GST_GET_PTE_GCPHYS(PteSrc), &pPage);
+        int rc = pgmPhysGetPageEx(&pVM->pgm.s, GCPhysPage, &pPage);
         if (RT_SUCCESS(rc))
         {
@@ -1627 +1640 @@
             if (    PGM_PAGE_GET_TYPE(pPage)  == PGMPAGETYPE_RAM
                 &&  (   PGM_PAGE_IS_ZERO(pPage)
+# if PGM_WITH_PAGING(PGM_GST_TYPE, PGM_SHW_TYPE)
                      || (   PteSrc.n.u1Write
+# else
+                     || (   1
+# endif
                          && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED
 # ifdef VBOX_WITH_REAL_WRITE_MONITORED_PAGES
@@ -1639 +1656 @@
                )
             {
-                rc = pgmPhysPageMakeWritable(pVM, pPage, GST_GET_PTE_GCPHYS(PteSrc));
+                rc = pgmPhysPageMakeWritable(pVM, pPage, GCPhysPage);
                 AssertRC(rc);
             }
@@ -1648 +1665 @@
              */
             SHWPTE PteDst;
+# if PGM_WITH_PAGING(PGM_GST_TYPE, PGM_SHW_TYPE)
+            uint64_t fGstShwPteFlags = GST_GET_PTE_SHW_FLAGS(pVCpu, PteSrc);
+# else
+            uint64_t fGstShwPteFlags = X86_PTE_P | X86_PTE_RW | X86_PTE_US | X86_PTE_A | X86_PTE_D;
+# endif
             if (PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
-                PGM_BTH_NAME(SyncHandlerPte)(pVM, pPage, GST_GET_PTE_SHW_FLAGS(pVCpu, PteSrc), &PteDst);
+                PGM_BTH_NAME(SyncHandlerPte)(pVM, pPage, fGstShwPteFlags, &PteDst);
             else
             {
@@ -1671 +1693 @@
                     STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,DirtyPage));
                     SHW_PTE_SET(PteDst,
-                                  GST_GET_PTE_SHW_FLAGS(pVCpu, PteSrc)
+                                  fGstShwPteFlags
                                 | PGM_PAGE_GET_HCPHYS(pPage)
                                 | PGM_PTFLAGS_TRACK_DIRTY);
@@ -1689 +1711 @@
                     /* PteDst.n.u1Size = 0 */
 #else
-                    SHW_PTE_SET(PteDst, GST_GET_PTE_SHW_FLAGS(pVCpu, PteSrc) | PGM_PAGE_GET_HCPHYS(pPage));
+                    SHW_PTE_SET(PteDst, fGstShwPteFlags | PGM_PAGE_GET_HCPHYS(pPage));
 #endif
                 }
@@ -1702 +1724 @@
                     Assert(!PGM_PAGE_IS_ZERO(pPage));
                     SHW_PTE_SET_RO(PteDst);   /** @todo this isn't quite working yet. Why, isn't it? */
-                    Log3(("SyncPageWorker: write-protecting %RGp pPage=%R[pgmpage]at iPTDst=%d\n", (RTGCPHYS)GST_GET_PTE_GCPHYS(PteSrc), pPage, iPTDst));
+                    Log3(("SyncPageWorker: write-protecting %RGp pPage=%R[pgmpage]at iPTDst=%d\n", GCPhysPage, pPage, iPTDst));
                 }
             }
@@ -1740 +1762 @@
         Log2(("SyncPageWorker: invalid address in Pte\n"));
     }
+#if PGM_WITH_PAGING(PGM_GST_TYPE, PGM_SHW_TYPE)
     else if (!PteSrc.n.u1Present)
         Log2(("SyncPageWorker: page not present in Pte\n"));
     else
         Log2(("SyncPageWorker: invalid Pte\n"));
+#endif
 
     /*
@@ -2208 +2232 @@
             {
                 RTGCPTR GCPtrCurPage = (GCPtrPage & ~(RTGCPTR)(SHW_PT_MASK << SHW_PT_SHIFT)) | (iPTDst << PAGE_SHIFT);
-                GSTPTE  PteSrc;
-
-                /* Fake the page table entry */
-                PteSrc.u = GCPtrCurPage;
-                PteSrc.n.u1Present  = 1;
-                PteSrc.n.u1Dirty    = 1;
-                PteSrc.n.u1Accessed = 1;
-                PteSrc.n.u1Write    = 1;
-                PteSrc.n.u1User     = 1;
-
-                PGM_BTH_NAME(SyncPageWorker)(pVCpu, &pPTDst->a[iPTDst], PdeSrc, PteSrc, pShwPage, iPTDst);
-                Log2(("SyncPage: 4K+ %RGv PteSrc:{P=%d RW=%d U=%d raw=%08llx} PteDst=%08llx%s\n",
-                      GCPtrCurPage, PteSrc.n.u1Present,
-                      PteSrc.n.u1Write & PdeSrc.n.u1Write,
-                      PteSrc.n.u1User  & PdeSrc.n.u1User,
-                      (uint64_t)PteSrc.u,
+
+                PGM_BTH_NAME(SyncPageWorker)(pVCpu, &pPTDst->a[iPTDst], GCPtrCurPage, pShwPage, iPTDst);
+                Log2(("SyncPage: 4K+ %RGv PteSrc:{P=1 RW=1 U=1} PteDst=%08llx%s\n",
+                      GCPtrCurPage, 
                       SHW_PTE_LOG64(pPTDst->a[iPTDst]),
                       SHW_PTE_IS_TRACK_DIRTY(pPTDst->a[iPTDst]) ? " Track-Dirty" : ""));
@@ -2239 +2251 @@
         const unsigned  iPTDst       = (GCPtrPage >> SHW_PT_SHIFT) & SHW_PT_MASK;
         RTGCPTR         GCPtrCurPage = (GCPtrPage & ~(RTGCPTR)(SHW_PT_MASK << SHW_PT_SHIFT)) | (iPTDst << PAGE_SHIFT);
-        GSTPTE          PteSrc;
-
-        /* Fake the page table entry */
-        PteSrc.u = GCPtrCurPage;
-        PteSrc.n.u1Present  = 1;
-        PteSrc.n.u1Dirty    = 1;
-        PteSrc.n.u1Accessed = 1;
-        PteSrc.n.u1Write    = 1;
-        PteSrc.n.u1User     = 1;
-        PGM_BTH_NAME(SyncPageWorker)(pVCpu, &pPTDst->a[iPTDst], PdeSrc, PteSrc, pShwPage, iPTDst);
-
-        Log2(("SyncPage: 4K  %RGv PteSrc:{P=%d RW=%d U=%d raw=%08llx}PteDst=%08llx%s\n",
-              GCPtrPage, PteSrc.n.u1Present,
-              PteSrc.n.u1Write & PdeSrc.n.u1Write,
-              PteSrc.n.u1User  & PdeSrc.n.u1User,
-              (uint64_t)PteSrc.u,
+
+        PGM_BTH_NAME(SyncPageWorker)(pVCpu, &pPTDst->a[iPTDst], GCPtrCurPage, pShwPage, iPTDst);
+
+        Log2(("SyncPage: 4K  %RGv PteSrc:{P=1 RW=1 U=1}PteDst=%08llx%s\n",
+              GCPtrPage, 
               SHW_PTE_LOG64(pPTDst->a[iPTDst]),
               SHW_PTE_IS_TRACK_DIRTY(pPTDst->a[iPTDst]) ? " Track-Dirty" : ""));
@@ -3134 +3135 @@
 # endif /* HC_ARCH_BITS == 64 */
 
-    GSTPDE PdeSrc;
-    PdeSrc.u            = 0; /* faked so we don't have to #ifdef everything */
-    PdeSrc.n.u1Present  = 1;
-    PdeSrc.n.u1Write    = 1;
-    PdeSrc.n.u1Accessed = 1;
-    PdeSrc.n.u1User     = 1;
-
     /*
      * Allocate & map the page table.
@@ -3169 +3163 @@
         {
             RTGCPTR GCPtrCurPage = (GCPtrPage & ~(RTGCPTR)(SHW_PT_MASK << SHW_PT_SHIFT)) | (iPTDst << PAGE_SHIFT);
-            GSTPTE  PteSrc;
-
-            /* Fake the page table entry */
-            PteSrc.u = GCPtrCurPage;
-            PteSrc.n.u1Present  = 1;
-            PteSrc.n.u1Dirty    = 1;
-            PteSrc.n.u1Accessed = 1;
-            PteSrc.n.u1Write    = 1;
-            PteSrc.n.u1User     = 1;
-
-            PGM_BTH_NAME(SyncPageWorker)(pVCpu, &pPTDst->a[iPTDst], PdeSrc, PteSrc, pShwPage, iPTDst);
-            Log2(("SyncPage: 4K+ %RGv PteSrc:{P=%d RW=%d U=%d raw=%08llx} PteDst=%08llx%s\n",
-                    GCPtrCurPage, PteSrc.n.u1Present,
-                    PteSrc.n.u1Write & PdeSrc.n.u1Write,
-                    PteSrc.n.u1User  & PdeSrc.n.u1User,
-                    (uint64_t)PteSrc.u,
+
+            PGM_BTH_NAME(SyncPageWorker)(pVCpu, &pPTDst->a[iPTDst], GCPtrCurPage, pShwPage, iPTDst);
+            Log2(("SyncPage: 4K+ %RGv PteSrc:{P=1 RW=1 U=1} PteDst=%08llx%s\n",
+                    GCPtrCurPage,
                     SHW_PTE_LOG64(pPTDst->a[iPTDst]),
                     SHW_PTE_IS_TRACK_DIRTY(pPTDst->a[iPTDst]) ? " Track-Dirty" : ""));
@@ -3208 +3190 @@
 
     STAM_PROFILE_STOP(&pVCpu->pgm.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,SyncPT), a);
+    if (RT_FAILURE(rc))
+        STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,SyncPTFailed));
     return rc;