Changeset 91069 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Sep 1, 2021 4:47:14 PM (3 years ago)

Author:

vboxsync

Message:

Dev/VirtioNet: Notify the guest of link state change after restoring VM state. Do not run TX loop if disconnected.

File:

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

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

@@ -652 +652 @@
     VNET_R3_CS_ENTER_RETURN_VOID(pDevIns, pThis);
 
-    pThis->config.uStatus |= VNET_S_LINK_UP;
-    vnetR3RaiseInterrupt(pDevIns, pThis, VERR_SEM_BUSY, VPCI_ISR_CONFIG);
-    vnetWakeupReceive(pDevIns);
+    Log(("%s vnetR3LinkUpTimer: connected=%s\n", INSTANCE(pThis), vnetR3IsConnected(pDevIns)?"true":"false"));
+    /* Do not bring up the link if the device is not connected. */
+    if (vnetR3IsConnected(pDevIns))
+    {
+        pThis->config.uStatus |= VNET_S_LINK_UP;
+        vnetR3RaiseInterrupt(pDevIns, pThis, VERR_SEM_BUSY, VPCI_ISR_CONFIG);
+        vnetWakeupReceive(pDevIns);
+    }
 
     vnetR3CsLeave(pDevIns, pThis);
@@ -1592 +1597 @@
             Log(("vnetR3TxThread: enable kicking and get to sleep\n"));
             vringSetNotification(pDevIns, &pThisCC->pTxQueue->VRing, true);
-            if (vqueueIsEmpty(pDevIns, pThisCC->pTxQueue))
+            /*
+             * Break out of the loop if the device is not connected. Otherwise we will
+             * end up in a tight loop, not being able to transmit, if there is something
+             * in TX queue. See @bugref{10096}.
+             */
+            if (vqueueIsEmpty(pDevIns, pThisCC->pTxQueue) || !vnetR3IsConnected(pDevIns))
                 break;
             vringSetNotification(pDevIns, &pThisCC->pTxQueue->VRing, false);
@@ -1999 +2009 @@
         }
     }
+    Log(("%s State has been restored\n", INSTANCE(pThis)));
 
     return rc;
@@ -2021 +2032 @@
      */
     if (!PDMDevHlpVMTeleportedAndNotFullyResumedYet(pDevIns))
+    {
+        /*
+         * Since we do not restore the link state, we pretend it is up, so it will be
+         * lowered by vnetR3TempLinkDown, and the guest will be notified. The actual state
+         * of the link will be determined later by vnetR3IsConnected in vnetR3LinkUpTimer.
+         * See @bugref{10096}.
+         */
+        pThis->config.uStatus |= VNET_S_LINK_UP;
         vnetR3TempLinkDown(pDevIns, pThis, pThisCC);
+    }
 
     return VINF_SUCCESS;