Changeset 93613 in vbox for trunk/src/VBox

Timestamp:

Feb 6, 2022 4:23:27 AM (3 years ago)

Author:

vboxsync

Message:

Only wake worker after pause/resume if queue enabled by driver

File:

• trunk/src/VBox/Devices/Storage/DevVirtioSCSI.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Storage/DevVirtioSCSI.cpp

@@ -1556 +1556 @@
         return VINF_SUCCESS;
 
+    Log6Func(("[Re]starting %s worker\n", VIRTQNAME(uVirtqNbr)));
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
-        if (!pWorkerR3->cRedoDescs && IS_VIRTQ_EMPTY(pDevIns, &pThis->Virtio, uVirtqNbr))
-        {
+        if (    !pWorkerR3->cRedoDescs
+                 && IS_VIRTQ_EMPTY(pDevIns, &pThis->Virtio, uVirtqNbr))        {
             /* Atomic interlocks avoid missing alarm while going to sleep & notifier waking the awoken */
             ASMAtomicWriteBool(&pWorker->fSleeping, true);
@@ -1570 +1571 @@
                 AssertLogRelMsgReturn(RT_SUCCESS(rc) || rc == VERR_INTERRUPTED, ("%Rrc\n", rc), rc);
                 if (RT_UNLIKELY(pThread->enmState != PDMTHREADSTATE_RUNNING))
+                        {
+                    Log6Func(("%s worker thread not running, exiting\n", VIRTQNAME(uVirtqNbr)));
                     return VINF_SUCCESS;
+                }
                 if (rc == VERR_INTERRUPTED)
+                {
+                    Log6Func(("%s worker interrupted ... continuing\n", VIRTQNAME(uVirtqNbr)));
                     continue;
+                }
                 Log6Func(("%s worker woken\n", VIRTQNAME(uVirtqNbr)));
                 ASMAtomicWriteBool(&pWorker->fNotified, false);
             }
             ASMAtomicWriteBool(&pWorker->fSleeping, false);
+        }
+        if (!virtioCoreIsVirtqEnabled(&pThis->Virtio, uVirtqNbr))
+        {
+            LogFunc(("%s queue not enabled, worker aborting...\n", VIRTQNAME(uVirtqNbr)));
+            break;
         }
 
@@ -2294 +2306 @@
     for (uint16_t uVirtqNbr = 0; uVirtqNbr < VIRTIOSCSI_REQ_VIRTQ_CNT; uVirtqNbr++)
     {
-        if (ASMAtomicReadBool(&pThis->aWorkers[uVirtqNbr].fSleeping))
+        if (   virtioCoreIsVirtqEnabled(&pThis->Virtio, uVirtqNbr)
+            && ASMAtomicReadBool(&pThis->aWorkers[uVirtqNbr].fSleeping))
         {
             Log6Func(("waking %s worker.\n", VIRTQNAME(uVirtqNbr)));