Changeset 4738

Timestamp:

09/12/07 18:00:54 (1 year ago)

Author:

vboxsync

Message:

more new phys code.

Files:

• trunk/include/VBox/err.h (modified) (1 diff)
• trunk/include/VBox/pgm.h (modified) (2 diffs)
• trunk/include/VBox/vm.h (modified) (2 diffs)
• trunk/include/VBox/vmm.h (modified) (2 diffs)
• trunk/src/VBox/VMM/EM.cpp (modified) (4 diffs)
• trunk/src/VBox/VMM/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/VMM/PGM.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/PGMInternal.h (modified) (7 diffs)
• trunk/src/VBox/VMM/PGMPhys.cpp (modified) (8 diffs)
• trunk/src/VBox/VMM/VMM.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/VMMR0/PGMR0.cpp (added)
• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/include/VBox/err.h

@@ -1108 +1108 @@
-/** @} */
-
+/** @name VBox GMM Status Codes 
+ * @{
+ */
+/** The GMM is out of pages and needs to be give another chunk of user memory that 
+ * it can lock down and borrow pages from. */
+#define VERR_GMM_SEED_ME                            (-4150)
+/** @} */
+
+
-/* SED-END */
-

trunk/include/VBox/pgm.h

@@ -1283 +1283 @@
-
-
+#ifdef IN_RING0
+/** @defgroup grp_pgm_r0  The PGM Host Context Ring-0 API
+ * @ingroup grp_pgm
+ * @{
+ */
+/** 
+ * Worker function for PGMR3PhysAllocateHandyPages and pgmPhysEnsureHandyPage.
+ * 
+ * @returns The following VBox status codes.
+ * @retval  VINF_SUCCESS on success. FF cleared.
+ * @retval  VINF_EM_NO_MEMORY if we're out of memory. The FF is set in this case.
+ * 
+ * @param   pVM         The VM handle.
+ * 
+ * @remarks Must be called from within the PGM critical section.
+ */
+PGMR0DECL(int) PGMR0PhysAllocateHandyPages(PVM pVM);
+
+/** @} */
+#endif 
+
+
+
-#ifdef IN_RING3
-/** @defgroup grp_pgm_r3  The PGM Host Context Ring-3 API
@@ -1753 +1776 @@
-
-/**
+ * Response to VM_FF_PGM_NEED_HANDY_PAGES and VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES.
+ * 
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS on success. FF cleared.
+ * @retval  VINF_EM_NO_MEMORY if we're out of memory. The FF is not cleared in this case.
+ * 
+ * @param   pVM         The VM handle.
+ */
+PDMR3DECL(int) PGMR3PhysAllocateHandyPages(PVM pVM);
+
+/**
- * Perform an integrity check on the PGM component.
- *

trunk/include/VBox/vm.h

@@ -43 +43 @@
- */
-/** This action forces the VM to service check and pending interrups on the APIC. */
-BIT
+RT_BIT_32
-/** This action forces the VM to service check and pending interrups on the PIC. */
-BIT
+RT_BIT_32
-/** This action forces the VM to schedule and run pending timer (TM). */
-BIT
+RT_BIT_32
-/** PDM Queues are pending. */
-BIT
+RT_BIT_32
-/** PDM DMA transfers are pending. */
-BIT
+RT_BIT_32
-/** PDM critical section unlocking is pending, process promptly upon return to R3. */
-BIT
+RT_BIT_32
-
-/** This action forces the VM to call DBGF so DBGF can service debugger
- * requests in the emulation thread.
- * This action flag stays asserted till DBGF clears it.*/
-BIT
+RT_BIT_32
-/** This action forces the VM to service pending requests from other
- * thread or requests which must be executed in another context. */
-BIT
+RT_BIT_32
-/** Terminate the VM immediately. */
-BIT
+RT_BIT_32
-/** Reset the VM. (postponed) */
-BIT
+RT_BIT_32
-
-/** This action forces the VM to resync the page tables before going
- * back to execute guest code. (GLOBAL FLUSH) */
-BIT
+RT_BIT_32
-/** Same as VM_FF_PGM_SYNC_CR3 except that global pages can be skipped.
- * (NON-GLOBAL FLUSH) */
-
+
+
+
-/** Check the interupt and trap gates */
-BIT(18
+RT_BIT_32(19
-/** Check Guest's TSS ring 0 stack */
-BIT(19
+RT_BIT_32(20
-/** Check Guest's GDT table */
-BIT(20
+RT_BIT_32(21
-/** Check Guest's LDT table */
-BIT(21
+RT_BIT_32(22
-/** Inhibit interrupts pending. See EMGetInhibitInterruptsPC(). */
-BIT(22
+RT_BIT_32(23
-
-/** CSAM needs to scan the page that's being executed */
-BIT
+RT_BIT_32
-/** CSAM needs to do some homework. */
-BIT
+RT_BIT_32
-
-/** Force return to Ring-3. */
-BIT
+RT_BIT_32
-
-/** Suspend the VM - debug only. */
-BIT
+RT_BIT_32
-
-/** Externally forced actions. Used to quit the idle/wait loop. */
@@ -101 +103 @@
-/** High priority pre-execution actions. */
-#define VM_FF_HIGH_PRIORITY_PRE_MASK    (VM_FF_TERMINATE | VM_FF_DBGF | VM_FF_INTERRUPT_APIC | VM_FF_INTERRUPT_PIC | VM_FF_TIMER | VM_FF_DEBUG_SUSPEND \
-
+ | VM_FF_PGM_NEED_HANDY_PAGES
-/** High priority pre raw-mode execution mask. */
-
+
+
-/** High priority post-execution actions. */
-|
+ | 
-/** Normal priority post-execution actions. */
-#define VM_FF_NORMAL_PRIORITY_POST_MASK (VM_FF_TERMINATE | VM_FF_DBGF | VM_FF_RESET | VM_FF_CSAM_SCAN_PAGE)

trunk/include/VBox/vmm.h

@@ -76 +76 @@
-    /** Maps a chunk into ring-3. */
-    VMMCALLHOST_PGM_MAP_CHUNK,
+    /** Allocates more handy pages. */
+    VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES,
-#ifndef NEW_PHYS_CODE
-    /** Dynamically allocate physical guest RAM. */
@@ -362 +364 @@
-    VMMR0_DO_CALL_HYPERVISOR,
-
+    /** Call PGMR0PhysAllocateHandyPages(). */
+    VMMR0_DO_PGM_ALLOCATE_HANDY_PAGES,
+    /** Call GMMR0AllocatePages(). */
+    VMMR0_DO_GMM_ALLOCATE_PAGES,
+    /** Call GMMR0FreePages(). */
+    VMMR0_DO_GMM_FREE_PAGES,
+    /** Call GMMR0MapUnmapChunk(). */
+    VMMR0_DO_GMM_MAP_UNMAP_CHUNK,
+    /** Call GMMR0SeedChunk(). */
+    VMMR0_DO_GMM_SEED_CHUNK,
+
-    /** The start of the R0 service operations. */
-    VMMR0_DO_SRV_START,

trunk/src/VBox/VMM/EM.cpp

@@ -2359 +2359 @@
-    }
-
+    /* 
+     * Allocate handy pages (just in case the above actions have consumed some pages).
+     */
+    if (VM_FF_ISSET(pVM, VM_FF_PGM_NEED_HANDY_PAGES))
+    {
+        int rc = PGMR3PhysAllocateHandyPages(pVM);
+        if (VBOX_FAILURE(rc))
+            return rc;
+    }
+
-    return VINF_SUCCESS;
-}
@@ -2489 +2499 @@
-        if (VM_FF_ISPENDING(pVM, VM_FF_HIGH_PRIORITY_POST_MASK))
-            rc = emR3HighPriorityPostForcedActions(pVM, rc);
-
-#ifdef PGM_CACHE_VERY_STRICT
-        /*
-         * Page manager cache checks.
-         */
-        if (    rc == VINF_EM_RAW_INTERRUPT
-            ||  rc == VINF_EM_RAW_GUEST_TRAP
-            ||  rc == VINF_IOM_HC_IOPORT_READ
-            ||  rc == VINF_IOM_HC_IOPORT_WRITE
-            //||  rc == VINF_PATM_PATCH_INT3
-           )
-            pgmCacheCheckPD(pVM, pCtx->cr0, pCtx->cr3, pCtx->cr4);
-#endif
-
-#ifdef VBOX_STRICT
@@ -3071 +3068 @@
-        }
-
+        /* 
+         * Allocate handy pages.
+         */
+        if (VM_FF_ISSET(pVM, VM_FF_PGM_NEED_HANDY_PAGES))
+        {
+            rc2 = PGMR3PhysAllocateHandyPages(pVM);
+            UPDATE_RC();
+        }
+
-        /*
-         * Debugger Facility request.
@@ -3103 +3109 @@
-#endif
-        /* check that we got them all  */
-
+ | VM_FF_PGM_NEED_HANDY_PAGES
-    }
-

trunk/src/VBox/VMM/Makefile.kmk

@@ -335 +335 @@
-        VMMR0/TRPMR0A.asm \
-        VMMR0/PDMR0Device.cpp \
+        VMMR0/PGMR0.cpp \
-        VMMAll/EMAll.cpp \
-        VMMAll/EMAllA.asm \

trunk/src/VBox/VMM/PGM.cpp

@@ -501 +501 @@
- * So, when RTR0MemObjAllocPhysNC returns VERR_NOT_SUPPORTED the page allocator
- * will return to the ring-3 caller (and later ring-0) and asking it to seed
-V
+M
- * then perform an SUPPageAlloc(cbChunk >> PAGE_SHIFT) call and make a 
- * "SeededAllocPages" call to ring-0.
@@ -1406 +1406 @@
-    STAM_REG(pVM, &pPGM->StatChunkR3MapTlbHits,             STAMTYPE_COUNTER, "/PGM/ChunkR3Map/TlbHits",                STAMUNIT_OCCURENCES, "TLB hits.");
-    STAM_REG(pVM, &pPGM->StatChunkR3MapTlbMisses,           STAMTYPE_COUNTER, "/PGM/ChunkR3Map/TlbMisses",              STAMUNIT_OCCURENCES, "TLB misses.");
+    STAM_REG(pVM, &pPGM->StatPageReplaceShared,             STAMTYPE_COUNTER, "/PGM/Page/ReplacedShared",               STAMUNIT_OCCURENCES, "Times a shared page was replaced.");
+    STAM_REG(pVM, &pPGM->StatPageReplaceZero,               STAMTYPE_COUNTER, "/PGM/Page/ReplacedZero",                 STAMUNIT_OCCURENCES, "Times the zero page was replaced.");
+    STAM_REG(pVM, &pPGM->StatPageHandyAllocs,               STAMTYPE_COUNTER, "/PGM/Page/HandyAllocs",                  STAMUNIT_OCCURENCES, "Number of times we've allocated more handy pages.");
+    STAM_REG(pVM, &pPGM->cAllPages,                         STAMTYPE_U32,     "/PGM/Page/cAllPages",                    STAMUNIT_OCCURENCES, "The total number of pages.");
+    STAM_REG(pVM, &pPGM->cPrivatePages,                     STAMTYPE_U32,     "/PGM/Page/cPrivatePages",                STAMUNIT_OCCURENCES, "The number of private pages.");
+    STAM_REG(pVM, &pPGM->cSharedPages,                      STAMTYPE_U32,     "/PGM/Page/cSharedPages",                 STAMUNIT_OCCURENCES, "The number of shared pages.");
+    STAM_REG(pVM, &pPGM->cZeroPages,                        STAMTYPE_U32,     "/PGM/Page/cZeroPages",                   STAMUNIT_OCCURENCES, "The number of zero backed pages.");
-
-#ifdef PGMPOOL_WITH_GCPHYS_TRACKING

trunk/src/VBox/VMM/PGMInternal.h

@@ -552 +552 @@
-
-/** The chunk shift. (2^20 = 1 MB) */
-P
+M
-/** The allocation chunk size. */
-PM_CHUNK_SIZE                  (1U << GPM_CHUNK_SIZE_LOG2
+MM_CHUNK_SIZE                  (1U << GMM_CHUNK_SHIFT
-/** The shift factor for converting a page id into a chunk id. */
-PM_CHUNKID_SHIFT               (GP
+MM_CHUNKID_SHIFT               (GM
-/** The NIL Chunk ID value. */
-P
+M
-/** The NIL Page ID value. */
-P
+M
-
-/**
- * Get the Page ID.
-P
+M
- * @param   pPage       Pointer to the physical guest page tracking structure.
- */
@@ -585 +585 @@
-/**
- * Get the Chunk ID.
-P
+M
- * @param   pPage       Pointer to the physical guest page tracking structure.
- */
-P
+M
-/* later:
-P
+M
-# define PGM_PAGE_GET_CHUNKID(pPage)    ( (uint32_t)((pPage)->HCPhys >> 48) )
-P
-P
-P
-P
-P
+M
+M
+M
+M
+M
-#else
-P
+M
-#endif
-*/
@@ -607 +607 @@
- * @param   pPage       Pointer to the physical guest page tracking structure.
- */
-P
+M
-/* later:
-P
-P
+M
+M
-#else
-# define PGM_PAGE_GET_PAGE_IN_CHUNK(pPage)  (   (uint32_t)((pPage)->HCPhys & 0xfff) \
-P
+M
-#endif
-*/
@@ -637 +637 @@
- */
-#define PGM_PAGE_IS_ZERO(pPage)         ( (pPage)->u2State == PGM_PAGE_STATE_ZERO )
+
+/**
+ * Checks if the page is backed by a SHARED page.
+ * @returns true/false.
+ * @param   pPage       Pointer to the physical guest page tracking structure.
+ */
+#define PGM_PAGE_IS_SHARED(pPage)        ( (pPage)->u2State == PGM_PAGE_STATE_SHARED )
-
-
@@ -1845 +1852 @@
-    /** The GC mapping of the zero page. */ 
-    RTGCPTR                         pvZeroPgGC;
-=
+!
-    uint32_t                        u32ZeroAlignment; /**< Alignment padding. */
-#endif
-    /** @}*/
-
+    /** The number of handy pages. */
+    uint32_t                        cHandyPages;
+    /** 
+     * Array of handy pages.
+     * 
+     * This array is used in a two way communication between pgmPhysAllocPage 
+     * and GMMR0AllocateHandyPages, with PGMR3PhysAllocateHandyPages serving as
+     * an intermediary.
+     * 
+     * The size of this array is important, see pgmPhysEnsureHandyPage for details.
+     * (The current size of 32 pages, means 128 KB of memory.)
+     */
+    struct 
+    {
+        /** The host physical address before pgmPhysAllocPage uses it,
+         * and the guest physical address afterwards.
+         * This is NIL_RTHCPHYS if the array entry isn't valid.
+         * ASSUMES: sizeof(RTHCPHYS) >= sizeof(RTHCPHYS). */
+        RTHCPHYS                    HCPhysGCPhys;
+        /** The Page ID.
+         * This is NIL_GMM_PAGEID if the array entry isn't valid. */
+        uint32_t                    idPage;
+        /** The Page ID of the shared page that pgmPageAllocPage replaced.
+         * This is NIL_GMM_PAGEID if no shared page was replaced. */
+        uint32_t                    idSharedPage;
+    }                               aHandyPages[32];
+
-    /** @name Release Statistics
-
+
+
+
+
+
-    /** The number of times the guest has switched mode since last reset or statistics reset. */
-    STAMCOUNTER                     cGuestModeChanges;
@@ -2108 +2146 @@
-    /** Ring-3/0 chunk mapper TLB misses. */
-    STAMCOUNTER StatChunkR3MapTlbMisses;
+    /** Times a shared page has been replaced by a private one. */
+    STAMCOUNTER StatPageReplaceShared;
+    /** Times the zero page has been replaced by a private one. */
+    STAMCOUNTER StatPageReplaceZero;
+    /** The number of times we've executed GMMR3AllocateHandyPages. */
+    STAMCOUNTER StatPageHandyAllocs;
-
-    /** Allocated mbs of guest ram */
@@ -2160 +2204 @@
-int             pgmPhysPageLoadIntoTlb(PPGM pPGM, RTGCPHYS GCPhys);
-#ifdef IN_RING3
+int             pgmR3PhysChunkMap(PVM pVM, uint32_t idChunk, PPPGMCHUNKR3MAP ppChunk);
+#ifndef NEW_PHYS_CODE
-int             pgmr3PhysGrowRange(PVM pVM, RTGCPHYS GCPhys);
-
+
-
-int             pgmR3PoolInit(PVM pVM);

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -372 +372 @@
-}
-
+#ifndef NEW_PHYS_CODE
-
-/**
@@ -448 +449 @@
-}
-
+#endif /* !NEW_PHYS_CODE */
-
-/**
@@ -779 +781 @@
-
-
-
-
-
-
-
+
+
+
+
-{
-    /** The chunk to map, UINT32_MAX if unmap only. (IN) */
@@ -791 +792 @@
-    /** Where the mapping address is returned. (OUT) */
-    RTR3PTR     pvR3;
-PGM
+GMMMAPUN
-
-
@@ -831 +832 @@
-     * necessary unmap another one to make space in the mapping cache.
-     */
-PGM
+GMMMAPUN
-    Req.pvR3 = NULL;
-    Req.idChunkMap = idChunk;
@@ -838 +839 @@
-        Req.idChunkUnmap = pgmR3PhysChunkFindUnmapCandidate(pVM);
-    /** @todo SUPCallVMMR0Ex needs to support in+out or similar.  */
-PGM_
+GMM_MAP_UN
-    if (VBOX_SUCCESS(rc))
-    {
@@ -909 +910 @@
-    for (unsigned i = 0; i < RT_ELEMENTS(pVM->pgm.s.ChunkR3Map.Tlb.aEntries); i++)
-    {
-P
+M
-        pVM->pgm.s.ChunkR3Map.Tlb.aEntries[i].pChunk = NULL;
-    }
@@ -916 +917 @@
-
-
+/**
+ * Response to VM_FF_PGM_NEED_HANDY_PAGES and VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES.
+ * 
+ * @returns The following VBox status codes.
+ * @retval  VINF_SUCCESS on success. FF cleared.
+ * @retval  VINF_EM_NO_MEMORY if we're out of memory. The FF is not cleared in this case.
+ * 
+ * @param   pVM         The VM handle.
+ */
+PDMR3DECL(int) PGMR3PhysAllocateHandyPages(PVM pVM)
+{
+    pgmLock(pVM);
+    int rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_PGM_ALLOCATE_HANDY_PAGES, NULL, 0);
+    if (rc == VERR_GMM_SEED_ME)
+    {
+        void *pvChunk;
+        rc = SUPPageAlloc(GMM_CHUNK_SIZE >> PAGE_SHIFT, &pvChunk);
+        if (VBOX_SUCCESS(rc))
+            rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GMM_SEED_CHUNK, pvChunk, 0);
+        if (VBOX_FAILURE(rc))
+        {
+            LogRel(("PGM: GMM Seeding failed, rc=%Vrc\n", rc));
+            rc = VINF_EM_NO_MEMORY;
+        }
+    }
+    pgmUnlock(pVM);
+    Assert(rc == VINF_SUCCESS || rc == VINF_EM_NO_MEMORY);
+    return rc;
+}
+

trunk/src/VBox/VMM/VMM.cpp

@@ -2173 +2173 @@
-            break;
-        }
+
+        /*
+         * Allocates more handy pages.
+         */
+        case VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES:
+        {
+            pVM->vmm.s.rcCallHost = PGMR3PhysAllocateHandyPages(pVM);
+            break;
+        }
+
-#ifndef NEW_PHYS_CODE
-

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

@@ -35 +35 @@
-#include <VBox/vmm.h>
-#include <VBox/iom.h>
+#include <VBox/rem.h>
-#include "PGMInternal.h"
-#include <VBox/vm.h>
@@ -167 +168 @@
-
-
+
+/**
+ * Makes sure that there is at least one handy page ready for use.
+ * 
+ * This will also take the appropriate actions when reaching water-marks.
+ * 
+ * @returns The following VBox status codes.
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_EM_NO_MEMORY if we're really out of memory.
+ * 
+ * @param   pVM     The VM handle.
+ * 
+ * @remarks Must be called from within the PGM critical section. It may
+ *          nip back to ring-3/0 in some cases.
+ */
+static int pgmPhysEnsureHandyPage(PVM pVM)
+{
+    /** @remarks
+     * low-water mark logic for R0 & GC:
+     *      - 75%: Set FF.
+     *      - 50%: Force return to ring-3 ASAP.
+     *
+     * For ring-3 there is a little problem wrt to the recompiler, so:
+     *      - 75%: Set FF.
+     *      - 50%: Try allocate pages; on failure we'll force REM to quite ASAP.
+     *
+     * The basic idea is that we should be able to get out of any situation with 
+     * only 50% of handy pages remaining.
+     *
+     * At the moment we'll not adjust the number of handy pages relative to the 
+     * actual VM RAM committment, that's too much work for now.
+     */
+    Assert(pVM->pgm.s.cHandyPages <= RT_ELEMENTS(pVM->pgm.s.aHandyPages));
+    if (    !pVM->pgm.s.cHandyPages
+#ifdef IN_RING3
+        ||   pVM->pgm.s.cHandyPages - 1 <= RT_ELEMENTS(pVM->pgm.s.aHandyPages) / 2 /* 50% */
+#endif 
+       )
+    {
+        Log(("PGM: cHandyPages=%u out of %u -> allocate more\n", pVM->pgm.s.cHandyPages - 1 <= RT_ELEMENTS(pVM->pgm.s.aHandyPages)));
+#ifdef IN_RING3
+        int rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_PGM_ALLOCATE_HANDY_PAGES, NULL, 0);
+#elif defined(IN_RING0)
+        /** @todo call PGMR0PhysAllocateHandyPages directly - need to make sure we can call kernel code first and deal with the seeding fallback. */
+        int rc = VMMR0CallHost(pVM, VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES, 0);
+#else
+        int rc = VMMGCCallHost(pVM, VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES, 0);
+#endif 
+        if (RT_UNLIKELY(rc != VINF_SUCCESS))
+        {
+            Assert(rc == VINF_EM_NO_MEMORY);
+            if (!pVM->pgm.s.cHandyPages)
+            {
+                LogRel(("PGM: no more handy pages!\n"));
+                return VERR_EM_NO_MEMORY;
+            }
+            Assert(VM_FF_ISSET(pVM, VM_FF_PGM_NEED_HANDY_PAGES));
+#ifdef IN_RING3
+            REMR3NotifyFF(pVM);
+#else
+            VM_FF_SET(pVM, VM_FF_TO_R3);
+#endif
+        }
+        Assert(pVM->pgm.s.cHandyPages <= RT_ELEMENTS(pVM->pgm.s.aHandyPages));
+    }
+    else if (pVM->pgm.s.cHandyPages - 1 <= (RT_ELEMENTS(pVM->pgm.s.aHandyPages) / 4) * 3) /* 75% */
+    {
+        VM_FF_SET(pVM, VM_FF_PGM_NEED_HANDY_PAGES);
+#ifndef IN_RING3
+        if (pVM->pgm.s.cHandyPages - 1 <= RT_ELEMENTS(pVM->pgm.s.aHandyPages) / 2)
+        {
+            Log(("PGM: VM_FF_TO_R3 - cHandyPages=%u out of %u\n", pVM->pgm.s.cHandyPages - 1 <= RT_ELEMENTS(pVM->pgm.s.aHandyPages)));
+            VM_FF_SET(pVM, VM_FF_TO_R3);
+        }
+#endif 
+    }
+
+    return VINF_SUCCESS;
+}
+
+
-/**
- * Replace a zero or shared page with new page that we can write to.
- *
-
-
+
+
+
+
+
- *
- * @param   pVM         The VM address.
-
+
+
- * @param   GCPhys      The address of the page.
- *
-
+
+
+
+
+
+
+
+
- */
-int pgmPhysAllocPage(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys)
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -266 +414 @@
-        pMap = pTlbe->pChunk;
-    }
-P
+M
-    {
-        STAM_COUNTER_INC(&pVM->pgm.s.StatChunkR3MapTlbMisses);

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -582 +582 @@
-        }
-
+        /*
+         * PGM wrappers.
+         */
+        case VMMR0_DO_PGM_ALLOCATE_HANDY_PAGES:
+            return PGMR0PhysAllocateHandyPages(pVM);
+
+#if 0
+        /*
+         * GMM wrappers
+         */
+        case VMMR0_DO_GMM_ALLOCATE_PAGES:
+            return GMMR0AllocatePages(pVM, ...);
+        case VMMR0_DO_GMM_FREE_PAGES:
+            return GMMR0FreePages(pVM, ...);
+        case VMMR0_DO_GMM_MAP_UNMAP_CHUNK:
+            return GMMR0FreeMapUnmapChunk(pVM, ...);
+        case VMMR0_DO_GMM_SEED_CHUNK:
+            return GMMR0SeedChunk(pVM, (RTR3PTR)pvArg);
+#endif 
+
+
+
-#ifdef VBOX_WITH_INTERNAL_NETWORKING
-        /*

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -425 +425 @@
-    GEN_CHECK_OFF(PGM, pvZeroPgR0);
-    GEN_CHECK_OFF(PGM, pvZeroPgGC);
+    GEN_CHECK_OFF(PGM, cHandyPages);
+    GEN_CHECK_OFF(PGM, aHandyPages);
+    GEN_CHECK_OFF(PGM, aHandyPages[1]);
+    GEN_CHECK_OFF(PGM, aHandyPages[1].HCPhysGCPhys);
+    GEN_CHECK_OFF(PGM, aHandyPages[1].idPage);
+    GEN_CHECK_OFF(PGM, aHandyPages[1].idSharedPage);
+    GEN_CHECK_OFF(PGM, cAllPages);
+    GEN_CHECK_OFF(PGM, cPrivatePages);
+    GEN_CHECK_OFF(PGM, cSharedPages);
+    GEN_CHECK_OFF(PGM, cZeroPages);
+    GEN_CHECK_OFF(PGM, cGuestModeChanges);
-
-    GEN_CHECK_SIZE(PGMMAPPING);