VBox

Timestamp:

Feb 14, 2022 11:09:36 AM (3 years ago)

Author:

vboxsync

Message:

VMM/MM: Removed the hyper heap. bugref:10093 bugref:9517

Location:

trunk/src/VBox/VMM

Files:

: 3 deleted
: 9 edited

Makefile.kmk (modified) (3 diffs)
VMMAll/MMAll.cpp (modified) (1 diff)
VMMAll/MMAllHyper.cpp (deleted)
VMMR3/EM.cpp (modified) (1 diff)
VMMR3/MM.cpp (modified) (3 diffs)
VMMR3/MMHyper.cpp (deleted)
VMMR3/PDMLdr.cpp (modified) (3 diffs)
VMMR3/VM.cpp (modified) (1 diff)
include/MMInternal.h (modified) (4 diffs)
testcase/Makefile.kmk (modified) (2 diffs)
testcase/tstMMHyperHeap.cpp (deleted)
testcase/tstVMStructSize.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/src/VBox/VMM/Makefile.kmk

-              r93650
+              r93718
         VMMR3/MM.cpp \
         VMMR3/MMHeap.cpp \
-        VMMR3/MMHyper.cpp \
         VMMR3/NEMR3.cpp \
         VMMR3/PDM.cpp \
 …
         VMMAll/IOMAllMmioNew.cpp \
         VMMAll/MMAll.cpp \
-        VMMAll/MMAllHyper.cpp \
         VMMAll/NEMAll.cpp \
         VMMAll/PDMAll.cpp \
 …
         VMMAll/IOMAllMmioNew.cpp \
         VMMAll/MMAll.cpp \
-        VMMAll/MMAllHyper.cpp \
         VMMAll/NEMAll.cpp \
         VMMAll/PDMAll.cpp \

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

-              r93629
+              r93718
 #include <iprt/assert.h>
 #include <iprt/string.h>
