Changeset 16260 in vbox

Timestamp:

Jan 27, 2009 10:45:39 AM (16 years ago)

Author:

vboxsync

Message:

More paging updates

Location:

trunk/src/VBox/VMM

Files:

• PGMGst.h (modified) (2 diffs)
• VMMAll/PGMAllBth.h (modified) (15 diffs)

trunk/src/VBox/VMM/PGMGst.h

@@ -113 +113 @@
 static DECLCALLBACK(int) pgmR3Gst32BitWriteHandlerCR3(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser);
 static DECLCALLBACK(int) pgmR3GstPAEWriteHandlerCR3(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser);
-static DECLCALLBACK(int) pgmR3GstPAEWriteHandlerPD(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser);
 #endif
 
@@ -404 +403 @@
 }
 
-# if 0
-/**
- * Physical write access for Guest CR3.
- *
- * @returns VINF_SUCCESS if the handler have carried out the operation.
- * @returns VINF_PGM_HANDLER_DO_DEFAULT if the caller should carry out the access operation.
- * @param   pVM             VM Handle.
- * @param   GCPhys          The physical address the guest is writing to.
- * @param   pvPhys          The HC mapping of that address.
- * @param   pvBuf           What the guest is reading/writing.
- * @param   cbBuf           How much it's reading/writing.
- * @param   enmAccessType   The access type.
- * @param   pvUser          User argument.
- */
-static DECLCALLBACK(int) pgmR3GstPAEWriteHandlerPD(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser)
-{
-    AssertMsg(!pVM->pgm.s.fMappingsFixed, ("Shouldn't be registered when mappings are fixed!\n"));
-    Assert(enmAccessType == PGMACCESSTYPE_WRITE);
-    Log2(("pgmR3GstPAEWriteHandlerPD: ff=%#x GCPhys=%RGp pvPhys=%p cbBuf=%d pvBuf={%.*Rhxs}\n", pVM->fForcedActions, GCPhys, pvPhys, cbBuf, cbBuf, pvBuf));
-
-    /*
-     * Do the write operation.
-     */
-    memcpy(pvPhys, pvBuf, cbBuf);
-    if (    !pVM->pgm.s.fMappingsFixed
-        &&  !VM_FF_ISPENDING(pVM, VM_FF_PGM_SYNC_CR3 | VM_FF_PGM_SYNC_CR3_NON_GLOBAL))
-    {
-        /*
-         * Figure out which of the 4 PDs this is.
-         */
-        unsigned i;
-        for (i = 0; i < 4; i++)
-            if (pVM->pgm.s.pGstPaePdptHC->a[i].u == (GCPhys & X86_PTE_PAE_PG_MASK))
-            {
-                PX86PDPAE       pPDSrc = pgmGstGetPaePD(&pVM->pgm.s, i << X86_PDPT_SHIFT);
-                const RTGCPTR   offPD  = GCPhys & PAGE_OFFSET_MASK;
-                const unsigned  iPD1   = offPD / sizeof(X86PDEPAE);
-                const unsigned  iPD2   = (offPD + cbBuf - 1) / sizeof(X86PDEPAE);
-                Assert(iPD1 - iPD2 <= 1);
-                if (    (   pPDSrc->a[iPD1].n.u1Present
-                         && pgmGetMapping(pVM, (i << X86_PDPT_SHIFT) | (iPD1 << X86_PD_PAE_SHIFT)) )
-                    ||  (   iPD1 != iPD2
-                         && pPDSrc->a[iPD2].n.u1Present
-                         && pgmGetMapping(pVM, (i << X86_PDPT_SHIFT) | (iPD2 << X86_PD_PAE_SHIFT)) )
-                   )
-                {
-                    Log(("pgmR3GstPaePD3WriteHandler: detected conflict. i=%d iPD1=%#x iPD2=%#x GCPhys=%RGp\n",
-                         i, iPD1, iPD2, GCPhys));
-                    STAM_COUNTER_INC(&pVM->pgm.s.StatR3GuestPDWriteConflict);
-                    VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
-                }
-                break; /* ASSUMES no duplicate entries... */
-            }
-        Assert(i < 4);
-    }
-
-    STAM_COUNTER_INC(&pVM->pgm.s.StatR3GuestPDWrite);
-    return VINF_SUCCESS;
-}
-# endif
-
 #endif /* PAE */
 

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

@@ -154 +154 @@
 
 #   ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+    PX86PDPAE       pPDDst;
 #    if PGM_GST_TYPE != PGM_TYPE_PAE
-    PX86PDPAE       pPDDst;
     X86PDPE         PdpeSrc;
 
@@ -3234 +3234 @@
     return VINF_SUCCESS;
 
-#elif PGM_SHW_TYPE == PGM_TYPE_AMD64 || defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)
+#elif PGM_SHW_TYPE == PGM_TYPE_AMD64
     /*
      * AMD64 (Shw & Gst) - No need to check all paging levels; we zero
@@ -3242 +3242 @@
 
 #else /* PGM_SHW_TYPE != PGM_TYPE_NESTED && PGM_SHW_TYPE != PGM_TYPE_EPT && PGM_SHW_TYPE != PGM_TYPE_AMD64 */
