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

Timestamp:

Jul 26, 2021 9:01:38 PM (4 years ago)

Author:

vboxsync

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

145912

Message:

VMM: Removed the VM pointers from the internal critsect structures. bugref:9218 bugref:10074

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PDMAllCritSect.cpp (modified) (4 diffs)
• VMMAll/PDMAllCritSectRw.cpp (modified) (7 diffs)
• VMMR0/PDMR0DevHlp.cpp (modified) (1 diff)
• VMMR3/MMHyper.cpp (modified) (1 diff)
• VMMR3/PDM.cpp (modified) (2 diffs)
• VMMR3/PDMCritSect.cpp (modified) (8 diffs)
• VMMR3/PDMDevHlp.cpp (modified) (3 diffs)
• VMMR3/PDMDriver.cpp (modified) (1 diff)
• VMMR3/PDMNetShaper.cpp (modified) (4 diffs)
• VMMR3/PGM.cpp (modified) (2 diffs)
• include/PDMInternal.h (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp ¶

@@ -146 +146 @@
      * The wait loop.
      */
-    PSUPDRVSESSION  pSession    = pCritSect->s.CTX_SUFF(pVM)->pSession;
+    PSUPDRVSESSION  pSession    = pVM->pSession;
     SUPSEMEVENT     hEvent      = (SUPSEMEVENT)pCritSect->s.Core.EventSem;
 # ifdef IN_RING3
@@ -248 +248 @@
         return VINF_SUCCESS;
 
-    Assert(pCritSect->s.CTX_SUFF(pVM) == pVM); RT_NOREF(pVM);
     RTNATIVETHREAD hNativeSelf = pdmCritSectGetNativeSelf(pVM, pCritSect);
     /* ... not owned ... */
@@ -460 +459 @@
         return VINF_SUCCESS;
 
-    Assert(pCritSect->s.CTX_SUFF(pVM) == pVM);
     RTNATIVETHREAD hNativeSelf = pdmCritSectGetNativeSelf(pVM, pCritSect);
     /* ... not owned ... */
@@ -596 +594 @@
      * Always check that the caller is the owner (screw performance).
      */
-    Assert(pCritSect->s.CTX_SUFF(pVM) == pVM); RT_NOREF(pVM);
     RTNATIVETHREAD const hNativeSelf = pdmCritSectGetNativeSelf(pVM, pCritSect);
     AssertReleaseMsgReturn(pCritSect->s.Core.NativeThreadOwner == hNativeSelf,

trunk/src/VBox/VMM/VMMAll/PDMAllCritSectRw.cpp ¶

@@ -127 +127 @@
  * Go back to ring-3 so the kernel can do signals, APCs and other fun things.
  *
- * @param   pThis       Pointer to the read/write critical section.
- */
-static void pdmR0CritSectRwYieldToRing3(PPDMCRITSECTRW pThis)
-{
-    PVMCC     pVM   = pThis->s.CTX_SUFF(pVM);     AssertPtr(pVM);
-    PVMCPUCC  pVCpu = VMMGetCpu(pVM);             AssertPtr(pVCpu);
+ * @param   pVM         The cross context VM structure.
+ */
+static void pdmR0CritSectRwYieldToRing3(PVMCC pVM)
+{
+    PVMCPUCC pVCpu = VMMGetCpu(pVM);
+    AssertPtrReturnVoid(pVCpu);
     int rc = VMMRZCallRing3(pVM, pVCpu, VMMCALLRING3_VM_R0_PREEMPT, NULL);
     AssertRC(rc);
@@ -158 +158 @@
     AssertPtr(pThis);
     AssertReturn(pThis->s.Core.u32Magic == RTCRITSECTRW_MAGIC, VERR_SEM_DESTROYED);
-    Assert(pThis->s.CTX_SUFF(pVM) == pVM);
 
 #if !defined(PDMCRITSECTRW_STRICT) || !defined(IN_RING3)
@@ -302 +301 @@
                                     break;
 # ifdef IN_RING0
-                                pdmR0CritSectRwYieldToRing3(pThis);
+                                pdmR0CritSectRwYieldToRing3(pVM);
 # endif
                             }
@@ -567 +566 @@
     AssertPtr(pThis);
     AssertReturn(pThis->s.Core.u32Magic == RTCRITSECTRW_MAGIC, VERR_SEM_DESTROYED);
-    Assert(pThis->s.CTX_SUFF(pVM) == pVM);
 
 #if !defined(PDMCRITSECTRW_STRICT) || !defined(IN_RING3)
@@ -721 +719 @@
     AssertPtr(pThis);
     AssertReturn(pThis->s.Core.u32Magic == RTCRITSECTRW_MAGIC, VERR_SEM_DESTROYED);
-    Assert(pThis->s.CTX_SUFF(pVM) == pVM);
 
 #if !defined(PDMCRITSECTRW_STRICT) || !defined(IN_RING3)
@@ -873 +870 @@
                             break;
 # ifdef IN_RING0
-                        pdmR0CritSectRwYieldToRing3(pThis);
+                        pdmR0CritSectRwYieldToRing3(pVM);
 # endif
                     }
@@ -1122 +1119 @@
     AssertPtr(pThis);
     AssertReturn(pThis->s.Core.u32Magic == RTCRITSECTRW_MAGIC, VERR_SEM_DESTROYED);
-    Assert(pThis->s.CTX_SUFF(pVM) == pVM);
 
 #if !defined(PDMCRITSECTRW_STRICT) || !defined(IN_RING3)

trunk/src/VBox/VMM/VMMR0/PDMR0DevHlp.cpp ¶

@@ -845 +845 @@
     AssertReturn(PDMCritSectIsInitialized(pCritSect), VERR_INVALID_PARAMETER);
     PGVM pGVM = pDevIns->Internal.s.pGVM;
-    AssertReturn(pCritSect->s.pVMR0 == pGVM, VERR_INVALID_PARAMETER);
 
     VM_ASSERT_EMT(pGVM);

trunk/src/VBox/VMM/VMMR3/MMHyper.cpp ¶

@@ -215 +215 @@
 {
     if (pVM->mm.s.pHyperHeapR3)
-        PDMR3CritSectDelete(&pVM->mm.s.pHyperHeapR3->Lock);
+        PDMR3CritSectDelete(pVM, &pVM->mm.s.pHyperHeapR3->Lock);
 
     return VINF_SUCCESS;

trunk/src/VBox/VMM/VMMR3/PDM.cpp ¶

@@ -585 +585 @@
 
     /*
-     * Critical sections.
-     */
-    pdmR3CritSectBothRelocate(pVM);
-
-    /*
      * The registered PIC.
      */
@@ -894 +889 @@
      * Destroy the PDM lock.
      */
-    PDMR3CritSectDelete(&pVM->pdm.s.CritSect);
+    PDMR3CritSectDelete(pVM, &pVM->pdm.s.CritSect);
     /* The MiscCritSect is deleted by PDMR3CritSectBothTerm later. */
 

trunk/src/VBox/VMM/VMMR3/PDMCritSect.cpp ¶

@@ -58 +58 @@
              "Number of times a critical section leave request needed to be queued for ring-3 execution.");
     return VINF_SUCCESS;
-}
-
-
-/**
- * Relocates all the critical sections.
- *
- * @param   pVM         The cross context VM structure.
- */
-void pdmR3CritSectBothRelocate(PVM pVM)
-{
-    PUVM pUVM = pVM->pUVM;
-    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
-
-    for (PPDMCRITSECTINT pCur = pUVM->pdm.s.pCritSects;
-         pCur;
-         pCur = pCur->pNext)
-        pCur->pVMRC = pVM->pVMRC;
-
-    for (PPDMCRITSECTRWINT pCur = pUVM->pdm.s.pRwCritSects;
-         pCur;
-         pCur = pCur->pNext)
-        pCur->pVMRC = pVM->pVMRC;
-
-    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
 }
 
@@ -182 +158 @@
                 pCritSect->Core.cLockers             = -1;
                 pCritSect->Core.NativeThreadOwner    = NIL_RTNATIVETHREAD;
-                pCritSect->pVMR3                     = pVM;
-                pCritSect->pVMR0                     = pVM->pVMR0ForCall;
-                pCritSect->pVMRC                     = pVM->pVMRC;
                 pCritSect->pvKey                     = pvKey;
                 pCritSect->fAutomaticDefaultCritsect = false;
@@ -279 +252 @@
                     pCritSect->Core.HCPtrPadding         = NIL_RTHCPTR;
 #endif
-                    pCritSect->pVMR3                     = pVM;
-                    pCritSect->pVMR0                     = pVM->pVMR0ForCall;
-                    pCritSect->pVMRC                     = pVM->pVMRC;
                     pCritSect->pvKey                     = pvKey;
                     pCritSect->pszName                   = pszName;
@@ -534 +504 @@
     pCritSect->pNext   = NULL;
     pCritSect->pvKey   = NULL;
-    pCritSect->pVMR3   = NULL;
-    pCritSect->pVMR0   = NIL_RTR0PTR;
-    pCritSect->pVMRC   = NIL_RTRCPTR;
     if (!fFinal)
         STAMR3DeregisterF(pVM->pUVM, "/PDM/CritSects/%s/*", pCritSect->pszName);
@@ -605 +572 @@
     pCritSect->pNext   = NULL;
     pCritSect->pvKey   = NULL;
-    pCritSect->pVMR3   = NULL;
-    pCritSect->pVMR0   = NIL_RTR0PTR;
-    pCritSect->pVMRC   = NIL_RTRCPTR;
     if (!fFinal)
         STAMR3DeregisterF(pVM->pUVM, "/PDM/CritSectsRw/%s/*", pCritSect->pszName);
@@ -731 +695 @@
  *
  * @returns VBox status code.
- * @param   pCritSect           The PDM critical section to destroy.
- */
-VMMR3DECL(int) PDMR3CritSectDelete(PPDMCRITSECT pCritSect)
+ * @param   pVM         The cross context VM structure.
+ * @param   pCritSect   The PDM critical section to destroy.
+ */
+VMMR3DECL(int) PDMR3CritSectDelete(PVM pVM, PPDMCRITSECT pCritSect)
 {
     if (!RTCritSectIsInitialized(&pCritSect->s.Core))
@@ -741 +706 @@
      * Find and unlink it.
      */
-    PVM             pVM   = pCritSect->s.pVMR3;
     PUVM            pUVM  = pVM->pUVM;
     AssertReleaseReturn(pVM, VERR_PDM_CRITSECT_IPE);
@@ -781 +745 @@
      * Find and unlink it.
      */
-    Assert(pCritSect->s.pVMR3 == pVM);
     PUVM                pUVM  = pVM->pUVM;
     AssertReleaseReturn(pVM, VERR_PDM_CRITSECT_IPE);

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp ¶

@@ -2737 +2737 @@
     AssertReturn(PDMCritSectIsInitialized(pCritSect), VERR_INVALID_PARAMETER);
     PVM pVM = pDevIns->Internal.s.pVMR3;
-    AssertReturn(pCritSect->s.pVMR3 == pVM, VERR_INVALID_PARAMETER);
 
     VM_ASSERT_EMT(pVM);
@@ -2768 +2767 @@
     }
 
-    PDMR3CritSectDelete(pOldCritSect);
+    PDMR3CritSectDelete(pVM, pOldCritSect);
     Assert((uintptr_t)pOldCritSect - (uintptr_t)pDevIns < pDevIns->cbRing3);
 
@@ -2872 +2871 @@
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
-    RT_NOREF(pDevIns);
-    return PDMR3CritSectDelete(pCritSect);
+    return PDMR3CritSectDelete(pDevIns->Internal.s.pVMR3, pCritSect);
 }
 