-/**
- * Lookup a host context ring-3 address.
+ *
- * @returns Pointer to the corresponding lookup record.
- * @returns NULL on failure.
- * @param   pVM     The cross context VM structure.
- * @param   R3Ptr   The host context ring-3 address to lookup.
- * @param   poff    Where to store the offset into the HMA memory chunk.
- */
-DECLINLINE(PMMLOOKUPHYPER) mmHyperLookupR3(PVM pVM, RTR3PTR R3Ptr, uint32_t *poff)
+{
-    /** @todo cache last lookup, this stuff ain't cheap! */
-    PMMLOOKUPHYPER  pLookup = (PMMLOOKUPHYPER)((uint8_t *)pVM->mm.s.CTX_SUFF(pHyperHeap) + pVM->mm.s.offLookupHyper);
-    for (;;)
+    {
-        switch (pLookup->enmType)
+        {
-            case MMLOOKUPHYPERTYPE_LOCKED:
+            {
-                const RTR3UINTPTR off = (RTR3UINTPTR)R3Ptr - (RTR3UINTPTR)pLookup->u.Locked.pvR3;
-                if (off < pLookup->cb)
+                {
-                    *poff = off;
-                    return pLookup;
+                }
-                break;
+            }
-            case MMLOOKUPHYPERTYPE_HCPHYS:
+            {
-                const RTR3UINTPTR off = (RTR3UINTPTR)R3Ptr - (RTR3UINTPTR)pLookup->u.HCPhys.pvR3;
-                if (off < pLookup->cb)
+                {
-                    *poff = off;
-                    return pLookup;
+                }
-                break;
+            }
-            case MMLOOKUPHYPERTYPE_GCPHYS:  /* (for now we'll not allow these kind of conversions) */
-            case MMLOOKUPHYPERTYPE_MMIO2:
-            case MMLOOKUPHYPERTYPE_DYNAMIC:
-                break;
-            default:
-                AssertMsgFailed(("enmType=%d\n", pLookup->enmType));
-                break;
+        }
-        /* next */
-        if (pLookup->offNext ==  (int32_t)NIL_OFFSET)
-            break;
-        pLookup = (PMMLOOKUPHYPER)((uint8_t *)pLookup + pLookup->offNext);
+    }
-    AssertMsgFailed(("R3Ptr=%RHv is not inside the hypervisor memory area!\n", R3Ptr));
-    return NULL;
+}
-/**
- * Calculate the host context ring-0 address of an offset into the HMA memory chunk.
+ *
- * @returns the host context ring-0 address.
- * @param   pVM         The cross context VM structure.
- * @param   pLookup     The HMA lookup record.
- * @param   off         The offset into the HMA memory chunk.
- */
-DECLINLINE(RTR0PTR) mmHyperLookupCalcR0(PVM pVM, PMMLOOKUPHYPER pLookup, uint32_t off)
+{
-    switch (pLookup->enmType)
+    {
-        case MMLOOKUPHYPERTYPE_LOCKED:
-            if (pLookup->u.Locked.pvR0)
-                return (RTR0PTR)((RTR0UINTPTR)pLookup->u.Locked.pvR0 + off);
-#ifdef IN_RING3
-            AssertMsg(SUPR3IsDriverless(), ("%s\n", R3STRING(pLookup->pszDesc)));
-#else
-            AssertMsgFailed(("%s\n", R3STRING(pLookup->pszDesc)));
-#endif
-            NOREF(pVM);
-            return NIL_RTR0PTR;
-        case MMLOOKUPHYPERTYPE_HCPHYS:
-            if (pLookup->u.HCPhys.pvR0)
-                return (RTR0PTR)((RTR0UINTPTR)pLookup->u.HCPhys.pvR0 + off);
-#ifdef IN_RING3
-            AssertMsg(SUPR3IsDriverless(), ("%s\n", R3STRING(pLookup->pszDesc)));
-#else
-            AssertMsgFailed(("%s\n", R3STRING(pLookup->pszDesc)));
-#endif
-            return NIL_RTR0PTR;
-        default:
-            AssertMsgFailed(("enmType=%d\n", pLookup->enmType));
-            return NIL_RTR0PTR;
+    }
+}
-/**
- * Converts a ring-3 host context address in the Hypervisor memory region to a ring-0 host context address.
+ *
- * @returns ring-0 host context address.
- * @param   pVM         The cross context VM structure.
- * @param   R3Ptr       The ring-3 host context address.
- *                      You'll be damned if this is not in the HMA! :-)
- * @thread  The Emulation Thread.
- */
-VMMDECL(RTR0PTR) MMHyperR3ToR0(PVM pVM, RTR3PTR R3Ptr)
+{
-    uint32_t off;
-    PMMLOOKUPHYPER pLookup = mmHyperLookupR3(pVM, R3Ptr, &off);
-    if (pLookup)
-        return mmHyperLookupCalcR0(pVM, pLookup, off);
-    AssertMsgFailed(("R3Ptr=%p is not inside the hypervisor memory area!\n", R3Ptr));
-    return NIL_RTR0PTR;
+}
-#ifdef IN_RING0
-/**
- * Converts a ring-3 host context address in the Hypervisor memory region to a current context address.
+ *
- * @returns current context address.
- * @param   pVM         The cross context VM structure.
- * @param   R3Ptr       The ring-3 host context address.
- *                      You'll be damned if this is not in the HMA! :-)
- * @thread  The Emulation Thread.
- */
-VMMDECL(void *) MMHyperR3ToCC(PVM pVM, RTR3PTR R3Ptr)
+{
-    uint32_t off;
-    PMMLOOKUPHYPER pLookup = mmHyperLookupR3(pVM, R3Ptr, &off);
-    if (pLookup)
-        return mmHyperLookupCalcR0(pVM, pLookup, off);
-    return NULL;
+}
-#endif

trunk/src/VBox/VMM/VMMR3/EM.cpp

-              r93204
+              r93718
     STAM_REL_PROFILE_ADV_START(&pVCpu->em.s.StatREMTotal, a);
