Changeset 30500 in vbox

Timestamp:

Jun 29, 2010 1:20:37 PM (15 years ago)

Author:

vboxsync

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

63192

Message:

More fixes

Location:

trunk/src/VBox/VMM/PATM

Files:

• CSAM.cpp (modified) (13 diffs)
• CSAMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/PATM/CSAM.cpp

@@ -673 +673 @@
  * @param   pCacheRec   Address conversion cache record
  * @param   pGCPtr      Guest context pointer
- * @param   pLock       Where to store the lock information that PGMPhysReleasePageMappingLock needs.
  * @returns             Host context pointer or NULL in case of an error
  *
  */
-static R3PTRTYPE(void *) CSAMGCVirtToHCVirt(PVM pVM, PCSAMP2GLOOKUPREC pCacheRec, RCPTRTYPE(uint8_t *) pGCPtr, PPGMPAGEMAPLOCK pLock)
+static R3PTRTYPE(void *) CSAMGCVirtToHCVirt(PVM pVM, PCSAMP2GLOOKUPREC pCacheRec, RCPTRTYPE(uint8_t *) pGCPtr)
 {
     int rc;
@@ -684 +683 @@
     PVMCPU pVCpu = VMMGetCpu0(pVM);
 
-    pLock->pvMap = NULL;    /* invalidate it in case we don't call PGMPhysGCPtr2CCPtrReadOnly */
     STAM_PROFILE_START(&pVM->csam.s.StatTimeAddrConv, a);
 
     pHCPtr = PATMR3GCPtrToHCPtr(pVM, pGCPtr);
-    if (pHCPtr) return pHCPtr;
+    if (pHCPtr) 
+        return pHCPtr;
 
     if (pCacheRec->pPageLocStartHC)
@@ -700 +699 @@
     }
 
-    rc = PGMPhysGCPtr2CCPtrReadOnly(pVCpu, pGCPtr, (const void **)&pHCPtr, pLock);
+    /* Release previous lock if any. */
+    if (pCacheRec->Lock.pvMap)
+    {
+        PGMPhysReleasePageMappingLock(pVM, &pCacheRec->Lock);
+        pCacheRec->Lock.pvMap = NULL;
+    }
+
+    rc = PGMPhysGCPtr2CCPtrReadOnly(pVCpu, pGCPtr, (const void **)&pHCPtr, &pCacheRec->Lock);
     if (rc != VINF_SUCCESS)
     {
@@ -863 +869 @@
             cbInstr     += opsize;
 
-            {
-                PGMPAGEMAPLOCK PageLock;
+            {   /* Force pCurInstrHC out of scope after we stop using it (page lock!) */
                 uint8_t       *pCurInstrHC = 0;
-                pCurInstrHC = (uint8_t *)CSAMGCVirtToHCVirt(pVM, pCacheRec, pCurInstrGC, &PageLock);
+                pCurInstrHC = (uint8_t *)CSAMGCVirtToHCVirt(pVM, pCacheRec, pCurInstrGC);
                 if (pCurInstrHC == NULL)
                 {
@@ -876 +881 @@
                 cpu.mode = (fCode32) ? CPUMODE_32BIT : CPUMODE_16BIT;
                 rc = CSAMR3DISInstr(pVM, &cpu, pCurInstrGC, pCurInstrHC, &opsize, NULL);
-                if (PageLock.pvMap)
-                    PGMPhysReleasePageMappingLock(pVM, &PageLock);
             }
             AssertRC(rc);
@@ -1259 +1262 @@
         }
 
-        {
-            PGMPAGEMAPLOCK PageLock;
-            uint8_t *pCurInstrHC = (uint8_t *)CSAMGCVirtToHCVirt(pVM, pCacheRec, pCurInstrGC, &PageLock);
+        {   /* Force pCurInstrHC out of scope after we stop using it (page lock!) */
+            uint8_t *pCurInstrHC = (uint8_t *)CSAMGCVirtToHCVirt(pVM, pCacheRec, pCurInstrGC);
             if (pCurInstrHC == NULL)
             {
@@ -1279 +1281 @@
 #endif
             STAM_PROFILE_STOP(&pVM->csam.s.StatTimeDisasm, a);
-            if (PageLock.pvMap)
-                PGMPhysReleasePageMappingLock(pVM, &PageLock);
         }
         if (RT_FAILURE(rc2))
@@ -2297 +2297 @@
     if (CSAMIsEnabled(pVM))
     {
-        // Cache record for PATMGCVirtToHCVirt
+        /* Cache record for CSAMGCVirtToHCVirt */
         CSAMP2GLOOKUPREC cacheRec;
         RT_ZERO(cacheRec);
@@ -2304 +2304 @@
         rc = csamAnalyseCallCodeStream(pVM, pInstrGC, pInstrGC, true /* 32 bits code */, CSAMR3AnalyseCallback, pPage, &cacheRec);
         STAM_PROFILE_STOP(&pVM->csam.s.StatTime, a);
+        if (cacheRec.Lock.pvMap)
+            PGMPhysReleasePageMappingLock(pVM, &cacheRec.Lock);
+
         if (rc != VINF_SUCCESS)
         {
@@ -2457 +2460 @@
             {
                 PCSAMPAGE pPage = NULL;
-                CSAMP2GLOOKUPREC cacheRec;                  /* Cache record for PATMGCVirtToHCVirt. */
+                CSAMP2GLOOKUPREC cacheRec;                  /* Cache record for CSAMGCVirtToHCVirt. */
                 RT_ZERO(cacheRec);
 
@@ -2464 +2467 @@
                 rc = csamAnalyseCodeStream(pVM, pHandler, pHandler, true, CSAMR3AnalyseCallback, pPage, &cacheRec);
                 STAM_PROFILE_STOP(&pVM->csam.s.StatTime, a);
+                if (cacheRec.Lock.pvMap)
+                    PGMPhysReleasePageMappingLock(pVM, &cacheRec.Lock);
+
                 if (rc != VINF_SUCCESS)
                 {
@@ -2511 +2517 @@
             PCSAMPAGE pPage = NULL;
             DBGFSELINFO selInfo;
-            CSAMP2GLOOKUPREC cacheRec;                  /* Cache record for PATMGCVirtToHCVirt. */
+            CSAMP2GLOOKUPREC cacheRec;                  /* Cache record for CSAMGCVirtToHCVirt. */
             RT_ZERO(cacheRec);
 
@@ -2542 +2548 @@
             rc = csamAnalyseCodeStream(pVM, pHandler, pHandler, true, CSAMR3AnalyseCallback, pPage, &cacheRec);
             STAM_PROFILE_STOP(&pVM->csam.s.StatTime, b);
+            if (cacheRec.Lock.pvMap)
+                PGMPhysReleasePageMappingLock(pVM, &cacheRec.Lock);
+
             if (rc != VINF_SUCCESS)
             {

trunk/src/VBox/VMM/PATM/CSAMInternal.h

@@ -74 +74 @@
 
     PCSAMCALLEXITREC     pCallExitRec;
+
+    PGMPAGEMAPLOCK       Lock;
 } CSAMP2GLOOKUPREC, *PCSAMP2GLOOKUPREC;