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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PDMAllCritSect.cpp (modified) (4 diffs)
• PDMAllCritSectRw.cpp (modified) (7 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)