-#if defined(VBOX_STRICT) && defined(DEBUG_bird)
-    AssertMsg(   VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL)
-              || !MMHyperIsInsideArea(pVM, CPUMGetGuestEIP(pVCpu)),  /** @todo @bugref{1419} - get flat address. */
-              ("cs:eip=%RX16:%RX32\n", CPUMGetGuestCS(pVCpu), CPUMGetGuestEIP(pVCpu)));
-#endif
     /*
      * Spin till we get a forced action which returns anything but VINF_SUCCESS

trunk/src/VBox/VMM/VMMR3/MM.cpp

-              r93598
+              r93718
     AssertRelease(!(RT_UOFFSETOF(VM, mm.s) & 31));
     AssertRelease(sizeof(pVM->mm.s) <= sizeof(pVM->mm.padding));
+    AssertMsg(pVM->mm.s.offVM == 0, ("Already initialized!\n"));
+    /*
+     * Init the structure.
+     */
+    pVM->mm.s.offVM = RT_UOFFSETOF(VM, mm);
+    pVM->mm.s.offLookupHyper = NIL_OFFSET;
+    /*
+     * Init the hypervisor related stuff.
+     */
+    int rc = mmR3HyperInit(pVM);
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * Register the saved state data unit.
+         */
+        rc = SSMR3RegisterInternal(pVM, "mm", 1, MM_SAVED_STATE_VERSION, sizeof(uint32_t) * 2,
+    /*
+     * Register the saved state data unit.
+     */
+    int rc = SSMR3RegisterInternal(pVM, "mm", 1, MM_SAVED_STATE_VERSION, sizeof(uint32_t) * 2,
                                    NULL, NULL, NULL,
                                    NULL, mmR3Save, NULL,
                                    NULL, mmR3Load, NULL);
+        if (RT_SUCCESS(rc))
+        {
+            /*
+             * Statistics.
+             */
+            STAM_REG(pVM, &pVM->mm.s.cBasePages,   STAMTYPE_U64, "/MM/Reserved/cBasePages",   STAMUNIT_PAGES, "Reserved number of base pages, ROM and Shadow ROM included.");
+            STAM_REG(pVM, &pVM->mm.s.cHandyPages,  STAMTYPE_U32, "/MM/Reserved/cHandyPages",  STAMUNIT_PAGES, "Reserved number of handy pages.");
+            STAM_REG(pVM, &pVM->mm.s.cShadowPages, STAMTYPE_U32, "/MM/Reserved/cShadowPages", STAMUNIT_PAGES, "Reserved number of shadow paging pages.");
+            STAM_REG(pVM, &pVM->mm.s.cFixedPages,  STAMTYPE_U32, "/MM/Reserved/cFixedPages",  STAMUNIT_PAGES, "Reserved number of fixed pages (MMIO2).");
+            STAM_REG(pVM, &pVM->mm.s.cbRamBase,    STAMTYPE_U64, "/MM/cbRamBase",             STAMUNIT_BYTES, "Size of the base RAM.");
+            return rc;
+        }
+        /* .... failure .... */
+    }
+    MMR3Term(pVM);
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * Statistics.
+         */
+        STAM_REG(pVM, &pVM->mm.s.cBasePages,   STAMTYPE_U64, "/MM/Reserved/cBasePages",   STAMUNIT_PAGES, "Reserved number of base pages, ROM and Shadow ROM included.");
+        STAM_REG(pVM, &pVM->mm.s.cHandyPages,  STAMTYPE_U32, "/MM/Reserved/cHandyPages",  STAMUNIT_PAGES, "Reserved number of handy pages.");
+        STAM_REG(pVM, &pVM->mm.s.cShadowPages, STAMTYPE_U32, "/MM/Reserved/cShadowPages", STAMUNIT_PAGES, "Reserved number of shadow paging pages.");
+        STAM_REG(pVM, &pVM->mm.s.cFixedPages,  STAMTYPE_U32, "/MM/Reserved/cFixedPages",  STAMUNIT_PAGES, "Reserved number of fixed pages (MMIO2).");
+        STAM_REG(pVM, &pVM->mm.s.cbRamBase,    STAMTYPE_U64, "/MM/cbRamBase",             STAMUNIT_BYTES, "Size of the base RAM.");
+        return rc;
+    }
     return rc;
+}
 …
 VMMR3DECL(int) MMR3Term(PVM pVM)
+{
+    /*
+     * Clean up the hypervisor heap.
+     */
+    mmR3HyperTerm(pVM);
+    /*
+     * Zero stuff to detect after termination use of the MM interface
+     */
+    pVM->mm.s.offLookupHyper = NIL_OFFSET;
+    pVM->mm.s.pHyperHeapR3   = NULL;        /* freed above. */
+    pVM->mm.s.pHyperHeapR0   = NIL_RTR0PTR; /* freed above. */
+    pVM->mm.s.pHyperHeapRC   = NIL_RTRCPTR; /* freed above. */
+    pVM->mm.s.offVM          = 0;           /* init assertion on this */
+    RT_NOREF(pVM);
     return VINF_SUCCESS;
+}
 …
     mmR3HeapDestroy(pUVM->mm.s.pHeap);
     pUVM->mm.s.pHeap = NULL;
+}
-/**
- * Checks if the both VM and UVM parts of MM have been initialized.
+ *
- * @returns true if initialized, false if not.
- * @param   pVM         The cross context VM structure.
- */
-VMMR3_INT_DECL(bool) MMR3IsInitialized(PVM pVM)
+{
-    return pVM->mm.s.pHyperHeapR3 != NULL;
+}

trunk/src/VBox/VMM/VMMR3/PDMLdr.cpp

-              r93554
+              r93718
      * Validate input.
      */
-    AssertMsg(MMR3IsInitialized(pVM), ("bad init order!\n"));
     AssertReturn(VM_IS_RAW_MODE_ENABLED(pVM), VERR_PDM_HM_IPE);
 …
     AssertPtrNull(pszModule);
     AssertPtr(pRCPtrValue);
