Changeset 14597 in vbox for trunk

Timestamp:

Nov 25, 2008 8:41:40 PM (16 years ago)

Author:

vboxsync

Message:

Added R0 address to MMR3HyperMapHCPhys and made the MMHyperXToR0 use pvR0 for HCPhys and Locked more strickly.

Location:

trunk

Files:

• include/VBox/mm.h (modified) (1 diff)
• src/VBox/VMM/MMHyper.cpp (modified) (9 diffs)
• src/VBox/VMM/MMInternal.h (modified) (2 diffs)
• src/VBox/VMM/TM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/MMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMSwitcher.cpp (modified) (1 diff)

trunk/include/VBox/mm.h

@@ -337 +337 @@
  * @{ */
 VMMDECL(int)        MMR3HyperAllocOnceNoRel(PVM pVM, size_t cb, uint32_t uAlignment, MMTAG enmTag, void **ppv);
-VMMR3DECL(int)      MMR3HyperMapHCPhys(PVM pVM, void *pvHC, RTHCPHYS HCPhys, size_t cb, const char *pszDesc, PRTGCPTR pGCPtr);
+VMMR3DECL(int)      MMR3HyperMapHCPhys(PVM pVM, void *pvR3, RTR0PTR pvR0, RTHCPHYS HCPhys, size_t cb, const char *pszDesc, PRTGCPTR pGCPtr);
 VMMR3DECL(int)      MMR3HyperMapGCPhys(PVM pVM, RTGCPHYS GCPhys, size_t cb, const char *pszDesc, PRTGCPTR pGCPtr);
 VMMR3DECL(int)      MMR3HyperMapMMIO2(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb, const char *pszDesc, PRTRCPTR pRCPtr);

trunk/src/VBox/VMM/MMHyper.cpp

@@ -319 +319 @@
  *
  * @param   pVM         VM handle.
- * @param   pvR3        Host context address of the memory. Must be page
- *                      aligned!
+ * @param   pvR3        Ring-3 address of the memory. Must be page aligned!
+ * @param   pvR0        Optional ring-0 address of the memory.
  * @param   HCPhys      Host context physical address of the memory to be
  *                      mapped. Must be page aligned!
@@ -327 +327 @@
  * @param   pGCPtr      Where to store the GC address.
  */
-VMMR3DECL(int) MMR3HyperMapHCPhys(PVM pVM, void *pvR3, RTHCPHYS HCPhys, size_t cb, const char *pszDesc, PRTGCPTR pGCPtr)
-{
-    LogFlow(("MMR3HyperMapHCPhys: pvR3=%p HCPhys=%RHp cb=%d pszDesc=%p:{%s} pGCPtr=%p\n", pvR3, HCPhys, (int)cb, pszDesc, pszDesc, pGCPtr));
+VMMR3DECL(int) MMR3HyperMapHCPhys(PVM pVM, void *pvR3, RTR0PTR pvR0, RTHCPHYS HCPhys, size_t cb, const char *pszDesc, PRTGCPTR pGCPtr)
+{
+    LogFlow(("MMR3HyperMapHCPhys: pvR3=%p pvR0=%p HCPhys=%RHp cb=%d pszDesc=%p:{%s} pGCPtr=%p\n", pvR3, pvR0, HCPhys, (int)cb, pszDesc, pszDesc, pGCPtr));
 
     /*
@@ -335 +335 @@
      */
     AssertReturn(RT_ALIGN_P(pvR3, PAGE_SIZE) == pvR3, VERR_INVALID_PARAMETER);
+    AssertReturn(RT_ALIGN_T(pvR0, PAGE_SIZE, RTR0PTR) == pvR0, VERR_INVALID_PARAMETER);
     AssertReturn(RT_ALIGN_T(HCPhys, PAGE_SIZE, RTHCPHYS) == HCPhys, VERR_INVALID_PARAMETER);
     AssertReturn(pszDesc && *pszDesc, VERR_INVALID_PARAMETER);
@@ -350 +351 @@
         pLookup->enmType = MMLOOKUPHYPERTYPE_HCPHYS;
         pLookup->u.HCPhys.pvR3   = pvR3;
+        pLookup->u.HCPhys.pvR0   = pvR0;
         pLookup->u.HCPhys.HCPhys = HCPhys;
 
@@ -1055 +1057 @@
         {
             case MMLOOKUPHYPERTYPE_LOCKED:
-                pHlp->pfnPrintf(pHlp, "%RGv-%RGv %RHv LOCKED  %-*s %s\n",
+                pHlp->pfnPrintf(pHlp, "%RGv-%RGv %RHv %RHv LOCKED  %-*s %s\n",
                                 pLookup->off + pVM->mm.s.pvHyperAreaGC,
                                 pLookup->off + pVM->mm.s.pvHyperAreaGC + pLookup->cb,
                                 pLookup->u.Locked.pvR3,
+                                pLookup->u.Locked.pvR0,
                                 sizeof(RTHCPTR) * 2,
                                 pLookup->u.Locked.pLockedMem->eType == MM_LOCKED_TYPE_HYPER_NOFREE  ? "nofree"
@@ -1069 +1072 @@
 
             case MMLOOKUPHYPERTYPE_HCPHYS:
-                pHlp->pfnPrintf(pHlp, "%RGv-%RGv %RHv HCPHYS  %RHp %s\n",
+                pHlp->pfnPrintf(pHlp, "%RGv-%RGv %RHv %RHv HCPHYS  %RHp %s\n",
                                 pLookup->off + pVM->mm.s.pvHyperAreaGC,
                                 pLookup->off + pVM->mm.s.pvHyperAreaGC + pLookup->cb,
-                                pLookup->u.HCPhys.pvR3, pLookup->u.HCPhys.HCPhys,
+                                pLookup->u.HCPhys.pvR3,
+                                pLookup->u.HCPhys.pvR0,
+                                pLookup->u.HCPhys.HCPhys,
                                 pLookup->pszDesc);
                 break;
@@ -1080 +1085 @@
                                 pLookup->off + pVM->mm.s.pvHyperAreaGC,
                                 pLookup->off + pVM->mm.s.pvHyperAreaGC + pLookup->cb,
-                                sizeof(RTHCPTR) * 2, "",
+                                sizeof(RTHCPTR) * 2 * 2 + 1, "",
                                 pLookup->u.GCPhys.GCPhys, RT_ABS((int)(sizeof(RTHCPHYS) - sizeof(RTGCPHYS))) * 2, "",
                                 pLookup->pszDesc);
@@ -1089 +1094 @@
                                 pLookup->off + pVM->mm.s.pvHyperAreaGC,
                                 pLookup->off + pVM->mm.s.pvHyperAreaGC + pLookup->cb,
-                                sizeof(RTHCPTR) * 2, "",
+                                sizeof(RTHCPTR) * 2 * 2 + 1, "",
                                 pLookup->u.MMIO2.off, RT_ABS((int)(sizeof(RTHCPHYS) - sizeof(RTGCPHYS))) * 2, "",
                                 pLookup->pszDesc);
@@ -1098 +1103 @@
                                 pLookup->off + pVM->mm.s.pvHyperAreaGC,
                                 pLookup->off + pVM->mm.s.pvHyperAreaGC + pLookup->cb,
-                                sizeof(RTHCPTR) * 2, "",
+                                sizeof(RTHCPTR) * 2 * 2 + 1, "",
                                 sizeof(RTHCPTR) * 2, "",
                                 pLookup->pszDesc);

trunk/src/VBox/VMM/MMInternal.h

@@ -636 +636 @@
         struct
         {
-            /** Host context pointer. */
+            /** Host context ring-3 pointer. */
             R3PTRTYPE(void *)       pvR3;
-            /** Host context ring-0 pointer. */
-            /** @todo #1865: Check if this actually works (doubt it) */
+            /** Host context ring-0 pointer. Optional. */
             RTR0PTR                 pvR0;
             /** Pointer to the locked mem record. */
@@ -648 +647 @@
         struct
         {
-            /** Host context pointer. */
+            /** Host context ring-3 pointer. */
             R3PTRTYPE(void *)       pvR3;
-            /** @todo #1865: Add a pvR0 here! */
-            /** HC physical address corresponding to pvR3. */
+            /** Host context ring-0 pointer. Optional. */
+            RTR0PTR                 pvR0;
+            /** HC physical address corresponding to pvR3/pvR0. */
             RTHCPHYS                HCPhys;
         } HCPhys;

trunk/src/VBox/VMM/TM.cpp

@@ -217 +217 @@
 
     RTGCPTR GCPtr;
-    rc = MMR3HyperMapHCPhys(pVM, pVM->tm.s.pvGIPR3, HCPhysGIP, PAGE_SIZE, "GIP", &GCPtr);
+    rc = MMR3HyperMapHCPhys(pVM, pVM->tm.s.pvGIPR3, NIL_RTR0PTR, HCPhysGIP, PAGE_SIZE, "GIP", &GCPtr);
     if (RT_FAILURE(rc))
     {

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

@@ -219 +219 @@
             if (pLookup->u.Locked.pvR0)
                 return (RTR0PTR)((RTR0UINTPTR)pLookup->u.Locked.pvR0 + off);
-            /** @todo #1865: accessing ring-3 memory (LOCKED)! */
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE /** @todo make NIL_RTR0PTR default! */
+            return NIL_RTR0PTR;
+#else
             return (RTR0PTR)((RTR3UINTPTR)pLookup->u.Locked.pvR3 + off);
+#endif
+
         case MMLOOKUPHYPERTYPE_HCPHYS:
-            /** @todo #1865: accessing ring-3 memory (HCPHYS)! */
-            return (RTR0PTR)((RTR3UINTPTR)pLookup->u.HCPhys.pvR3 + off);
+            if (pLookup->u.HCPhys.pvR0)
+                return (RTR0PTR)((RTR0UINTPTR)pLookup->u.HCPhys.pvR0 + off);
+            return NIL_RTR0PTR;
         default:
             AssertMsgFailed(("enmType=%d\n", pLookup->enmType));

trunk/src/VBox/VMM/VMMSwitcher.cpp

@@ -180 +180 @@
          */
         RTGCPTR GCPtr;
-        rc = MMR3HyperMapHCPhys(pVM, pVM->vmm.s.pvCoreCodeR3, pVM->vmm.s.HCPhysCoreCode, cbCoreCode, "Core Code", &GCPtr);
+        rc = MMR3HyperMapHCPhys(pVM, pVM->vmm.s.pvCoreCodeR3, pVM->vmm.s.pvCoreCodeR0, pVM->vmm.s.HCPhysCoreCode,
+                                cbCoreCode, "Core Code", &GCPtr);
         if (RT_SUCCESS(rc))
         {