Changeset 92204 in vbox for trunk

Timestamp:

Nov 4, 2021 12:51:40 AM (3 years ago)

Author:

vboxsync

Message:

VMM/PDMCritSect: Make it possible for known worker thread to enter critical sections in ring-0. bugref:10093 bugref:6695

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PDMAllCritSect.cpp (modified) (1 diff)
• PDMAllCritSectRw.cpp (modified) (1 diff)

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

@@ -80 +80 @@
     RT_NOREF(pVM, pCritSect);
     RTNATIVETHREAD  hNativeSelf = RTThreadNativeSelf();
-#else
+
+#elif defined(IN_RING0)
     AssertMsgReturn(pCritSect->s.Core.u32Magic == RTCRITSECT_MAGIC, ("%RX32\n", pCritSect->s.Core.u32Magic),
                     NIL_RTNATIVETHREAD);
-    PVMCPUCC        pVCpu       = VMMGetCpu(pVM);                                       AssertPtr(pVCpu);
-    RTNATIVETHREAD  hNativeSelf = pVCpu ? pVCpu->hNativeThread : NIL_RTNATIVETHREAD;    Assert(hNativeSelf != NIL_RTNATIVETHREAD);
+    RTNATIVETHREAD  hNativeSelf = GVMMR0GetRing3ThreadForSelf(pVM);
+    Assert(hNativeSelf != NIL_RTNATIVETHREAD);
+
+#else
+# error "Invalid context"
 #endif
     return hNativeSelf;

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

@@ -154 +154 @@
     RT_NOREF(pVM, pThis);
     RTNATIVETHREAD  hNativeSelf = RTThreadNativeSelf();
-#else
+
+#elif defined(IN_RING0)
     AssertMsgReturn(pThis->s.Core.u32Magic == RTCRITSECTRW_MAGIC, ("%RX32\n", pThis->s.Core.u32Magic),
                     NIL_RTNATIVETHREAD);
-    PVMCPUCC        pVCpu       = VMMGetCpu(pVM); AssertPtr(pVCpu);
-    RTNATIVETHREAD  hNativeSelf = pVCpu ? pVCpu->hNativeThread : NIL_RTNATIVETHREAD;
+    RTNATIVETHREAD  hNativeSelf = GVMMR0GetRing3ThreadForSelf(pVM);
     Assert(hNativeSelf != NIL_RTNATIVETHREAD);
+
+#else
+# error "invalid context"
 #endif
     return hNativeSelf;