-    AssertMsg(MMR3IsInitialized(pVM), ("bad init order!\n"));
     if (!pszModule)
 …
     AssertPtr(pszModule);
     AssertPtr(pRCPtrValue);
-    AssertMsg(MMR3IsInitialized(pVM), ("bad init order!\n"));
     /*

trunk/src/VBox/VMM/VMMR3/VM.cpp

-              r93554
+              r93718
                                                                 if (RT_SUCCESS(rc))
+                                                                {
+                                                                    rc = MMR3HyperInitFinalize(pVM);
+                                                                    if (RT_SUCCESS(rc))
+                                                                        rc = PGMR3InitFinalize(pVM);
+                                                                    rc = PGMR3InitFinalize(pVM);
                                                                     if (RT_SUCCESS(rc))
                                                                         rc = TMR3InitFinalize(pVM);

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

-              r93595
+              r93718
 /** @} */
-/** @name MMUkHeap - VM User-kernel Heap Internals
- * @{
- */
-/** @def MMUKHEAP_SIZE_ALIGNMENT
- * The allocation size alignment of the MMR3UkHeap.
- */
-#define MMUKHEAP_SIZE_ALIGNMENT   16
-/** @def MMUKHEAP_WITH_STATISTICS
- * Enable MMUkHeap statistics.
- */
-#if !defined(MMUKHEAP_WITH_STATISTICS) && defined(VBOX_WITH_STATISTICS)
-# define MMUKHEAP_WITH_STATISTICS
-#endif
-/**
- * Heap statistics record.
- * There is one global and one per allocation tag.
- */
-typedef struct MMUKHEAPSTAT
+{
-    /** Core avl node, key is the tag. */
-    AVLULNODECORE           Core;
-    /** Number of allocation. */
-    uint64_t                cAllocations;
-    /** Number of reallocations. */
-    uint64_t                cReallocations;
-    /** Number of frees. */
-    uint64_t                cFrees;
-    /** Failures. */
-    uint64_t                cFailures;
-    /** Number of bytes allocated (sum). */
-    uint64_t                cbAllocated;
-    /** Number of bytes freed. */
-    uint64_t                cbFreed;
-    /** Number of bytes currently allocated. */
-    size_t                  cbCurAllocated;
-} MMUKHEAPSTAT;
-#ifdef IN_RING3
-AssertCompileMemberAlignment(MMUKHEAPSTAT, cAllocations, 8);
-#endif
-/** Pointer to heap statistics record. */
-typedef MMUKHEAPSTAT *PMMUKHEAPSTAT;
-/**
- * Sub heap tracking record.
- */
-typedef struct MMUKHEAPSUB
+{
-    /** Pointer to the next sub-heap. */
-    struct MMUKHEAPSUB     *pNext;
-    /** The base address of the sub-heap. */
-    void                   *pv;
-    /** The size of the sub-heap.  */
-    size_t                  cb;
-    /** The handle of the simple block pointer. */
-    RTHEAPSIMPLE            hSimple;
-    /** The ring-0 address corresponding to MMUKHEAPSUB::pv. */
-    RTR0PTR                 pvR0;
-} MMUKHEAPSUB;
-/** Pointer to a sub-heap tracking record. */
-typedef MMUKHEAPSUB *PMMUKHEAPSUB;
-/** MM User-kernel Heap structure. */
-typedef struct MMUKHEAP
+{
-    /** Lock protecting the heap. */
-    RTCRITSECT              Lock;
-    /** Head of the sub-heap LIFO. */
-    PMMUKHEAPSUB            pSubHeapHead;
-    /** Heap per tag statistics tree. */
-    PAVLULNODECORE          pStatTree;
-    /** The VM handle. */
-    PUVM                    pUVM;
-#if HC_ARCH_BITS == 32
-    /** Aligning the statistics on an 8 byte boundary (for uint64_t and STAM). */
-    void                   *pvAlignment;
-#endif
-    /** Heap global statistics. */
-    MMUKHEAPSTAT            Stat;
-} MMUKHEAP;
-#ifdef IN_RING3
-AssertCompileMemberAlignment(MMUKHEAP, Stat, 8);
-#endif
-/** Pointer to MM Heap structure. */
-typedef MMUKHEAP *PMMUKHEAP;
-/** @} */
-/** @name Hypervisor Heap Internals
- * @{
- */
-/** @def MMHYPER_HEAP_FREE_DELAY
- * If defined, it indicates the number of frees that should be delayed.
- */
-#if defined(DOXYGEN_RUNNING)
-# define MMHYPER_HEAP_FREE_DELAY            64
-#endif
-/** @def MMHYPER_HEAP_FREE_POISON
- * If defined, it indicates that freed memory should be poisoned
- * with the value it has.
- */
-#if defined(VBOX_STRICT) || defined(DOXYGEN_RUNNING)
-# define MMHYPER_HEAP_FREE_POISON           0xcb
-#endif
-/** @def MMHYPER_HEAP_STRICT
- * Enables a bunch of assertions in the heap code. */
-#if defined(VBOX_STRICT) || defined(DOXYGEN_RUNNING)
-# define MMHYPER_HEAP_STRICT 1
-# if 0 || defined(DOXYGEN_RUNNING)
-/** @def MMHYPER_HEAP_STRICT_FENCE
- * Enables tail fence. */
-#  define MMHYPER_HEAP_STRICT_FENCE
-/** @def MMHYPER_HEAP_STRICT_FENCE_SIZE
- * The fence size in bytes. */
-#  define MMHYPER_HEAP_STRICT_FENCE_SIZE    256
-/** @def MMHYPER_HEAP_STRICT_FENCE_U32
- * The fence filler. */
-#  define MMHYPER_HEAP_STRICT_FENCE_U32     UINT32_C(0xdeadbeef)
-# endif
-#endif
-/**
- * Hypervisor heap statistics record.
- * There is one global and one per allocation tag.
- */
-typedef struct MMHYPERSTAT
+{
-    /** Core avl node, key is the tag.
-     * @todo The type is wrong! Get your lazy a$$ over and create that offsetted uint32_t version we need here!  */
-    AVLOGCPHYSNODECORE      Core;
-    /** Aligning the 64-bit fields on a 64-bit line. */
-    uint32_t                u32Padding0;
-    /** Indicator for whether these statistics are registered with STAM or not. */
-    bool                    fRegistered;
-    /** Number of allocation. */
-    uint64_t                cAllocations;
-    /** Number of frees. */
-    uint64_t                cFrees;
-    /** Failures. */
-    uint64_t                cFailures;
-    /** Number of bytes allocated (sum). */
-    uint64_t                cbAllocated;
-    /** Number of bytes freed (sum). */
-    uint64_t                cbFreed;
-    /** Number of bytes currently allocated. */
-    uint32_t                cbCurAllocated;
-    /** Max number of bytes allocated. */
-    uint32_t                cbMaxAllocated;
-} MMHYPERSTAT;
-AssertCompileMemberAlignment(MMHYPERSTAT, cAllocations, 8);
-/** Pointer to hypervisor heap statistics record. */
-typedef MMHYPERSTAT *PMMHYPERSTAT;
-/**
- * Hypervisor heap chunk.
- */
-typedef struct MMHYPERCHUNK
+{
-    /** Previous block in the list of all blocks.
-     * This is relative to the start of the heap. */
-    uint32_t                offNext;
-    /** Offset to the previous block relative to this one. */
-    int32_t                 offPrev;
-    /** The statistics record this allocation belongs to (self relative). */
-    int32_t                 offStat;
-    /** Offset to the heap block (self relative). */
-    int32_t                 offHeap;
-} MMHYPERCHUNK;
-/** Pointer to a hypervisor heap chunk. */
-typedef MMHYPERCHUNK *PMMHYPERCHUNK;
-/**
- * Hypervisor heap chunk.
- */
-typedef struct MMHYPERCHUNKFREE
+{
-    /** Main list. */
-    MMHYPERCHUNK            core;
-    /** Offset of the next chunk in the list of free nodes. */
-    uint32_t                offNext;
-    /** Offset of the previous chunk in the list of free nodes. */
-    int32_t                 offPrev;
-    /** Size of the block. */
-    uint32_t                cb;
-} MMHYPERCHUNKFREE;
-/** Pointer to a free hypervisor heap chunk. */
-typedef MMHYPERCHUNKFREE *PMMHYPERCHUNKFREE;
-/**
- * The hypervisor heap.
- */
-typedef struct MMHYPERHEAP
+{
-    /** The typical magic (MMHYPERHEAP_MAGIC). */
-    uint32_t                u32Magic;
-    /** The heap size. (This structure is not included!) */
-    uint32_t                cbHeap;
-    /** Lock protecting the heap. */
-    PDMCRITSECT             Lock;
-    /** The HC ring-3 address of the heap. */
-    R3PTRTYPE(uint8_t *)    pbHeapR3;
-    /** The HC ring-3 address of the shared VM structure. */
-    PVMR3                   pVMR3;
-    /** The HC ring-0 address of the heap. */
-    R0PTRTYPE(uint8_t *)    pbHeapR0;
-    /** The HC ring-0 address of the shared VM structure. */
-    PVMR0                   pVMR0;
-    /** The RC address of the heap. */
-    RCPTRTYPE(uint8_t *)    pbHeapRC;
-    /** The RC address of the shared VM structure. */
-    PVMRC                   pVMRC;
-    /** The amount of free memory in the heap. */
-    uint32_t                cbFree;
-    /** Offset of the first free chunk in the heap.
-     * The offset is relative to the start of the heap. */
-    uint32_t                offFreeHead;
-    /** Offset of the last free chunk in the heap.
-     * The offset is relative to the start of the heap. */
-    uint32_t                offFreeTail;
-    /** Offset of the first page aligned block in the heap.
-     * The offset is equal to cbHeap initially. */
-    uint32_t                offPageAligned;
-    /** Tree of hypervisor heap statistics. */
-    AVLOGCPHYSTREE          HyperHeapStatTree;
-#ifdef MMHYPER_HEAP_FREE_DELAY
-    /** Where to insert the next free. */
-    uint32_t                iDelayedFree;
-    /** Array of delayed frees. Circular. Offsets relative to this structure. */
-    struct
+    {
-        /** The free caller address. */
-        RTUINTPTR           uCaller;
-        /** The offset of the freed chunk. */
-        uint32_t            offChunk;
-    } aDelayedFrees[MMHYPER_HEAP_FREE_DELAY];
-#else
-    /** Padding the structure to a 64-bit aligned size. */
-    uint32_t                u32Padding0;
-#endif
-    /** The heap physical pages. */
-    R3PTRTYPE(PSUPPAGE)     paPages;
-#if HC_ARCH_BITS == 32
-    /** Padding the structure to a 64-bit aligned size. */
-    uint32_t                u32Padding1;
-#endif
-} MMHYPERHEAP;
-/** Pointer to the hypervisor heap. */
-typedef MMHYPERHEAP *PMMHYPERHEAP;
-/** Magic value for MMHYPERHEAP. (C. S. Lewis) */
-#define MMHYPERHEAP_MAGIC               UINT32_C(0x18981129)
-/**
- * Hypervisor heap minimum alignment (16 bytes).
- */
-#define MMHYPER_HEAP_ALIGN_MIN          16
-/**
- * The aligned size of the MMHYPERHEAP structure.
- */
-#define MMYPERHEAP_HDR_SIZE             RT_ALIGN_Z(sizeof(MMHYPERHEAP), MMHYPER_HEAP_ALIGN_MIN * 4)
-/** @name Hypervisor heap chunk flags.
- * The flags are put in the first bits of the MMHYPERCHUNK::offPrev member.
- * These bits aren't used anyway because of the chunk minimal alignment (16 bytes).
- * @{ */
-/** The chunk is free. (The code ASSUMES this is 0!) */
-#define MMHYPERCHUNK_FLAGS_FREE         0x0
-/** The chunk is in use. */
-#define MMHYPERCHUNK_FLAGS_USED         0x1
-/** The type mask. */
-#define MMHYPERCHUNK_FLAGS_TYPE_MASK    0x1
-/** The flag mask */
-#define MMHYPERCHUNK_FLAGS_MASK         0x1
-/** Checks if the chunk is free. */
-#define MMHYPERCHUNK_ISFREE(pChunk)                 ( (((pChunk)->offPrev) & MMHYPERCHUNK_FLAGS_TYPE_MASK) == MMHYPERCHUNK_FLAGS_FREE )
-/** Checks if the chunk is used. */
-#define MMHYPERCHUNK_ISUSED(pChunk)                 ( (((pChunk)->offPrev) & MMHYPERCHUNK_FLAGS_TYPE_MASK) == MMHYPERCHUNK_FLAGS_USED )
-/** Toggles FREE/USED flag of a chunk. */
-#define MMHYPERCHUNK_SET_TYPE(pChunk, type)         do { (pChunk)->offPrev = ((pChunk)->offPrev & ~MMHYPERCHUNK_FLAGS_TYPE_MASK) | ((type) & MMHYPERCHUNK_FLAGS_TYPE_MASK); } while (0)
-/** Gets the prev offset without the flags. */
-#define MMHYPERCHUNK_GET_OFFPREV(pChunk)            ((int32_t)((pChunk)->offPrev & ~MMHYPERCHUNK_FLAGS_MASK))
-/** Sets the prev offset without changing the flags. */
-#define MMHYPERCHUNK_SET_OFFPREV(pChunk, off)       do { (pChunk)->offPrev = (off) | ((pChunk)->offPrev & MMHYPERCHUNK_FLAGS_MASK); } while (0)
-#if 0
-/** Clears one or more flags. */
-#define MMHYPERCHUNK_FLAGS_OP_CLEAR(pChunk, fFlags) do { ((pChunk)->offPrev) &= ~((fFlags) & MMHYPERCHUNK_FLAGS_MASK); } while (0)
-/** Sets one or more flags. */
-#define MMHYPERCHUNK_FLAGS_OP_SET(pChunk, fFlags)   do { ((pChunk)->offPrev) |=  ((fFlags) & MMHYPERCHUNK_FLAGS_MASK); } while (0)
-/** Checks if one is set. */
-#define MMHYPERCHUNK_FLAGS_OP_ISSET(pChunk, fFlag)  (!!(((pChunk)->offPrev) & ((fFlag) & MMHYPERCHUNK_FLAGS_MASK)))
-#endif
-/** @} */
-/** @} */
-/**
- * Hypervisor memory mapping type.
- */
-typedef enum MMLOOKUPHYPERTYPE
+{
-    /** Invalid record. This is used for record which are incomplete. */
-    MMLOOKUPHYPERTYPE_INVALID = 0,
-    /** Mapping of locked memory. */
-    MMLOOKUPHYPERTYPE_LOCKED,
-    /** Mapping of contiguous HC physical memory. */
-    MMLOOKUPHYPERTYPE_HCPHYS,
-    /** Mapping of contiguous GC physical memory. */
-    MMLOOKUPHYPERTYPE_GCPHYS,
-    /** Mapping of MMIO2 memory. */
-    MMLOOKUPHYPERTYPE_MMIO2,
-    /** Dynamic mapping area (MMR3HyperReserve).
-     * A conversion will require to check what's in the page table for the pages. */
-    MMLOOKUPHYPERTYPE_DYNAMIC
-} MMLOOKUPHYPERTYPE;
-/**
- * Lookup record for the hypervisor memory area.
- */
-typedef struct MMLOOKUPHYPER
+{
-    /** Byte offset from the start of this record to the next.
-     * If the value is NIL_OFFSET the chain is terminated. */
-    int32_t                 offNext;
-    /** Offset into the hypervisor memory area. */
-    uint32_t                off;
-    /** Size of this part. */
-    uint32_t                cb;
-    /** Locking type. */
-    MMLOOKUPHYPERTYPE       enmType;
-    /** Type specific data */
-    union
+    {
-        /** Locked memory. */
-        struct
+        {
-            /** Host context ring-3 pointer. */
-            R3PTRTYPE(void *)       pvR3;
-            /** Host context ring-0 pointer. Optional. */
-            RTR0PTR                 pvR0;
-            /** Pointer to an array containing the physical address of each page
-             * (HOST_PAGE_SIZE). */
-            R3PTRTYPE(PRTHCPHYS)    paHCPhysPages;
-        } Locked;
-        /** Contiguous physical memory. */
-        struct
+        {
-            /** Host context ring-3 pointer. */
-            R3PTRTYPE(void *)       pvR3;
-            /** Host context ring-0 pointer. Optional. */
-            RTR0PTR                 pvR0;
-            /** HC physical address corresponding to pvR3/pvR0. */
-            RTHCPHYS                HCPhys;
-        } HCPhys;
-        /** Contiguous guest physical memory. */
-        struct
+        {
-            /** The memory address (Guest Context). */
-            RTGCPHYS                GCPhys;
-        } GCPhys;
-        /** MMIO2 memory. */
-        struct
+        {
-            /** The device instance owning the MMIO2 region. */
-            PPDMDEVINSR3            pDevIns;
-            /** The sub-device number. */
-            uint32_t                iSubDev;
-            /** The region number. */
-            uint32_t                iRegion;
-#if HC_ARCH_BITS == 32
-            /** Alignment padding. */
-            uint32_t                uPadding;
-#endif
-            /** The offset into the MMIO2 region. */
-            RTGCPHYS                off;
-        } MMIO2;
-    } u;
-    /** Description. */
-    R3PTRTYPE(const char *) pszDesc;
-} MMLOOKUPHYPER;
-/** Pointer to a hypervisor memory lookup record. */
-typedef MMLOOKUPHYPER *PMMLOOKUPHYPER;
-/**
- * Converts a MM pointer into a VM pointer.
- * @returns Pointer to the VM structure the MM is part of.
- * @param   pMM   Pointer to MM instance data.
- */
-#define MM2VM(pMM)  ( (PVM)((uint8_t *)pMM - pMM->offVM) )
 /**
  * MM Data (part of VM)
 …
 typedef struct MM
+{
-    /** Offset to the VM structure.
-     * See MM2VM(). */
-    RTINT                       offVM;
     /** Set if MMR3InitPaging has been called. */
     bool                        fDoneMMR3InitPaging;
