Changeset 22038 in vbox for trunk/src/VBox

Timestamp:

Aug 6, 2009 4:27:13 PM (15 years ago)

Author:

vboxsync

Message:

semspinmutex-r0drv-generic.c: Return VERR_SEM_BAD_CONTEXT if interrupts are disabled when on solaris and in the default case (see #4147).

File:

• trunk/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c

@@ -184 +184 @@
     }
 
-#elif defined(RT_OS_LINUX) || defined(RT_OS_OS2) || defined(RT_OS_SOLARIS)
-    /*
-     * OSes on which RTSemEventSignal can be called from any context.
-     */
+#elif defined(RT_OS_SOLARIS)
+    /*
+     * Solaris:  RTSemEventSignal will do bad stuff on S10 if interrupts are disabled.
+     */
+    if (!ASMIntAreEnabled())
+        return VERR_SEM_BAD_CONTEXT;
+
     pState->fSpin = !RTThreadPreemptIsEnabled(NIL_RTTHREAD);
     if (RTThreadIsInInterrupt(NIL_RTTHREAD))
@@ -198 +201 @@
     RTThreadPreemptDisable(&pState->PreemptState);
 
+#elif defined(RT_OS_LINUX) || defined(RT_OS_OS2)
+    /*
+     * OSes on which RTSemEventSignal can be called from any context.
+     */
+    pState->fSpin = !RTThreadPreemptIsEnabled(NIL_RTTHREAD);
+    if (RTThreadIsInInterrupt(NIL_RTTHREAD))
+    {
+        if (!(pThis->fFlags & RTSEMSPINMUTEX_FLAGS_IRQ_SAFE))
+            rc = VINF_SEM_BAD_CONTEXT; /* Try, but owner might be interrupted. */
+        pState->fSpin = true;
+    }
+    pState->PreemptState = StateInit;
+    RTThreadPreemptDisable(&pState->PreemptState);
+
 #else /* PORTME: Check for context where we cannot wake up threads. */
     /*
-     * Default: ASSUME thread can be woken up from all context except interrupt.
+     * Default: ASSUME thread can be woken up if interrupts are enabled and
+     *          we're not in an interrupt context.
      *          ASSUME that we can go to sleep if preemption is enabled.
      */
-    if (RTThreadIsInInterrupt(NIL_RTTHREAD))
+    if (    RTThreadIsInInterrupt(NIL_RTTHREAD)
+        ||  !ASMIntAreEnabled())
         return VERR_SEM_BAD_CONTEXT;
+
     pState->fSpin = !RTThreadPreemptIsEnabled(NIL_RTTHREAD);
     pState->PreemptState = StateInit;