Changeset 39007 in vbox for trunk/src/VBox/Runtime/r0drv/linux

Timestamp:

Oct 17, 2011 2:51:37 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74410

Message:

timer-r0drv-linux.c: Make 100% sure we ever call del_timer_sync while in atomic or interrupt context.

File:

• trunk/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c (modified) (2 diffs)

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

@@ -1406 +1406 @@
     AssertReturn(pTimer->u32Magic == RTTIMER_MAGIC, VERR_INVALID_HANDLE);
     RTTIMERLNX_LOG(("destroy %p\n", pTimer));
+/** @todo We should invalidate the magic here! */
 
     /*
@@ -1451 +1452 @@
 
     if (fCanDestroy)
-        rtTimerLnxDestroyIt(pTimer);
+    {
+        /* For paranoid reasons, defer actually destroying the semaphore when
+           in atomic or interrupt context. */
+        if (in_atomic() || in_interrupt())
+            rtR0LnxWorkqueuePush(&pTimer->DtorWorkqueueItem, rtTimerLnxDestroyDeferred);
+        else
+            rtTimerLnxDestroyIt(pTimer);
+    }
 
     return VINF_SUCCESS;