+    /** Set if PGM has been initialized and we can safely call PGMR3Map(). */
+    bool                        fPGMInitialized;
+#if GC_ARCH_BITS == 64 || HC_ARCH_BITS == 64
+    uint32_t                    u32Padding1; /**< alignment padding. */
+#endif
+    /** Lookup list for the Hypervisor Memory Area.
+     * The offset is relative to the start of the heap.
+     * Use pHyperHeapR3, pHyperHeapR0 or pHypeRHeapRC to calculate the address.
+     */
+    RTUINT                      offLookupHyper;
+    /** The offset of the next static mapping in the Hypervisor Memory Area. */
+    RTUINT                      offHyperNextStatic;
+    /** The size of the HMA.
+     * Starts at 12MB and will be fixed late in the init process. */
+    RTUINT                      cbHyperArea;
+    /** Guest address of the Hypervisor Memory Area.
+     * @remarks It's still a bit open whether this should be change to RTRCPTR or
+     *          remain a RTGCPTR. */
+    RTGCPTR                     pvHyperAreaGC;
+    /** The hypervisor heap (GC Ptr). */
+    RCPTRTYPE(PMMHYPERHEAP)     pHyperHeapRC;
+#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 64
+    uint32_t                    u32Padding2;
+#endif
+    /** The hypervisor heap (R0 Ptr). */
+    R0PTRTYPE(PMMHYPERHEAP)     pHyperHeapR0;
+    /** The hypervisor heap (R3 Ptr). */
+    R3PTRTYPE(PMMHYPERHEAP)     pHyperHeapR3;
+    /** Padding. */
+    bool                        afPadding1[7];
     /** Size of the base RAM in bytes. (The CFGM RamSize value.) */
 …
     uint32_t                    cFixedPages;
     /** Padding. */
     uint32_t                    u32Padding0;
