Changeset 15425 in vbox for trunk/src/VBox/VMM

Timestamp:

Dec 13, 2008 9:22:59 AM (16 years ago)

Author:

vboxsync

Message:

PGMR0DynMapHCPage: always successful, or will bail out to ring-3.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• VMMAll/PGMAll.cpp (modified) (3 diffs)
• VMMAll/PGMAllPhys.cpp (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -4636 +4636 @@
         pgmR0DynMapHCPageInlined(pPGM, pPage->Core.Key, &pv);
 # else
-        int rc = PGMDynMapHCPage(PGM2VM(pPGM), pPage->Core.Key, &pv);
-        if (RT_SUCCESS(rc))
+        PGMDynMapHCPage(PGM2VM(pPGM), pPage->Core.Key, &pv);
 # endif
-            return pv;
+        return pv;
     }
     return pgmPoolMapPageFallback(pPGM, pPage);

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

@@ -1913 +1913 @@
     //Log(("PGMDynMapGCPage: GCPhys=%RGp HCPhys=%RHp\n", GCPhys, HCPhys));
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-    return pgmR0DynMapHCPageInlined(&pVM->pgm.s, HCPhys, ppv);
+    pgmR0DynMapHCPageInlined(&pVM->pgm.s, HCPhys, ppv);
 #else
-    return PGMDynMapHCPage(pVM, HCPhys, ppv);
+    PGMDynMapHCPage(pVM, HCPhys, ppv);
 #endif
+    return VINF_SUCCESS;
 }
 
@@ -1954 +1955 @@
     RTHCPHYS HCPhys = PGM_PAGE_GET_HCPHYS(&pRam->aPages[(GCPhys - pRam->GCPhys) >> PAGE_SHIFT]);
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-    int rc = pgmR0DynMapHCPageInlined(&pVM->pgm.s, HCPhys, ppv);
+    pgmR0DynMapHCPageInlined(&pVM->pgm.s, HCPhys, ppv);
 #else
-    int rc = PGMDynMapHCPage(pVM, HCPhys, ppv);
+    PGMDynMapHCPage(pVM, HCPhys, ppv);
 #endif
-    if (RT_SUCCESS(rc))
-        *ppv = (void *)((uintptr_t)*ppv | (GCPhys & PAGE_OFFSET_MASK));
-    return rc;
+    *ppv = (void *)((uintptr_t)*ppv | (GCPhys & PAGE_OFFSET_MASK));
+    return VINF_SUCCESS;
 }
 
@@ -1971 +1971 @@
  * reused after 8 mappings (or perhaps a few more if you score with the cache).
  *
- * @returns VBox status.
+ * @returns VINF_SUCCESS, will bail out to ring-3 on failure.
  * @param   pVM         VM handle.
  * @param   HCPhys      HC Physical address of the page.

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

@@ -501 +501 @@
     Assert(HCPhys != pVM->pgm.s.HCPhysZeroPg);
 # ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-    return pgmR0DynMapHCPageInlined(&pVM->pgm.s, HCPhys, ppv);
+    pgmR0DynMapHCPageInlined(&pVM->pgm.s, HCPhys, ppv);
 # else
-    return PGMDynMapHCPage(pVM, HCPhys, ppv);
+    PGMDynMapHCPage(pVM, HCPhys, ppv);
 # endif
+    return VINF_SUCCESS;
 
 #else /* IN_RING3 || IN_RING0 */

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

@@ -910 +910 @@
      * write situation, meaning that it's safe to write here.
      */
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+    PVMCPU      pVCpu = VMMGetCpu(pPool->CTX_SUFF(pVM));
+#endif
     RTGCUINTPTR pu32 = (RTGCUINTPTR)pvFault;
     while (pRegFrame->ecx)
     {
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+        uint32_t iPrevSubset = PGMDynMapPushAutoSubset(pVCpu);
         pgmPoolMonitorChainChanging(pPool, pPage, GCPhysFault, (RTGCPTR)pu32, NULL);
+        PGMDynMapPopAutoSubset(pVCpu, iPrevSubset);
+#else
+        pgmPoolMonitorChainChanging(pPool, pPage, GCPhysFault, (RTGCPTR)pu32, NULL);
+#endif
 #ifdef IN_RC
         *(uint32_t *)pu32 = pRegFrame->eax;
@@ -959 +968 @@
      * Clear all the pages. ASSUMES that pvFault is readable.
      */
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+    PVMCPU      pVCpu = VMMGetCpu(pPool->CTX_SUFF(pVM));
+    uint32_t    iPrevSubset = PGMDynMapPushAutoSubset(pVCpu);
     pgmPoolMonitorChainChanging(pPool, pPage, GCPhysFault, pvFault, pCpu);
+    PGMDynMapPopAutoSubset(pVCpu, iPrevSubset);
+#else
+    pgmPoolMonitorChainChanging(pPool, pPage, GCPhysFault, pvFault, pCpu);
+#endif
 
     /*