Changeset 54358 in vbox

Timestamp:

Feb 22, 2015 11:29:25 PM (10 years ago)

Author:

vboxsync

Message:

IPRT/R0Drv: Fix (windows & solaris) / kludge (the rest) for thread termination racing IPRT termination race in ring-0.

Location:

trunk/src/VBox/Runtime

Files:

• common/misc/thread.cpp (modified) (4 diffs)
• include/internal/thread.h (modified) (1 diff)
• r0drv/darwin/thread2-r0drv-darwin.cpp (modified) (1 diff)
• r0drv/freebsd/thread2-r0drv-freebsd.c (modified) (1 diff)
• r0drv/haiku/thread2-r0drv-haiku.c (modified) (5 diffs)
• r0drv/linux/thread2-r0drv-linux.c (modified) (1 diff)
• r0drv/nt/thread2-r0drv-nt.cpp (modified) (1 diff)
• r0drv/os2/thread2-r0drv-os2.cpp (modified) (1 diff)
• r0drv/solaris/thread2-r0drv-solaris.c (modified) (1 diff)

trunk/src/VBox/Runtime/common/misc/thread.cpp

@@ -74 +74 @@
 *******************************************************************************/
 /** The AVL thread containing the threads. */
-static PAVLPVNODECORE   g_ThreadTree;
+static PAVLPVNODECORE       g_ThreadTree;
+/** The number of threads in the tree (for ring-0 termination kludge). */
+static uint32_t volatile    g_cThreadInTree;
 #ifdef IN_RING3
 /** The RW lock protecting the tree. */
@@ -455 +457 @@
                 fRc = RTAvlPVInsert(&g_ThreadTree, &pThread->Core);
                 ASMAtomicOrU32(&pThread->fIntFlags, RTTHREADINT_FLAG_IN_TREE);
+                if (fRc)
+                    ASMAtomicIncU32(&g_cThreadInTree);
 
                 AssertReleaseMsg(fRc, ("Lock problem? %p (%RTnthrd) %s\n", pThread, NativeThread, pThread->szName));
@@ -479 +483 @@
                                     pThread, pThread->Core.Key, pThread->szName));
 #endif
-    NOREF(pThread2);
+    if (pThread2)
+        ASMAtomicDecU32(&g_cThreadInTree);
 }
 
@@ -1176 +1181 @@
                      */
                     if (ASMAtomicBitTestAndClear(&pThread->fFlags, RTTHREADFLAGS_WAITABLE_BIT))
+                    {
                         rtThreadRelease(pThread);
+#ifdef IN_RING0
+                        /*
+                         * IPRT termination kludge. Call native code to make sure
+                         * the last thread is really out of IPRT to prevent it from
+                         * crashing after we destroyed the spinlock in rtThreadTerm.
+                         */
+                        if (   ASMAtomicReadU32(&g_cThreadInTree) == 1
+                            && ASMAtomicReadU32(&pThread->cRefs) > 1)
+                            rtThreadNativeWaitKludge(pThread);
+#endif
+                    }
                 }
             }

trunk/src/VBox/Runtime/include/internal/thread.h

@@ -176 +176 @@
 DECLHIDDEN(void) rtThreadNativeDestroy(PRTTHREADINT pThread);
 