+    uint32_t                    u32Padding2;
 } MM;
 /** Pointer to MM Data (part of VM). */
 …
 void mmR3HeapDestroy(PMMHEAP pHeap);
-int  mmR3HyperInit(PVM pVM);
-int  mmR3HyperTerm(PVM pVM);
-int  mmR3HyperInitPaging(PVM pVM);
 const char *mmGetTagName(MMTAG enmTag);

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

-              r93609
+              r93718
  ifdef VBOX_WITH_TESTCASES
   if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
 PROGRAMS += tstCFGMHardened tstVMREQHardened tstMMHyperHeapHardened tstAnimateHardened
 DLLS     += tstCFGM tstVMREQ tstMMHyperHeap tstAnimate
+PROGRAMS += tstCFGMHardened tstVMREQHardened tstAnimateHardened
+DLLS     += tstCFGM tstVMREQ tstAnimate
   else
 PROGRAMS += tstCFGM tstVMREQ tstMMHyperHeap tstAnimate
+PROGRAMS += tstCFGM tstVMREQ tstAnimate
   endif
 PROGRAMS += \
 …
 tstIEMCheckMc_CXXFLAGS  = $(VBOX_C_CXX_FLAGS_NO_UNUSED_PARAMETERS) -Wno-unused-value -Wno-unused-variable
 endif