trunk/src/VBox/VMM/VMMR3/PDMDriver.cpp ¶

@@ -1909 +1909 @@
 {
     PDMDRV_ASSERT_DRVINS(pDrvIns);
-    RT_NOREF(pDrvIns);
-    return PDMR3CritSectDelete(pCritSect);
+    return PDMR3CritSectDelete(pDrvIns->Internal.s.pVMR3, pCritSect);
 }
 

trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp ¶

@@ -153 +153 @@
     if (!pBwGroup)
     {
-        rc = MMHyperAlloc(pShaper->pVM, sizeof(PDMNSBWGROUP), 64,
-                          MM_TAG_PDM_NET_SHAPER, (void **)&pBwGroup);
+        PVM const pVM = pShaper->pVM;
+        rc = MMHyperAlloc(pVM, sizeof(PDMNSBWGROUP), 64, MM_TAG_PDM_NET_SHAPER, (void **)&pBwGroup);
         if (RT_SUCCESS(rc))
         {
-            rc = PDMR3CritSectInit(pShaper->pVM, &pBwGroup->Lock, RT_SRC_POS, "BWGRP-%s", pszBwGroup);
+            rc = PDMR3CritSectInit(pVM, &pBwGroup->Lock, RT_SRC_POS, "BWGRP-%s", pszBwGroup);
             if (RT_SUCCESS(rc))
             {
-                pBwGroup->pszNameR3 = MMR3HeapStrDup(pShaper->pVM, MM_TAG_PDM_NET_SHAPER, pszBwGroup);
+                pBwGroup->pszNameR3 = MMR3HeapStrDup(pVM, MM_TAG_PDM_NET_SHAPER, pszBwGroup);
                 if (pBwGroup->pszNameR3)
                 {
@@ -176 +176 @@
                     return VINF_SUCCESS;
                 }
-                PDMR3CritSectDelete(&pBwGroup->Lock);
+                PDMR3CritSectDelete(pVM, &pBwGroup->Lock);
             }
-            MMHyperFree(pShaper->pVM, pBwGroup);
+            MMHyperFree(pVM, pBwGroup);
         }
         else
@@ -191 +191 @@
 
 
-static void pdmNsBwGroupTerminate(PPDMNSBWGROUP pBwGroup)
+static void pdmNsBwGroupTerminate(PVM pVM, PPDMNSBWGROUP pBwGroup)
 {
     Assert(pBwGroup->cRefs == 0);
     if (PDMCritSectIsInitialized(&pBwGroup->Lock))
-        PDMR3CritSectDelete(&pBwGroup->Lock);
+        PDMR3CritSectDelete(pVM, &pBwGroup->Lock);
 }
 
@@ -469 +469 @@
         PPDMNSBWGROUP pFree = pBwGroup;
         pBwGroup = pBwGroup->pNextR3;
-        pdmNsBwGroupTerminate(pFree);
+        pdmNsBwGroupTerminate(pVM, pFree);
         MMR3HeapFree(pFree->pszNameR3);
         MMHyperFree(pVM, pFree);

trunk/src/VBox/VMM/VMMR3/PGM.cpp ¶

@@ -1064 +1064 @@
 
     /* Almost no cleanup necessary, MM frees all memory. */
-    PDMR3CritSectDelete(&pVM->pgm.s.CritSectX);
+    PDMR3CritSectDelete(pVM, &pVM->pgm.s.CritSectX);
 
     return rc;
@@ -2139 +2139 @@
 
     PGMDeregisterStringFormatTypes();
-    return PDMR3CritSectDelete(&pVM->pgm.s.CritSectX);
+    return PDMR3CritSectDelete(pVM, &pVM->pgm.s.CritSectX);
 }
 

