Changeset 100398 in vbox

Timestamp:

Jul 6, 2023 8:40:28 AM (17 months ago)

Author:

vboxsync

Message:

Devices/Network/DevVirtioNet: Some fixes, the control queue can't be destroyed if not used because the UEFI firmware can access the device as well and have a different opinion on how to use it than any guest OS accessing it later and requiring the control queue. Also the thread would need to be destroyed before the SUP event smeaphore because the thread is woken up before using said semaphore, bugref:10459

File:

• trunk/src/VBox/Devices/Network/DevVirtioNet.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

@@ -1077 +1077 @@
     {
         Log10((" and its worker"));
+        rc = PDMDevHlpThreadDestroy(pVirtio->pDevInsR3,  pWorkerR3->pThread, &rcThread);
+        AssertRCReturn(rc, rc);
+        pWorkerR3->pThread = 0;
+
         rc = PDMDevHlpSUPSemEventClose(pVirtio->pDevInsR3, pWorker->hEvtProcess);
         AssertRCReturn(rc, rc);
         pWorker->hEvtProcess = 0;
-        rc = PDMDevHlpThreadDestroy(pVirtio->pDevInsR3,  pWorkerR3->pThread, &rcThread);
-        AssertRCReturn(rc, rc);
-        pWorkerR3->pThread = 0;
+
         pVirtq->fHasWorker = false;
     }
@@ -3241 +3243 @@
     virtioNetR3SetVirtqNames(pThis, fLegacy);
 
+    /** @todo r=aeichner We can't just destroy the control queue here because the UEFI firmware and the guest OS might have different
+     * opinions on how to use the device and if the UEFI firmware causes the control queue to be destroyed Linux guests
+     * will have a hard time using it. */
+#if 0
     /* Senseless for modern guest to use control queue in this case. (See Note 1 in PDM-invoked device constructor) */
     if (!fLegacy && !(fDriverFeatures & VIRTIONET_F_CTRL_VQ))
         virtioNetR3VirtqDestroy(pVirtio, &pThis->aVirtqs[CTRLQIDX]);
+#else
+    RT_NOREF(fDriverFeatures);
+#endif
 }