Changeset 81413 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 21, 2019 1:39:27 PM (5 years ago)

Author:

vboxsync

Message:

PDMR3Task: execution thread fix. bugref:9218

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/PDMR3Task.cpp (modified) (5 diffs)
• include/PDMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/PDMR3Task.cpp

@@ -110 +110 @@
         pTaskSet->idxRunning    = UINT8_MAX;
         //pTaskSet->fShutdown   = false;
+        pTaskSet->pVM           = pVM;
 
         pVM->pdm.s.apTaskSets[i] = pTaskSet;
@@ -222 +223 @@
         {
             uint64_t fTriggered = ASMAtomicReadU64(&pTaskSet->fTriggered);
-            unsigned iTask;
-            while ( (iTask = ASMBitFirstSetU64(fTriggered)) != 0)
+            unsigned iTask      = ASMBitFirstSetU64(fTriggered);
+            if (iTask == 0)
+                break;
+            do
             {
                 iTask--;
                 AssertBreak(iTask < RT_ELEMENTS(pTaskSet->aTasks));
 
-                fTriggered &= ~RT_BIT_64(iTask);
                 if (ASMAtomicBitTestAndClear(&pTaskSet->fTriggered, iTask))
                 {
@@ -276 +278 @@
                     ASMAtomicWriteU32(&pTaskSet->idxRunning, UINT32_MAX);
                 }
-            }
+
+                /* Next pending task. */
+                fTriggered &= ~RT_BIT_64(iTask);
+                iTask = ASMBitFirstSetU64(fTriggered);
+            } while (iTask != 0);
         }
+
+        /*
+         * Wait.
+         */
+        if (pTaskSet->fRZEnabled)
+            SUPSemEventWaitNoResume(pTaskSet->pVM->pSession, pTaskSet->hEventR0, RT_MS_15SEC);
+        else
+            RTSemEventWaitNoResume(pTaskSet->hEventR3, RT_MS_15SEC);
     }
 
@@ -386 +400 @@
                 pTaskSet->idxRunning    = UINT8_MAX;
                 //pTaskSet->fShutdown   = false;
+                pTaskSet->pVM           = pVM;
 
                 pVM->pdm.s.apTaskSets[i] = pTaskSet;
@@ -400 +415 @@
     if (pTaskSet->hThread == NIL_RTTHREAD)
     {
-        int rc = RTThreadCreateF(&pTaskSet->hThread, pdmR3TaskThread,  pTaskSet, 0 /*cbStack*/, RTTHREADTYPE_IO,
+        int rc = RTThreadCreateF(&pTaskSet->hThread, pdmR3TaskThread, pTaskSet, 0 /*cbStack*/, RTTHREADTYPE_IO,
                                  RTTHREADFLAGS_WAITABLE, "TaskSet%u", pTaskSet->uHandleBase / RT_ELEMENTS(pTaskSet->aTasks));
         AssertLogRelRCReturn(rc, rc);

trunk/src/VBox/VMM/include/PDMInternal.h

@@ -1026 +1026 @@
     /** Event semaphore for waking up the thread when fRZEnabled is clear. */
     R3PTRTYPE(RTSEMEVENT)   hEventR3;
+    /** The VM pointer.   */
+    PVM                     pVM;
     /** Padding so fTriggered is in its own cacheline. */
-    uint64_t                au64Padding2[4];
+    uint64_t                au64Padding2[3];
 
     /** Bitmask of triggered tasks. */