trunk/src/VBox/VMM/include/PDMInternal.h ¶

@@ -423 +423 @@
      * PDMR3CritSectInit() sets this to point to the critsect itself. */
     RTR3PTR                         pvKey;
-    /** Pointer to the VM - R3Ptr. */
-    PVMR3                           pVMR3;
-    /** Pointer to the VM - R0Ptr. */
-    R0PTRTYPE(PVMCC)                pVMR0;
-    /** Pointer to the VM - GCPtr. */
-    PVMRC                           pVMRC;
     /** Set if this critical section is the automatically created default
      * section of a device. */
@@ -436 +430 @@
     bool                            fUsedByTimerOrSimilar;
     /** Alignment padding. */
-    bool                            afPadding[2];
+    bool                            afPadding[2+4];
     /** Support driver event semaphore that is scheduled to be signaled upon leaving
      * the critical section. This is only for Ring-3 and Ring-0. */
@@ -476 +470 @@
      * PDMR3CritSectInit() sets this to point to the critsect itself. */
     RTR3PTR                             pvKey;
-    /** Pointer to the VM - R3Ptr. */
-    PVMR3                               pVMR3;
-    /** Pointer to the VM - R0Ptr. */
-    R0PTRTYPE(PVMCC)                    pVMR0;
-    /** Pointer to the VM - GCPtr. */
-    PVMRC                               pVMRC;
-#if HC_ARCH_BITS == 64
-    /** Alignment padding. */
-    RTRCPTR                             RCPtrPadding;
-#endif
     /** The lock name. */
     R3PTRTYPE(const char *)             pszName;
@@ -1615 +1599 @@
 
 int         pdmR3CritSectBothInitStats(PVM pVM);
-void        pdmR3CritSectBothRelocate(PVM pVM);
 int         pdmR3CritSectBothDeleteDevice(PVM pVM, PPDMDEVINS pDevIns);
 int         pdmR3CritSectBothDeleteDriver(PVM pVM, PPDMDRVINS pDrvIns);