VirtualBox

Changeset 12815 in vbox for trunk/src


Ignore:
Timestamp:
Sep 29, 2008 6:33:17 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
37170
Message:

#1865: more MM changes.

Location:
trunk/src/VBox/VMM
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/VMM/MMInternal.h

    r12814 r12815  
    687687    uint32_t                    u32Padding2;
    688688#endif
     689
     690    /** The hypervisor heap (R0 Ptr). */
     691    R0PTRTYPE(PMMHYPERHEAP)     pHyperHeapR0;
     692    /** Page pool - R0 Ptr. */
     693    R0PTRTYPE(PMMPAGEPOOL)      pPagePoolR0;
     694    /** Page pool pages in low memory R0 Ptr. */
     695    R0PTRTYPE(PMMPAGEPOOL)      pPagePoolLowR0;
     696
    689697    /** The hypervisor heap (R3 Ptr). */
    690698    R3PTRTYPE(PMMHYPERHEAP)     pHyperHeapR3;
    691     /** The hypervisor heap (R0 Ptr). */
    692     R0PTRTYPE(PMMHYPERHEAP)     pHyperHeapR0;
    693 
     699    /** Page pool - R3 Ptr. */
     700    R3PTRTYPE(PMMPAGEPOOL)      pPagePoolR3;
     701    /** Page pool pages in low memory R3 Ptr. */
     702    R3PTRTYPE(PMMPAGEPOOL)      pPagePoolLowR3;
    694703    /** List of memory locks. (HC only) */
    695704    R3PTRTYPE(PMMLOCKEDMEM)     pLockedMem;
    696 
    697     /** Page pool. (HC only) */
    698     R3R0PTRTYPE(PMMPAGEPOOL)    pPagePool;
    699     /** Page pool pages in low memory. (HC only) */
    700     R3R0PTRTYPE(PMMPAGEPOOL)    pPagePoolLow;
    701705
    702706    /** Pointer to the dummy page.

  • trunk/src/VBox/VMM/MMPagePool.cpp

    r12814 r12815  
    6060int mmR3PagePoolInit(PVM pVM)
    6161{
    62     AssertMsg(!pVM->mm.s.pPagePool, ("Already initialized!\n"));
     62    AssertMsg(!pVM->mm.s.pPagePoolR3, ("Already initialized!\n"));
    6363
    6464    /*
    6565     * Allocate the pool structures.
    6666     */
    67     AssertRelease(sizeof(*pVM->mm.s.pPagePool) + sizeof(*pVM->mm.s.pPagePoolLow) < PAGE_SIZE);
    68     int rc = SUPPageAllocLocked(1, (void **)&pVM->mm.s.pPagePool);
     67    /** @todo @bufref{1865},@bufref{3202}: mapping the page pool page into
     68     *        ring-0. Need to change the wasy we allocate it... */
     69    AssertReleaseReturn(sizeof(*pVM->mm.s.pPagePoolR3) + sizeof(*pVM->mm.s.pPagePoolLowR3) < PAGE_SIZE, VERR_INTERNAL_ERROR);
     70    int rc = SUPPageAllocLocked(1, (void **)&pVM->mm.s.pPagePoolR3);
    6971    if (VBOX_FAILURE(rc))
    7072        return rc;
    71     memset(pVM->mm.s.pPagePool, 0, PAGE_SIZE);
    72     pVM->mm.s.pPagePool->pVM = pVM;
    73     STAM_REG(pVM, &pVM->mm.s.pPagePool->cPages,         STAMTYPE_U32,     "/MM/Page/Def/cPages",        STAMUNIT_PAGES, "Number of pages in the default pool.");
    74     STAM_REG(pVM, &pVM->mm.s.pPagePool->cFreePages,     STAMTYPE_U32,     "/MM/Page/Def/cFreePages",    STAMUNIT_PAGES, "Number of free pages in the default pool.");
    75     STAM_REG(pVM, &pVM->mm.s.pPagePool->cSubPools,      STAMTYPE_U32,     "/MM/Page/Def/cSubPools",     STAMUNIT_COUNT, "Number of sub pools in the default pool.");
    76     STAM_REG(pVM, &pVM->mm.s.pPagePool->cAllocCalls,    STAMTYPE_COUNTER, "/MM/Page/Def/cAllocCalls",   STAMUNIT_CALLS, "Number of MMR3PageAlloc() calls for the default pool.");
    77     STAM_REG(pVM, &pVM->mm.s.pPagePool->cFreeCalls,     STAMTYPE_COUNTER, "/MM/Page/Def/cFreeCalls",    STAMUNIT_CALLS, "Number of MMR3PageFree()+MMR3PageFreeByPhys() calls for the default pool.");
    78     STAM_REG(pVM, &pVM->mm.s.pPagePool->cToPhysCalls,   STAMTYPE_COUNTER, "/MM/Page/Def/cToPhysCalls",  STAMUNIT_CALLS, "Number of MMR3Page2Phys() calls for this pool.");
    79     STAM_REG(pVM, &pVM->mm.s.pPagePool->cToVirtCalls,   STAMTYPE_COUNTER, "/MM/Page/Def/cToVirtCalls",  STAMUNIT_CALLS, "Number of MMR3PagePhys2Page()+MMR3PageFreeByPhys() calls for the default pool.");
    80     STAM_REG(pVM, &pVM->mm.s.pPagePool->cErrors,        STAMTYPE_COUNTER, "/MM/Page/Def/cErrors",       STAMUNIT_ERRORS,"Number of errors for the default pool.");
    81 
    82     pVM->mm.s.pPagePoolLow = pVM->mm.s.pPagePool + 1;
    83     pVM->mm.s.pPagePoolLow->pVM = pVM;
    84     pVM->mm.s.pPagePoolLow->fLow = true;
    85     STAM_REG(pVM, &pVM->mm.s.pPagePoolLow->cPages,      STAMTYPE_U32,     "/MM/Page/Low/cPages",        STAMUNIT_PAGES, "Number of pages in the <4GB pool.");
    86     STAM_REG(pVM, &pVM->mm.s.pPagePoolLow->cFreePages,  STAMTYPE_U32,     "/MM/Page/Low/cFreePages",    STAMUNIT_PAGES, "Number of free pages in the <4GB pool.");
    87     STAM_REG(pVM, &pVM->mm.s.pPagePoolLow->cSubPools,   STAMTYPE_U32,     "/MM/Page/Low/cSubPools",     STAMUNIT_COUNT, "Number of sub pools in the <4GB pool.");
    88     STAM_REG(pVM, &pVM->mm.s.pPagePoolLow->cAllocCalls, STAMTYPE_COUNTER, "/MM/Page/Low/cAllocCalls",   STAMUNIT_CALLS, "Number of MMR3PageAllocLow() calls for the <4GB pool.");
    89     STAM_REG(pVM, &pVM->mm.s.pPagePoolLow->cFreeCalls,  STAMTYPE_COUNTER, "/MM/Page/Low/cFreeCalls",    STAMUNIT_CALLS, "Number of MMR3PageFreeLow()+MMR3PageFreeByPhys() calls for the <4GB pool.");
    90     STAM_REG(pVM, &pVM->mm.s.pPagePoolLow->cToPhysCalls,STAMTYPE_COUNTER, "/MM/Page/Low/cToPhysCalls",  STAMUNIT_CALLS, "Number of MMR3Page2Phys() calls for the <4GB pool.");
    91     STAM_REG(pVM, &pVM->mm.s.pPagePoolLow->cToVirtCalls,STAMTYPE_COUNTER, "/MM/Page/Low/cToVirtCalls",  STAMUNIT_CALLS, "Number of MMR3PagePhys2Page()+MMR3PageFreeByPhys() calls for the <4GB pool.");
    92     STAM_REG(pVM, &pVM->mm.s.pPagePoolLow->cErrors,     STAMTYPE_COUNTER, "/MM/Page/Low/cErrors",       STAMUNIT_ERRORS,"Number of errors for the <4GB pool.");
     73    memset(pVM->mm.s.pPagePoolR3, 0, PAGE_SIZE);
     74    pVM->mm.s.pPagePoolR3->pVM = pVM;
     75    STAM_REG(pVM, &pVM->mm.s.pPagePoolR3->cPages,         STAMTYPE_U32,     "/MM/Page/Def/cPages",        STAMUNIT_PAGES, "Number of pages in the default pool.");
     76    STAM_REG(pVM, &pVM->mm.s.pPagePoolR3->cFreePages,     STAMTYPE_U32,     "/MM/Page/Def/cFreePages",    STAMUNIT_PAGES, "Number of free pages in the default pool.");
     77    STAM_REG(pVM, &pVM->mm.s.pPagePoolR3->cSubPools,      STAMTYPE_U32,     "/MM/Page/Def/cSubPools",     STAMUNIT_COUNT, "Number of sub pools in the default pool.");
     78    STAM_REG(pVM, &pVM->mm.s.pPagePoolR3->cAllocCalls,    STAMTYPE_COUNTER, "/MM/Page/Def/cAllocCalls",   STAMUNIT_CALLS, "Number of MMR3PageAlloc() calls for the default pool.");
     79    STAM_REG(pVM, &pVM->mm.s.pPagePoolR3->cFreeCalls,     STAMTYPE_COUNTER, "/MM/Page/Def/cFreeCalls",    STAMUNIT_CALLS, "Number of MMR3PageFree()+MMR3PageFreeByPhys() calls for the default pool.");
     80    STAM_REG(pVM, &pVM->mm.s.pPagePoolR3->cToPhysCalls,   STAMTYPE_COUNTER, "/MM/Page/Def/cToPhysCalls",  STAMUNIT_CALLS, "Number of MMR3Page2Phys() calls for this pool.");
     81    STAM_REG(pVM, &pVM->mm.s.pPagePoolR3->cToVirtCalls,   STAMTYPE_COUNTER, "/MM/Page/Def/cToVirtCalls",  STAMUNIT_CALLS, "Number of MMR3PagePhys2Page()+MMR3PageFreeByPhys() calls for the default pool.");
     82    STAM_REG(pVM, &pVM->mm.s.pPagePoolR3->cErrors,        STAMTYPE_COUNTER, "/MM/Page/Def/cErrors",       STAMUNIT_ERRORS,"Number of errors for the default pool.");
     83
     84    pVM->mm.s.pPagePoolLowR3 = pVM->mm.s.pPagePoolR3 + 1;
     85    pVM->mm.s.pPagePoolLowR3->pVM = pVM;
     86    pVM->mm.s.pPagePoolLowR3->fLow = true;
     87    STAM_REG(pVM, &pVM->mm.s.pPagePoolLowR3->cPages,      STAMTYPE_U32,     "/MM/Page/Low/cPages",        STAMUNIT_PAGES, "Number of pages in the <4GB pool.");
     88    STAM_REG(pVM, &pVM->mm.s.pPagePoolLowR3->cFreePages,  STAMTYPE_U32,     "/MM/Page/Low/cFreePages",    STAMUNIT_PAGES, "Number of free pages in the <4GB pool.");
     89    STAM_REG(pVM, &pVM->mm.s.pPagePoolLowR3->cSubPools,   STAMTYPE_U32,     "/MM/Page/Low/cSubPools",     STAMUNIT_COUNT, "Number of sub pools in the <4GB pool.");
     90    STAM_REG(pVM, &pVM->mm.s.pPagePoolLowR3->cAllocCalls, STAMTYPE_COUNTER, "/MM/Page/Low/cAllocCalls",   STAMUNIT_CALLS, "Number of MMR3PageAllocLow() calls for the <4GB pool.");
     91    STAM_REG(pVM, &pVM->mm.s.pPagePoolLowR3->cFreeCalls,  STAMTYPE_COUNTER, "/MM/Page/Low/cFreeCalls",    STAMUNIT_CALLS, "Number of MMR3PageFreeLow()+MMR3PageFreeByPhys() calls for the <4GB pool.");
     92    STAM_REG(pVM, &pVM->mm.s.pPagePoolLowR3->cToPhysCalls,STAMTYPE_COUNTER, "/MM/Page/Low/cToPhysCalls",  STAMUNIT_CALLS, "Number of MMR3Page2Phys() calls for the <4GB pool.");
     93    STAM_REG(pVM, &pVM->mm.s.pPagePoolLowR3->cToVirtCalls,STAMTYPE_COUNTER, "/MM/Page/Low/cToVirtCalls",  STAMUNIT_CALLS, "Number of MMR3PagePhys2Page()+MMR3PageFreeByPhys() calls for the <4GB pool.");
     94    STAM_REG(pVM, &pVM->mm.s.pPagePoolLowR3->cErrors,     STAMTYPE_COUNTER, "/MM/Page/Low/cErrors",       STAMUNIT_ERRORS,"Number of errors for the <4GB pool.");
     95
     96    /** @todo @bufref{1865},@bufref{3202}: more */
     97    pVM->mm.s.pPagePoolR0 = (uintptr_t)pVM->mm.s.pPagePoolR3;
     98    pVM->mm.s.pPagePoolLowR0 = (uintptr_t)pVM->mm.s.pPagePoolLowR3;
    9399
    94100    /** @todo init a mutex? */
    … …  
    105111void mmR3PagePoolTerm(PVM pVM)
    106112{
    107     if (pVM->mm.s.pPagePool)
     113    if (pVM->mm.s.pPagePoolR3)
    108114    {
    109115        /*
    … …  
    111117         * (The MM Heap will free the memory used for internal stuff.)
    112118         */
    113         Assert(!pVM->mm.s.pPagePool->fLow);
    114         PMMPAGESUBPOOL  pSubPool = pVM->mm.s.pPagePool->pHead;
     119        Assert(!pVM->mm.s.pPagePoolR3->fLow);
     120        PMMPAGESUBPOOL  pSubPool = pVM->mm.s.pPagePoolR3->pHead;
    115121        while (pSubPool)
    116122        {
    … …  
    124130            pSubPool = pSubPool->pNext;
    125131        }
    126         pVM->mm.s.pPagePool = NULL;
    127     }
    128 
    129     if (pVM->mm.s.pPagePoolLow)
     132        pVM->mm.s.pPagePoolR3 = NULL;
     133        pVM->mm.s.pPagePoolR0 = NIL_RTR0PTR;
     134    }
     135
     136    if (pVM->mm.s.pPagePoolLowR3)
    130137    {
    131138        /*
    132139         * Free the memory.
    133140         */
    134         Assert(pVM->mm.s.pPagePoolLow->fLow);
    135         PMMPAGESUBPOOL  pSubPool = pVM->mm.s.pPagePoolLow->pHead;
     141        Assert(pVM->mm.s.pPagePoolLowR3->fLow);
     142        PMMPAGESUBPOOL  pSubPool = pVM->mm.s.pPagePoolLowR3->pHead;
    136143        while (pSubPool)
    137144        {
    … …  
    143150            pSubPool = pSubPool->pNext;
    144151        }
    145         pVM->mm.s.pPagePoolLow = NULL;
     152        pVM->mm.s.pPagePoolLowR3 = NULL;
     153        pVM->mm.s.pPagePoolLowR0 = NIL_RTR0PTR;
    146154    }
    147155}
    … …  
    392400MMR3DECL(void *) MMR3PageAlloc(PVM pVM)
    393401{
    394     return mmR3PagePoolAlloc(pVM->mm.s.pPagePool);
     402    return mmR3PagePoolAlloc(pVM->mm.s.pPagePoolR3);
    395403}
    396404
    … …  
    411419{
    412420    /** @todo optimize this, it's the most common case now. */
    413     void *pv = mmR3PagePoolAlloc(pVM->mm.s.pPagePool);
     421    void *pv = mmR3PagePoolAlloc(pVM->mm.s.pPagePoolR3);
    414422    if (pv)
    415         return mmPagePoolPtr2Phys(pVM->mm.s.pPagePool, pv);
     423        return mmPagePoolPtr2Phys(pVM->mm.s.pPagePoolR3, pv);
    416424    return NIL_RTHCPHYS;
    417425}
    … …  
    428436MMR3DECL(void) MMR3PageFree(PVM pVM, void *pvPage)
    429437{
    430     mmR3PagePoolFree(pVM->mm.s.pPagePool, pvPage);
     438    mmR3PagePoolFree(pVM->mm.s.pPagePoolR3, pvPage);
    431439}
    432440
    … …  
    442450MMR3DECL(void *) MMR3PageAllocLow(PVM pVM)
    443451{
    444     return mmR3PagePoolAlloc(pVM->mm.s.pPagePoolLow);
     452    return mmR3PagePoolAlloc(pVM->mm.s.pPagePoolLowR3);
    445453}
    446454
    … …  
    455463MMR3DECL(void) MMR3PageFreeLow(PVM pVM, void *pvPage)
    456464{
    457     mmR3PagePoolFree(pVM->mm.s.pPagePoolLow, pvPage);
     465    mmR3PagePoolFree(pVM->mm.s.pPagePoolLowR3, pvPage);
    458466}
    459467
    … …  
    470478MMR3DECL(void) MMR3PageFreeByPhys(PVM pVM, RTHCPHYS HCPhysPage)
    471479{
    472     void *pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.pPagePool, HCPhysPage);
     480    void *pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.pPagePoolR3, HCPhysPage);
    473481    if (!pvPage)
    474         pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.pPagePoolLow, HCPhysPage);
     482        pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.pPagePoolLowR3, HCPhysPage);
    475483    if (pvPage)
    476         mmR3PagePoolFree(pVM->mm.s.pPagePool, pvPage);
     484        mmR3PagePoolFree(pVM->mm.s.pPagePoolR3, pvPage);
    477485    else
    478486        AssertMsgFailed(("Invalid address HCPhysPT=%#x\n", HCPhysPage));
    … …  
    495503    if (!pVM->mm.s.pvDummyPage)
    496504    {
    497         pVM->mm.s.pvDummyPage = mmR3PagePoolAlloc(pVM->mm.s.pPagePool);
     505        pVM->mm.s.pvDummyPage = mmR3PagePoolAlloc(pVM->mm.s.pPagePoolR3);
    498506        AssertRelease(pVM->mm.s.pvDummyPage);
    499         pVM->mm.s.HCPhysDummyPage = mmPagePoolPtr2Phys(pVM->mm.s.pPagePool, pVM->mm.s.pvDummyPage);
     507        pVM->mm.s.HCPhysDummyPage = mmPagePoolPtr2Phys(pVM->mm.s.pPagePoolR3, pVM->mm.s.pvDummyPage);
    500508        AssertRelease(!(pVM->mm.s.HCPhysDummyPage & ~X86_PTE_PAE_PG_MASK));
    501509    }

  • trunk/src/VBox/VMM/VMMAll/MMAllPagePool.cpp

    r8155 r12815  
    22/** @file
    33 * MM - Memory Monitor(/Manager) - Page Pool.
     4 *
     5 * @remarks     This file is NOT built for the raw-mode context.
    46 */
    57
    … …  
    127129MMDECL(RTHCPHYS) MMPage2Phys(PVM pVM, void *pvPage)
    128130{
    129     RTHCPHYS HCPhys = mmPagePoolPtr2Phys(pVM->mm.s.pPagePool, pvPage);
     131    RTHCPHYS HCPhys = mmPagePoolPtr2Phys(pVM->mm.s.CTX_SUFF(pPagePool), pvPage);
    130132    if (HCPhys == NIL_RTHCPHYS)
    131133    {
    132         HCPhys = mmPagePoolPtr2Phys(pVM->mm.s.pPagePoolLow, pvPage);
     134        HCPhys = mmPagePoolPtr2Phys(pVM->mm.s.CTX_SUFF(pPagePoolLow), pvPage);
    133135        if (HCPhys == NIL_RTHCPHYS)
    134136        {
    135             STAM_COUNTER_INC(&pVM->mm.s.pPagePool->cErrors);
     137            STAM_COUNTER_INC(&pVM->mm.s.CTX_SUFF(pPagePool)->cErrors);
    136138            AssertMsgFailed(("Invalid pvPage=%p specified\n", pvPage));
    137139        }
    … …  
    153155MMDECL(void *) MMPagePhys2Page(PVM pVM, RTHCPHYS HCPhysPage)
    154156{
    155     void *pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.pPagePool, HCPhysPage);
     157    void *pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.CTX_SUFF(pPagePool), HCPhysPage);
    156158    if (!pvPage)
    157159    {
    158         pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.pPagePoolLow, HCPhysPage);
     160        pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.CTX_SUFF(pPagePoolLow), HCPhysPage);
    159161        if (!pvPage)
    160162        {
    161             STAM_COUNTER_INC(&pVM->mm.s.pPagePool->cErrors);
     163            STAM_COUNTER_INC(&pVM->mm.s.CTX_SUFF(pPagePool)->cErrors);
    162164            AssertMsg(pvPage, ("Invalid HCPhysPage=%VHp specified\n", HCPhysPage));
    163165        }
    … …  
    180182MMDECL(int) MMPagePhys2PageEx(PVM pVM, RTHCPHYS HCPhysPage, void **ppvPage)
    181183{
    182     void *pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.pPagePool, HCPhysPage);
     184    void *pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.CTX_SUFF(pPagePool), HCPhysPage);
    183185    if (!pvPage)
    184186    {
    185         pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.pPagePoolLow, HCPhysPage);
     187        pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.CTX_SUFF(pPagePoolLow), HCPhysPage);
    186188        if (!pvPage)
    187189        {
    188             STAM_COUNTER_INC(&pVM->mm.s.pPagePool->cErrors);
     190            STAM_COUNTER_INC(&pVM->mm.s.CTX_SUFF(pPagePool)->cErrors);
    189191            AssertMsg(pvPage, ("Invalid HCPhysPage=%VHp specified\n", HCPhysPage));
    190192            return VERR_INVALID_POINTER;
    … …  
    209211MMDECL(int) MMPagePhys2PageTry(PVM pVM, RTHCPHYS HCPhysPage, void **ppvPage)
    210212{
    211     void *pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.pPagePool, HCPhysPage);
     213    void *pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.CTX_SUFF(pPagePool), HCPhysPage);
    212214    if (!pvPage)
    213215    {
    214         pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.pPagePoolLow, HCPhysPage);
     216        pvPage = mmPagePoolPhys2Ptr(pVM->mm.s.CTX_SUFF(pPagePoolLow), HCPhysPage);
    215217        if (!pvPage)
    216218            return VERR_INVALID_POINTER;

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

    r12814 r12815  
    198198    GEN_CHECK_OFF(MM, pHyperHeapR0);
    199199    GEN_CHECK_OFF(MM, pLockedMem);
    200     GEN_CHECK_OFF(MM, pPagePool);
    201     GEN_CHECK_OFF(MM, pPagePoolLow);
     200    GEN_CHECK_OFF(MM, pPagePoolR3);
     201    GEN_CHECK_OFF(MM, pPagePoolR0);
     202    GEN_CHECK_OFF(MM, pPagePoolLowR3);
     203    GEN_CHECK_OFF(MM, pPagePoolLowR0);
    202204    GEN_CHECK_OFF(MM, pvDummyPage);
    203205    GEN_CHECK_OFF(MM, HCPhysDummyPage);
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette