Changeset 4692 in vbox

Timestamp:

Sep 11, 2007 9:53:55 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

24353

Message:

Changed API for converting guest memory into CCPtrs.

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMAll/TRPMAll.cpp (modified) (2 diffs)

trunk/include/VBox/pgm.h

@@ -784 +784 @@
 
 /** 
+ * Page mapping lock.
+ * 
+ * @remarks This doesn't work in structures shared between 
+ *          ring-3, ring-0 and/or GC.
+ */
+typedef struct PGMPAGEMAPLOCK
+{
+#ifdef IN_GC
+    /** Just a dummy for the time being. */
+    uint32_t    u32Dummy;
+#else
+    /** Just a dummy for the time being. */
+    uint32_t    u32Dummy;
+#endif
+} PGMPAGEMAPLOCK;
+/** Pointer to a page mapping lock. */
+typedef PGMPAGEMAPLOCK *PPGMPAGEMAPLOCK;
+
+/**
  * Requests the mapping of a guest page into the current context.
- * 
+ *
  * This API should only be used for very short term, as it will consume
- * scarse resources (R0 and GC) in the mapping cache. When you're done 
- * with the page, call PGMPhysGCPhys2CCPtrRelease() ASAP to release it.
- * 
+ * scarse resources (R0 and GC) in the mapping cache. When you're done
+ * with the page, call PGMPhysReleasePageMappingLock() ASAP to release it.
+ *
  * @returns VBox status code.
  * @retval  VINF_SUCCESS on success.
  * @retval  VERR_PGM_PHYS_PAGE_RESERVED it it's a valid page but has no physical backing.
  * @retval  VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS if it's not a valid physical address.
- * 
+ *
  * @param   pVM         The VM handle.
  * @param   GCPhys      The guest physical address of the page that should be mapped.
  * @param   ppv         Where to store the address corresponding to GCPhys.
- * 
- * @remark  Avoid calling this API from within critical sections (other than 
+ * @param   pLock       Where to store the lock information that PGMPhysReleasePageMappingLock needs.
+ *
+ * @remark  Avoid calling this API from within critical sections (other than
  *          the PGM one) because of the deadlock risk.
  */
-PGMDECL(int) PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv);
-
-/** 
+PGMDECL(int) PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv, PPGMPAGEMAPLOCK pLock);
+
+/**
  * Release the mapping of a guest page.
  * 
- * This is the counterpart to the PGMPhysGCPhys2CCPtr.
- * 
+ * This is the counter part of PGMPhysGCPhys2CCPtr.
+ *
  * @param   pVM         The VM handle.
- * @param   GCPhys      The address that was mapped using PGMPhysGCPhys2CCPtr.
- * @param   pv          The address that PGMPhysGCPhys2CCPtr returned.
- */
-PGMDECL(void) PGMPhysGCPhys2CCPtrRelease(PVM pVM, RTGCPHYS GCPhys, void *pv);
+ * @param   pLock       The lock structure initialized by the mapping function.
+ */
+PGMDECL(void) PGMPhysReleasePageMappingLock(PVM pVM, PPGMPAGEMAPLOCK pLock);
 
 /**

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

@@ -378 +378 @@
  * This API should only be used for very short term, as it will consume
  * scarse resources (R0 and GC) in the mapping cache. When you're done
- * with the page, call PGMPhysGCPhys2CCPtrRelease() ASAP to release it.
+ * with the page, call PGMPhysReleasePageMappingLock() ASAP to release it.
  *
  * @returns VBox status code.
@@ -388 +388 @@
  * @param   GCPhys      The guest physical address of the page that should be mapped.
  * @param   ppv         Where to store the address corresponding to GCPhys.
+ * @param   pLock       Where to store the lock information that PGMPhysReleasePageMappingLock needs.
  *
  * @remark  Avoid calling this API from within critical sections (other than
  *          the PGM one) because of the deadlock risk.
  */
-PGMDECL(int) PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv)
+PGMDECL(int) PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv, PPGMPAGEMAPLOCK pLock)
 {
 # ifdef NEW_PHYS_CODE
@@ -455 +456 @@
 /**
  * Release the mapping of a guest page.
- *
- * This is the counterpart to the PGMPhysGCPhys2CCPtr.
+ * 
+ * This is the counter part of PGMPhysGCPhys2CCPtr.
  *
  * @param   pVM         The VM handle.
- * @param   GCPhys      The address that was mapped using PGMPhysGCPhys2CCPtr.
- * @param   pv          The address that PGMPhysGCPhys2CCPtr returned.
- */
-PGMDECL(void) PGMPhysGCPhys2CCPtrRelease(PVM pVM, RTGCPHYS GCPhys, void *pv)
+ * @param   pLock       The lock structure initialized by the mapping function.
+ */
+PGMDECL(void) PGMPhysReleasePageMappingLock(PVM pVM, PPGMPAGEMAPLOCK pLock)
 {
 #ifdef NEW_PHYS_CODE
@@ -536 +536 @@
 #else
     NOREF(pVM);
-    NOREF(GCPhys);
-    NOREF(pv);
+    NOREF(pLock);
 #endif
 }

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

@@ -592 +592 @@
                     goto failure;
 
+                /** @todo add PGMPhysGCPtr2CCPtr */
+                PGMPAGEMAPLOCK PageMappingLock;
                 RTGCPHYS GCPhysStack;
                 rc = PGMPhysGCPtr2GCPhys(pVM, pTrapStackGC, &GCPhysStack);
                 if (VBOX_SUCCESS(rc))
-                    rc = PGMPhysGCPhys2CCPtr(pVM, GCPhysStack, (void **)&pTrapStack);
+                    rc = PGMPhysGCPhys2CCPtr(pVM, GCPhysStack, (void **)&pTrapStack, &PageMappingLock);
                 if (VBOX_FAILURE(rc))
                 {
@@ -710 +712 @@
                     pRegFrame->ss         = ss_r0 & ~X86_SEL_RPL;     /* set rpl to ring 0 */
                     STAM_PROFILE_ADV_STOP(CTXSUFF(&pVM->trpm.s.StatForwardProf), a);
-                    PGMPhysGCPhys2CCPtrRelease(pVM, GCPhysStack, pTrapStack);
+                    PGMPhysReleasePageMappingLock(pVM, &PageMappingLock);
                     return VINF_SUCCESS;
 #endif