VirtualBox

Changeset 17294 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Mar 3, 2009 3:51:21 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
43660
Message:

PGM: started looking at direct access of PGMPAGE::HCPhys and the HCPtr/mapping nightmare.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/VMM/Makefile.kmk

    r16959 r17294  
    500500
    501501# Alias the PGM templates to the object in which they are defined.
     502PGMInternal.o \
    502503PGMBth.o   PGMGst.o   PGMShw.o \
    503504PGMBth.obj PGMGst.obj PGMShw.obj: PGM.o

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

    r17290 r17294  
    579579    /** The physical address and a whole lot of other stuff. All bits are used! */
    580580    RTHCPHYS    HCPhys;
     581#define HCPhysX HCPhys /**< Temporary while in the process of eliminating direct access to PGMPAGE::HCPhys. */
    581582    /** The page state. */
    582583    uint32_t    u2StateX : 2;
    … …  
    586587    uint32_t    fSomethingElse : 1;
    587588    /** The Page ID.
    588      * @todo  Merge with HCPhys once we've liberated HCPhys of its stuff.
    589      *        The HCPhys will be 100% static. */
     589     * @todo  Merge with HCPhysX once we've liberated HCPhysX of its stuff.
     590     *        The HCPhysX will then be 100% static. */
    590591    uint32_t    idPageX : 28;
    591592    /** The page type (PGMPAGETYPE). */
    … …  
    612613#define PGM_PAGE_CLEAR(pPage) \
    613614    do { \
    614         (pPage)->HCPhys         = 0; \
     615        (pPage)->HCPhysX        = 0; \
    615616        (pPage)->u2StateX       = 0; \
    616617        (pPage)->fWrittenToX    = 0; \
    … …  
    627628#define PGM_PAGE_INIT(pPage, _HCPhys, _idPage, _uType, _uState) \
    628629    do { \
    629         (pPage)->HCPhys         = (_HCPhys); \
     630        (pPage)->HCPhysX        = (_HCPhys); \
    630631        (pPage)->u2StateX       = (_uState); \
    631632        (pPage)->fWrittenToX    = 0; \
    … …  
    695696 * @param   pPage       Pointer to the physical guest page tracking structure.
    696697 */
    697 #define PGM_PAGE_GET_HCPHYS(pPage)      ( (pPage)->HCPhys & UINT64_C(0x0000fffffffff000) )
     698#define PGM_PAGE_GET_HCPHYS(pPage)      ( (pPage)->HCPhysX & UINT64_C(0x0000fffffffff000) )
    698699
    699700/**
    … …  
    703704 */
    704705#define PGM_PAGE_SET_HCPHYS(pPage, _HCPhys) \
    705                                         do { (pPage)->HCPhys = (((pPage)->HCPhys) & UINT64_C(0xffff000000000fff)) \
    706                                                              | ((_HCPhys) & UINT64_C(0x0000fffffffff000)); } while (0)
     706                                        do { (pPage)->HCPhysX = (((pPage)->HCPhys) & UINT64_C(0xffff000000000fff)) \
     707                                                              | ((_HCPhys) & UINT64_C(0x0000fffffffff000)); } while (0)
    707708
    708709/**
    … …  
    713714#define PGM_PAGE_GET_PAGEID(pPage)      ( (pPage)->idPageX )
    714715/* later:
    715 #define PGM_PAGE_GET_PAGEID(pPage)      (   ((uint32_t)(pPage)->HCPhys >> (48 - 12))
    716                                          |  ((uint32_t)(pPage)->HCPhys & 0xfff) )
     716#define PGM_PAGE_GET_PAGEID(pPage)      (   ((uint32_t)(pPage)->HCPhysX >> (48 - 12))
     717                                         |  ((uint32_t)(pPage)->HCPhysX & 0xfff) )
    717718*/
    718719/**
    … …  
    722723#define PGM_PAGE_SET_PAGEID(pPage, _idPage)  do { (pPage)->idPageX = (_idPage); } while (0)
    723724/* later:
    724 #define PGM_PAGE_SET_PAGEID(pPage, _idPage)  do { (pPage)->HCPhys = (((pPage)->HCPhys) & UINT64_C(0x0000fffffffff000)) \
    725                                                                   | ((_idPage) & 0xfff) \
    726                                                                   | (((_idPage) & 0x0ffff000) << (48-12)); } while (0)
     725#define PGM_PAGE_SET_PAGEID(pPage, _idPage)  do { (pPage)->HCPhysX = (((pPage)->HCPhysX) & UINT64_C(0x0000fffffffff000)) \
     726                                                                   | ((_idPage) & 0xfff) \
     727                                                                   | (((_idPage) & 0x0ffff000) << (48-12)); } while (0)
    727728*/
    728729
    … …  
    735736/* later:
    736737#if GMM_CHUNKID_SHIFT == 12
    737 # define PGM_PAGE_GET_CHUNKID(pPage)    ( (uint32_t)((pPage)->HCPhys >> 48) )
     738# define PGM_PAGE_GET_CHUNKID(pPage)    ( (uint32_t)((pPage)->HCPhysX >> 48) )
    738739#elif GMM_CHUNKID_SHIFT > 12
    739 # define PGM_PAGE_GET_CHUNKID(pPage)    ( (uint32_t)((pPage)->HCPhys >> (48 + (GMM_CHUNKID_SHIFT - 12)) )
     740# define PGM_PAGE_GET_CHUNKID(pPage)    ( (uint32_t)((pPage)->HCPhysX >> (48 + (GMM_CHUNKID_SHIFT - 12)) )
    740741#elif GMM_CHUNKID_SHIFT < 12
    741 # define PGM_PAGE_GET_CHUNKID(pPage)    (   ( (uint32_t)((pPage)->HCPhys >> 48)   << (12 - GMM_CHUNKID_SHIFT) ) \
    742                                          |  ( (uint32_t)((pPage)->HCPhys & 0xfff) >> GMM_CHUNKID_SHIFT ) )
     742# define PGM_PAGE_GET_CHUNKID(pPage)    (   ( (uint32_t)((pPage)->HCPhysX >> 48)   << (12 - GMM_CHUNKID_SHIFT) ) \
     743                                         |  ( (uint32_t)((pPage)->HCPhysX & 0xfff) >> GMM_CHUNKID_SHIFT ) )
    743744#else
    744745# error "GMM_CHUNKID_SHIFT isn't defined or something."
    … …  
    754755/* later:
    755756#if GMM_CHUNKID_SHIFT <= 12
    756 # define PGM_PAGE_GET_PAGE_IN_CHUNK(pPage)  ( (uint32_t)((pPage)->HCPhys & GMM_PAGEID_IDX_MASK) )
     757# define PGM_PAGE_GET_PAGE_IN_CHUNK(pPage)  ( (uint32_t)((pPage)->HCPhysX & GMM_PAGEID_IDX_MASK) )
    757758#else
    758 # define PGM_PAGE_GET_PAGE_IN_CHUNK(pPage)  (   (uint32_t)((pPage)->HCPhys & 0xfff) \
    759                                              |  ( (uint32_t)((pPage)->HCPhys >> 48) & (RT_BIT_32(GMM_CHUNKID_SHIFT - 12) - 1) ) )
     759# define PGM_PAGE_GET_PAGE_IN_CHUNK(pPage)  (   (uint32_t)((pPage)->HCPhysX & 0xfff) \
     760                                             |  ( (uint32_t)((pPage)->HCPhysX >> 48) & (RT_BIT_32(GMM_CHUNKID_SHIFT - 12) - 1) ) )
    760761#endif
    761762*/
    … …  
    782783        (pPage)->u3Type = (_enmType); \
    783784        if ((_enmType) == PGMPAGETYPE_ROM) \
    784             (pPage)->HCPhys |= MM_RAM_FLAGS_ROM; \
     785            (pPage)->HCPhysX |= MM_RAM_FLAGS_ROM; \
    785786        else if ((_enmType) == PGMPAGETYPE_ROM_SHADOW) \
    786             (pPage)->HCPhys |= MM_RAM_FLAGS_ROM | MM_RAM_FLAGS_MMIO2; \
     787            (pPage)->HCPhysX |= MM_RAM_FLAGS_ROM | MM_RAM_FLAGS_MMIO2; \
    787788        else if ((_enmType) == PGMPAGETYPE_MMIO2) \
    788             (pPage)->HCPhys |= MM_RAM_FLAGS_MMIO2; \
     789            (pPage)->HCPhysX |= MM_RAM_FLAGS_MMIO2; \
    789790    } while (0)
    790791#endif
    … …  
    796797 * @param   pPage       Pointer to the physical guest page tracking structure.
    797798 */
    798 #define PGM_PAGE_IS_RESERVED(pPage)     ( !!((pPage)->HCPhys & MM_RAM_FLAGS_RESERVED) )
     799#define PGM_PAGE_IS_RESERVED(pPage)     ( !!((pPage)->HCPhysX & MM_RAM_FLAGS_RESERVED) )
    799800
    800801/**
    … …  
    803804 * @param   pPage       Pointer to the physical guest page tracking structure.
    804805 */
    805 #define PGM_PAGE_IS_MMIO(pPage)         ( !!((pPage)->HCPhys & MM_RAM_FLAGS_MMIO) )
     806#define PGM_PAGE_IS_MMIO(pPage)         ( !!((pPage)->HCPhysX & MM_RAM_FLAGS_MMIO) )
    806807
    807808/**
    … …  
    967968 */
    968969#define PGM_PAGE_GET_TRACKING(pPage) \
    969     ( *((uint16_t *)&(pPage)->HCPhys + 3) )
     970    ( *((uint16_t *)&(pPage)->HCPhysX + 3) )
    970971
    971972/** @def PGM_PAGE_SET_TRACKING
    … …  
    975976 */
    976977#define PGM_PAGE_SET_TRACKING(pPage, u16TrackingData) \
    977     do { *((uint16_t *)&(pPage)->HCPhys + 3) = (u16TrackingData); } while (0)
     978    do { *((uint16_t *)&(pPage)->HCPhysX + 3) = (u16TrackingData); } while (0)
    978979
    979980/** @def PGM_PAGE_GET_TD_CREFS
    … …  
    34813482
    34823483#endif /* VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
    3483 
    34843484#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
     3485
    34853486/**
    34863487 * Maps the page into current context (RC and maybe R0).
    … …  
    35283529    return pv;
    35293530}
     3531
    35303532#endif /*  VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 || IN_RC */
    3531 
    35323533
    35333534#ifndef IN_RC
    … …  
    35603561#endif /* !IN_RC */
    35613562
    3562 #if !defined(IN_RC) && !defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
    3563 
    3564 # ifndef VBOX_WITH_NEW_PHYS_CODE
    3565 /**
    3566  * Convert GC Phys to HC Virt.
    3567  *
    3568  * @returns VBox status.
    3569  * @param   pPGM        PGM handle.
    3570  * @param   GCPhys      The GC physical address.
    3571  * @param   pHCPtr      Where to store the corresponding HC virtual address.
    3572  *
    3573  * @deprecated  This will be eliminated by PGMPhysGCPhys2CCPtr. Only user is
    3574  *              pgmPoolMonitorGCPtr2CCPtr.
    3575  */
    3576 DECLINLINE(int) pgmRamGCPhys2HCPtr(PPGM pPGM, RTGCPHYS GCPhys, PRTHCPTR pHCPtr)
    3577 {
    3578     PPGMRAMRANGE pRam;
    3579     PPGMPAGE pPage;
    3580     int rc = pgmPhysGetPageAndRangeEx(pPGM, GCPhys, &pPage, &pRam);
    3581     if (RT_FAILURE(rc))
    3582     {
    3583         *pHCPtr = 0; /* Shut up silly GCC warnings. */
    3584         return rc;
    3585     }
    3586     RTGCPHYS off = GCPhys - pRam->GCPhys;
    3587 
    3588     if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
    3589     {
    3590         unsigned iChunk = off >> PGM_DYNAMIC_CHUNK_SHIFT;
    3591         *pHCPtr = (RTHCPTR)(pRam->paChunkR3Ptrs[iChunk] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
    3592         return VINF_SUCCESS;
    3593     }
    3594     if (pRam->pvR3)
    3595     {
    3596         *pHCPtr = (RTHCPTR)((RTHCUINTPTR)pRam->pvR3 + off);
    3597         return VINF_SUCCESS;
    3598     }
    3599     *pHCPtr = 0; /* Shut up silly GCC warnings. */
    3600     return VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS;
    3601 }
    3602 # endif /* !VBOX_WITH_NEW_PHYS_CODE */
    3603 #endif /* !IN_RC && !defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) */
    36043563
    36053564/**
    … …  
    36143573 * @deprecated  Will go away or be changed. Only user is MapCR3. MapCR3 will have to do ring-3
    36153574 *              and ring-0 locking of the CR3 in a lazy fashion I'm fear... or perhaps not. we'll see.
    3616  */
    3617 DECLINLINE(int) pgmRamGCPhys2HCPtrAndHCPhysWithFlags(PPGM pPGM, RTGCPHYS GCPhys, PRTHCPTR pHCPtr, PRTHCPHYS pHCPhys)
     3575 *              Either way, we have to make sure the page is writable in MapCR3.
     3576 */
     3577DECLINLINE(int) pgmRamGCPhys2HCPtrAndHCPhys(PPGM pPGM, RTGCPHYS GCPhys, PRTHCPTR pHCPtr, PRTHCPHYS pHCPhys)
    36183578{
    36193579    PPGMRAMRANGE pRam;
    … …  
    36283588    RTGCPHYS off = GCPhys - pRam->GCPhys;
    36293589
    3630     *pHCPhys = pPage->HCPhys; /** @todo PAGE FLAGS */
     3590    *pHCPhys = PGM_PAGE_GET_HCPHYS(pPage);
    36313591    if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
    36323592    {
    … …  
    36473607    *pHCPtr = 0;
    36483608    return VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS;
    3649 }
    3650 
    3651 
    3652 /**
    3653  * Clears flags associated with a RAM address.
    3654  *
    3655  * @returns VBox status code.
    3656  * @param   pPGM        PGM handle.
    3657  * @param   GCPhys      Guest context physical address.
    3658  * @param   fFlags      fFlags to clear. (Bits 0-11.)
    3659  */
    3660 DECLINLINE(int) pgmRamFlagsClearByGCPhys(PPGM pPGM, RTGCPHYS GCPhys, unsigned fFlags)
    3661 {
    3662     PPGMPAGE pPage;
    3663     int rc = pgmPhysGetPageEx(pPGM, GCPhys, &pPage);
    3664     if (RT_FAILURE(rc))
    3665         return rc;
    3666 
    3667     fFlags &= ~X86_PTE_PAE_PG_MASK;
    3668     pPage->HCPhys &= ~(RTHCPHYS)fFlags; /** @todo PAGE FLAGS */
    3669     return VINF_SUCCESS;
    3670 }
    3671 
    3672 
    3673 /**
    3674  * Clears flags associated with a RAM address.
    3675  *
    3676  * @returns VBox status code.
    3677  * @param   pPGM        PGM handle.
    3678  * @param   GCPhys      Guest context physical address.
    3679  * @param   fFlags      fFlags to clear. (Bits 0-11.)
    3680  * @param   ppRamHint   Where to read and store the ram list hint.
    3681  *                      The caller initializes this to NULL before the call.
    3682  */
    3683 DECLINLINE(int) pgmRamFlagsClearByGCPhysWithHint(PPGM pPGM, RTGCPHYS GCPhys, unsigned fFlags, PPGMRAMRANGE *ppRamHint)
    3684 {
    3685     PPGMPAGE pPage;
    3686     int rc = pgmPhysGetPageWithHintEx(pPGM, GCPhys, &pPage, ppRamHint);
    3687     if (RT_FAILURE(rc))
    3688         return rc;
    3689 
    3690     fFlags &= ~X86_PTE_PAE_PG_MASK;
    3691     pPage->HCPhys &= ~(RTHCPHYS)fFlags; /** @todo PAGE FLAGS */
    3692     return VINF_SUCCESS;
    3693 }
    3694 
    3695 
    3696 /**
    3697  * Sets (bitwise OR) flags associated with a RAM address.
    3698  *
    3699  * @returns VBox status code.
    3700  * @param   pPGM        PGM handle.
    3701  * @param   GCPhys      Guest context physical address.
    3702  * @param   fFlags      fFlags to set clear. (Bits 0-11.)
    3703  */
    3704 DECLINLINE(int) pgmRamFlagsSetByGCPhys(PPGM pPGM, RTGCPHYS GCPhys, unsigned fFlags)
    3705 {
    3706     PPGMPAGE pPage;
    3707     int rc = pgmPhysGetPageEx(pPGM, GCPhys, &pPage);
    3708     if (RT_FAILURE(rc))
    3709         return rc;
    3710 
    3711     fFlags &= ~X86_PTE_PAE_PG_MASK;
    3712     pPage->HCPhys |= fFlags; /** @todo PAGE FLAGS */
    3713     return VINF_SUCCESS;
    3714 }
    3715 
    3716 
    3717 /**
    3718  * Sets (bitwise OR) flags associated with a RAM address.
    3719  *
    3720  * @returns VBox status code.
    3721  * @param   pPGM        PGM handle.
    3722  * @param   GCPhys      Guest context physical address.
    3723  * @param   fFlags      fFlags to set clear. (Bits 0-11.)
    3724  * @param   ppRamHint   Where to read and store the ram list hint.
    3725  *                      The caller initializes this to NULL before the call.
    3726  */
    3727 DECLINLINE(int) pgmRamFlagsSetByGCPhysWithHint(PPGM pPGM, RTGCPHYS GCPhys, unsigned fFlags, PPGMRAMRANGE *ppRamHint)
    3728 {
    3729     PPGMPAGE pPage;
    3730     int rc = pgmPhysGetPageWithHintEx(pPGM, GCPhys, &pPage, ppRamHint);
    3731     if (RT_FAILURE(rc))
    3732         return rc;
    3733 
    3734     fFlags &= ~X86_PTE_PAE_PG_MASK;
    3735     pPage->HCPhys |= fFlags; /** @todo PAGE FLAGS */
    3736     return VINF_SUCCESS;
    37373609}
    37383610
    … …  
    42674139
    42684140#endif /* !IN_RC */
    4269 
    42704141
    42714142/**
    … …  
    43924263}
    43934264
     4265
    43944266/**
    43954267 * Gets the shadow page directory for the specified address, PAE.
    … …  
    44174289#endif
    44184290}
     4291
    44194292
    44204293/**
    … …  
    44564329
    44574330#ifndef IN_RC
     4331
    44584332/**
    44594333 * Gets the shadow page map level-4 pointer.
    … …  
    45524426
    45534427#endif /* !IN_RC */
    4554 
    4555 /**
    4556  * Checks if any of the specified page flags are set for the given page.
    4557  *
    4558  * @returns true if any of the flags are set.
    4559  * @returns false if all the flags are clear.
    4560  * @param   pPGM        PGM handle.
    4561  * @param   GCPhys      The GC physical address.
    4562  * @param   fFlags      The flags to check for.
    4563  */
    4564 DECLINLINE(bool) pgmRamTestFlags(PPGM pPGM, RTGCPHYS GCPhys, uint64_t fFlags)
    4565 {
    4566     PPGMPAGE pPage = pgmPhysGetPage(pPGM, GCPhys);
    4567     return pPage
    4568         && (pPage->HCPhys & fFlags) != 0; /** @todo PAGE FLAGS */
    4569 }
    4570 
    45714428
    45724429/**
    … …  
    48154672
    48164673#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
     4674
    48174675/**
    48184676 * Locks a page to prevent flushing (important for cr3 root pages or shadow pae pd pages).
    … …  
    48294687}
    48304688
     4689
    48314690/**
    48324691 * Unlocks a page to allow flushing again
    … …  
    48424701    return VINF_SUCCESS;
    48434702}
     4703
    48444704
    48454705/**
    … …  
    48604720    return false;
    48614721}
    4862 #endif
     4722
     4723#endif /* VBOX_WITH_PGMPOOL_PAGING_ONLY */
    48634724
    48644725/**
    … …  
    48684729 * @param   pVM         VM handle.
    48694730 */
    4870 
    48714731DECLINLINE(bool) pgmMapAreMappingsEnabled(PPGM pPGM)
    48724732{

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

    r17290 r17294  
    44954495    RTHCPHYS    HCPhysGuestCR3;
    44964496    RTHCPTR     HCPtrGuestCR3;
    4497     int rc = pgmRamGCPhys2HCPtrAndHCPhysWithFlags(&pVM->pgm.s, GCPhysCR3 & GST_CR3_PAGE_MASK, &HCPtrGuestCR3, &HCPhysGuestCR3);
     4497    int rc = pgmRamGCPhys2HCPtrAndHCPhys(&pVM->pgm.s, GCPhysCR3 & GST_CR3_PAGE_MASK, &HCPtrGuestCR3, &HCPhysGuestCR3);
    44984498    if (RT_SUCCESS(rc))
    44994499    {
    … …  
    45324532                    RTHCPHYS    HCPhys;
    45334533                    RTGCPHYS    GCPhys = pGuestPDPT->a[i].u & X86_PDPE_PG_MASK;
    4534                     int rc2 = pgmRamGCPhys2HCPtrAndHCPhysWithFlags(&pVM->pgm.s, GCPhys, &HCPtr, &HCPhys);
     4534                    int rc2 = pgmRamGCPhys2HCPtrAndHCPhys(&pVM->pgm.s, GCPhys, &HCPtr, &HCPhys);
    45354535                    if (RT_SUCCESS(rc2))
    45364536                    {
    4537                         rc = PGMMap(pVM, GCPtr, HCPhys & X86_PTE_PAE_PG_MASK, PAGE_SIZE, 0);
     4537                        rc = PGMMap(pVM, GCPtr, HCPhys, PAGE_SIZE, 0);
    45384538                        AssertRCReturn(rc, rc);
    45394539
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