+#ifdef IN_RING0
+/**
+ * Called from rtThreadWait when the last thread has completed in order to make
+ * sure it's all the way out of IPRT before RTR0Term is called.
+ *
+ * @param   pThread     The thread structure.
+ */
+DECLHIDDEN(void) rtThreadNativeWaitKludge(PRTTHREADINT pThread);
+#endif
+
+
 /**
  * Sets the priority of the thread according to the thread type

trunk/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp

@@ -137 +137 @@
 
 
+DECLHIDDEN(void) rtThreadNativeWaitKludge(PRTTHREADINT pThread)
+{
+    /** @todo fix RTThreadWait/RTR0Term race on darwin. */
+    RTThreadSleep(1);
+}
+
+
 DECLHIDDEN(void) rtThreadNativeDestroy(PRTTHREADINT pThread)
 {

trunk/src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c

@@ -99 +99 @@
 
 
+DECLHIDDEN(void) rtThreadNativeWaitKludge(PRTTHREADINT pThread)
+{
+    /** @todo fix RTThreadWait/RTR0Term race on freebsd. */
+    RTThreadSleep(1);
+}
+
+
 DECLHIDDEN(void) rtThreadNativeDestroy(PRTTHREADINT pThread)
 {

trunk/src/VBox/Runtime/r0drv/haiku/thread2-r0drv-haiku.c

@@ -41 +41 @@
 
 
-int rtThreadNativeInit(void)
+DECLHIDDEN(int) rtThreadNativeInit(void)
 {
     /* No TLS in Ring-0. :-/ */
@@ -54 +54 @@
 
 
-int rtThreadNativeSetPriority(PRTTHREADINT pThread, RTTHREADTYPE enmType)
+DECLHIDDEN(int) rtThreadNativeSetPriority(PRTTHREADINT pThread, RTTHREADTYPE enmType)
 {
     int32 iPriority;
@@ -82 +82 @@
 
 
-int rtThreadNativeAdopt(PRTTHREADINT pThread)
+DECLHIDDEN(int) rtThreadNativeAdopt(PRTTHREADINT pThread)
 {
     return VERR_NOT_IMPLEMENTED;
@@ -88 +88 @@
 
 
-void rtThreadNativeDestroy(PRTTHREADINT pThread)
+DECLHIDDEN(void) rtThreadNativeWaitKludge(PRTTHREADINT pThread)
+{
+    /** @todo fix RTThreadWait/RTR0Term race on freebsd. */
+    RTThreadSleep(1);
+}
+
+
+DECLHIDDEN(void) rtThreadNativeDestroy(PRTTHREADINT pThread)
 {
     NOREF(pThread);
@@ -115 +122 @@
 
 
-int rtThreadNativeCreate(PRTTHREADINT pThreadInt, PRTNATIVETHREAD pNativeThread)
+DECLHIDDEN(int) rtThreadNativeCreate(PRTTHREADINT pThreadInt, PRTNATIVETHREAD pNativeThread)
 {
     thread_id NativeThread;

trunk/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c

@@ -103 +103 @@
 
 
+DECLHIDDEN(void) rtThreadNativeWaitKludge(PRTTHREADINT pThread)
+{
+    /** @todo fix RTThreadWait/RTR0Term race on linux. */
+    RTThreadSleep(1); NOREF(pThread);
+}
+
+
 DECLHIDDEN(void) rtThreadNativeDestroy(PRTTHREADINT pThread)
 {

trunk/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp

@@ -88 +88 @@
 
 
+DECLHIDDEN(void) rtThreadNativeWaitKludge(PRTTHREADINT pThread)
+{
+    PVOID pvThreadObj = pThread->Core.Key;
+    NTSTATUS rcNt = KeWaitForSingleObject(pvThreadObj, Executive, KernelMode, FALSE, NULL);
+    AssertMsg(rcNt == STATUS_SUCCESS, ("rcNt=%#x\n", rcNt));
+}
+
+
 DECLHIDDEN(void) rtThreadNativeDestroy(PRTTHREADINT pThread)
 {

trunk/src/VBox/Runtime/r0drv/os2/thread2-r0drv-os2.cpp

@@ -65 +65 @@
 }
 
+DECLHIDDEN(void) rtThreadNativeWaitKludge(PRTTHREADINT pThread)
+{
+    NOREF(pThread);
+}
+
 
 DECLHIDDEN(void) rtThreadNativeDestroy(PRTTHREADINT pThread)

trunk/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c

@@ -86 +86 @@
 
 
+DECLHIDDEN(void) rtThreadNativeWaitKludge(PRTTHREADINT pThread)
+{
+    kthread_t *pThread = (kthread_t *)pThread->Core.Key;
+    thread_join(pThread);
+}
+
+
 DECLHIDDEN(void) rtThreadNativeDestroy(PRTTHREADINT pThread)
 {