Changeset 76055 in vbox for trunk/src

Timestamp:

Dec 7, 2018 1:04:00 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/semevent*-r0drv-darwin.cpp: Must disable interrupts prior to taking the spinlock or the code won't be suitable for interrupt context (there was a todo to this affect).

Location:

trunk/src/VBox/Runtime/r0drv/darwin

Files:

• semevent-r0drv-darwin.cpp (modified) (6 diffs)
• semeventmulti-r0drv-darwin.cpp (modified) (8 diffs)

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

@@ -170 +170 @@
     IPRT_DARWIN_SAVE_EFL_AC();
 
+    RTCCUINTREG const fIntSaved = ASMIntDisableFlags();
     lck_spin_lock(pThis->pSpinlock);
 
@@ -184 +185 @@
 
     lck_spin_unlock(pThis->pSpinlock);
+    ASMSetFlags(fIntSaved);
     rtR0SemEventDarwinRelease(pThis);
 
@@ -209 +211 @@
     IPRT_DARWIN_SAVE_EFL_AC();
 
+    RTCCUINTREG const fIntSaved = ASMIntDisableFlags();
     rtR0SemEventDarwinRetain(pThis);
-
-    /** @todo should probably disable interrupts here... update
-     *        semspinmutex-r0drv-generic.c when done. */
     lck_spin_lock(pThis->pSpinlock);
 
@@ -233 +233 @@
 
     lck_spin_unlock(pThis->pSpinlock);
+    ASMSetFlags(fIntSaved);
     rtR0SemEventDarwinRelease(pThis);
 
@@ -264 +265 @@
     IPRT_DARWIN_SAVE_EFL_AC();
 
+    RTCCUINTREG const fIntSaved = ASMIntDisableFlags();
     rtR0SemEventDarwinRetain(pThis);
     lck_spin_lock(pThis->pSpinlock);
@@ -390 +392 @@
 
     lck_spin_unlock(pThis->pSpinlock);
+    ASMSetFlags(fIntSaved);
     rtR0SemEventDarwinRelease(pThis);
+
     IPRT_DARWIN_RESTORE_EFL_AC();
     return rc;

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

@@ -175 +175 @@
     IPRT_DARWIN_SAVE_EFL_AC();
 
+    RTCCUINTREG const fIntSaved = ASMIntDisableFlags();
     lck_spin_lock(pThis->pSpinlock);
 
@@ -186 +187 @@
 
     lck_spin_unlock(pThis->pSpinlock);
+    ASMSetFlags(fIntSaved);
     rtR0SemEventMultiDarwinRelease(pThis);
 
@@ -206 +208 @@
      * as RTMemFree does not work with interrupts disabled (IOFree/kfree takes zone mutex).
      */
-    //RT_ASSERT_INTS_ON(); - we may be called from interrupt context, which seems to be perfectly fine.
+    //RT_ASSERT_INTS_ON(); - we may be called from interrupt context, which seems to be perfectly fine if we disable interrupts.
 
     IPRT_DARWIN_SAVE_EFL_AC();
 
+    RTCCUINTREG const fIntSaved = ASMIntDisableFlags();
     rtR0SemEventMultiDarwinRetain(pThis);
     lck_spin_lock(pThis->pSpinlock);
@@ -231 +234 @@
 
     lck_spin_unlock(pThis->pSpinlock);
+    ASMSetFlags(fIntSaved);
     rtR0SemEventMultiDarwinRelease(pThis);
 
@@ -249 +253 @@
     IPRT_DARWIN_SAVE_EFL_AC();
 
+    RTCCUINTREG const fIntSaved = ASMIntDisableFlags();
     rtR0SemEventMultiDarwinRetain(pThis);
     lck_spin_lock(pThis->pSpinlock);
@@ -255 +260 @@
 
     lck_spin_unlock(pThis->pSpinlock);
+    ASMSetFlags(fIntSaved);
     rtR0SemEventMultiDarwinRelease(pThis);
 
@@ -287 +293 @@
     IPRT_DARWIN_SAVE_EFL_AC();
 
+    RTCCUINTREG const fIntSaved = ASMIntDisableFlags();
     rtR0SemEventMultiDarwinRetain(pThis);
     lck_spin_lock(pThis->pSpinlock);
@@ -408 +415 @@
 
     lck_spin_unlock(pThis->pSpinlock);
+    ASMSetFlags(fIntSaved);
     rtR0SemEventMultiDarwinRelease(pThis);