+
+# ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+    /* Nothing to do when mappings are fixed. */
+    if (!pVM->pgm.s.fMappingsFixed)
+        return VINF_SUCCESS;
+# endif
+
     /*
      * PAE and 32-bit legacy mode (shadow).
@@ -3279 +3286 @@
     PPGMPOOL    pPool         = pVM->pgm.s.CTX_SUFF(pPool);
 
+#  ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+    /* Mappings are always enabled when we get here. */
+    Assert(pgmMapAreMappingsEnabled(&pVM->pgm.s));
+    pMapping      = pVM->pgm.s.CTX_SUFF(pMappings);
+    iPdNoMapping  = (pMapping) ? (pMapping->GCPtr >> GST_PD_SHIFT) : ~0U;
+#  else
     /* Only check mappings if they are supposed to be put into the shadow page table. */
     if (pgmMapAreMappingsEnabled(&pVM->pgm.s))
@@ -3290 +3303 @@
         iPdNoMapping  = ~0U;
     }
+#  endif
 
 #  if PGM_GST_TYPE == PGM_TYPE_PAE
@@ -3300 +3314 @@
         PX86PDPT        pPdptDst  = pgmShwGetPaePDPTPtr(&pVM->pgm.s);
 
+#   ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
         if (pPDSrc == NULL)
         {
@@ -3321 +3336 @@
             continue;
         }
+#    endif /* !VBOX_WITH_PGMPOOL_PAGING_ONLY */
 #  else  /* PGM_GST_TYPE != PGM_TYPE_PAE */
     {
@@ -3358 +3374 @@
 #   endif
                 {
+#   ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
                     if (pVM->pgm.s.fMappingsFixed)
                     {
@@ -3364 +3381 @@
                         Assert(PGM_GST_TYPE == PGM_TYPE_32BIT || (iPD + cPTs - 1) / X86_PG_PAE_ENTRIES == iPD / X86_PG_PAE_ENTRIES);
                         iPD += cPTs - 1;
-#   if PGM_SHW_TYPE != PGM_GST_TYPE /* SHW==PAE && GST==32BIT */
+#    if PGM_SHW_TYPE != PGM_GST_TYPE /* SHW==PAE && GST==32BIT */
                         pPDEDst = pgmShwGetPaePDEPtr(&pVM->pgm.s, (uint32_t)(iPD + 1) << GST_PD_SHIFT);
-#   else
+#    else
                         pPDEDst += cPTs;
-#   endif
+#    endif
                         pMapping = pMapping->CTX_SUFF(pNext);
                         iPdNoMapping = pMapping ? pMapping->GCPtr >> GST_PD_SHIFT : ~0U;
                         continue;
                     }
+#   endif /* !VBOX_WITH_PGMPOOL_PAGING_ONLY */
 #   ifdef IN_RING3
 #    if PGM_GST_TYPE == PGM_TYPE_32BIT
@@ -3398 +3416 @@
 #  endif /* (PGM_GST_TYPE != PGM_TYPE_32BIT && PGM_GST_TYPE != PGM_TYPE_PAE) || PGM_WITHOUT_MAPPINGS */
 
+#  ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
                 /*
                  * Sync page directory entry.
@@ -3486 +3505 @@
                     pPDEDst++;
                 } /* foreach 2MB PAE PDE in 4MB guest PDE */
+#  endif /* !VBOX_WITH_PGMPOOL_PAGING_ONLY */
             }
 #  if PGM_GST_TYPE == PGM_TYPE_PAE
@@ -3493 +3513 @@
 #  endif
             {
+#  ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY 
                 /*
                  * Check if there is any page directory to mark not present here.
                  */
-#  if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
+#   if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
                 for (unsigned i = 0, iPdShw = iPD * 2; i < 2; i++, iPdShw++) /* pray that the compiler unrolls this */
-#  elif PGM_GST_TYPE == PGM_TYPE_PAE
+#   elif PGM_GST_TYPE == PGM_TYPE_PAE
                 const unsigned iPdShw = iPD + iPdpt * X86_PG_PAE_ENTRIES;
-#  else
+#   else
                 const unsigned iPdShw = iPD;
-#  endif
+#   endif
                 {
                     if (pPDEDst->n.u1Present)
@@ -3512 +3533 @@
                     pPDEDst++;
                 }
+#  endif /* !VBOX_WITH_PGMPOOL_PAGING_ONLY */
             }
             else
@@ -3522 +3544 @@
 
                 Assert(pgmMapAreMappingsEnabled(&pVM->pgm.s));
+#   ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY 
                 if (pVM->pgm.s.fMappingsFixed)
                 {
@@ -3529 +3552 @@
                 }
                 else
+#   endif
                 {
                     /*