+#
-# VMM heap testcase.
+#
-if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
-tstMMHyperHeapHardened_TEMPLATE = VBoxR3HardenedTstExe
-tstMMHyperHeapHardened_NAME     = tstMMHyperHeap
- ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
-tstMMHyperHeapHardened_DEFS     = PROGRAM_NAME_STR="tstMMHyperHeap"
- else
-tstMMHyperHeapHardened_DEFS     = PROGRAM_NAME_STR=\"tstMMHyperHeap\"
- endif
-tstMMHyperHeapHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
-tstMMHyperHeap_TEMPLATE = VBoxR3HardenedTstDll
-else
-tstMMHyperHeap_TEMPLATE = VBOXR3TSTEXE
-endif
-tstMMHyperHeap_DEFS     = $(VMM_COMMON_DEFS)
-tstMMHyperHeap_SOURCES  = tstMMHyperHeap.cpp
-tstMMHyperHeap_LIBS     = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
+#

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

r93656	r93718
371	371	CHECK_MEMBER_ALIGNMENT(PGM, CritSectX, sizeof(uintptr_t));
372	372	CHECK_MEMBER_ALIGNMENT(PDM, CritSect, sizeof(uintptr_t));
373		~~CHECK_MEMBER_ALIGNMENT(MMHYPERHEAP, Lock, sizeof(uintptr_t));~~
374	373
375	374	/* hm - 32-bit gcc won't align uint64_t naturally, so check. */

Note: See TracChangeset for help on using the changeset viewer.

Changeset 93718 in vbox for trunk/src/VBox

Legend:

Download in other formats: