Changeset 88490 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 13, 2021 10:55:07 AM (4 years ago)

Author:

vboxsync

Message:

Network: Do not bring up links for "not attached" adapters.

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (4 diffs)
• DevPCNet.cpp (modified) (4 diffs)
• DevVirtioNet.cpp (modified) (6 diffs)

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

@@ -2890 +2890 @@
 
 /**
+ * A helper function to detect the link state to the other side of "the wire".
+ *
+ * When deciding to bring up the link we need to take into account both if the
+ * cable is connected and if our device is actually connected to the outside
+ * world. If no driver is attached we won't be able to allocate TX buffers,
+ * which will prevent us from TX descriptor processing, which will result in
+ * "TX unit hang" in the guest.
+ *
+ * @returns true if the device is connected to something.
+ *
+ * @param   pDevIns     The device instance.
+ */
+DECLINLINE(bool) e1kIsConnected(PPDMDEVINS pDevIns)
+{
+    PE1KSTATE     pThis   = PDMDEVINS_2_DATA(pDevIns, PE1KSTATE);
+    PE1KSTATECC   pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PE1KSTATECC);
+    return pThis->fCableConnected && pThisCC->CTX_SUFF(pDrv);
+}
+
+/**
  * A callback used by PHY to indicate that the link needs to be updated due to
  * reset of PHY.
@@ -2901 +2921 @@
 
     /* Make sure we have cable connected and MAC can talk to PHY */
-    if (pThis->fCableConnected && (CTRL & CTRL_SLU))
+    if (e1kIsConnected(pDevIns) && (CTRL & CTRL_SLU))
         e1kArmTimer(pDevIns, pThis, pThis->hLUTimer, E1K_INIT_LINKUP_DELAY_US);
 }
@@ -2948 +2968 @@
         if (   (value & CTRL_SLU)
             && !(CTRL & CTRL_SLU)
-            && pThis->fCableConnected
+            && e1kIsConnected(pDevIns)
             && !PDMDevHlpTimerIsActive(pDevIns, pThis->hLUTimer))
         {
@@ -3654 +3674 @@
      * on reset even if the cable is unplugged (see @bugref{8942}).
      */
-    if (pThis->fCableConnected)
+    if (e1kIsConnected(pDevIns))
     {
         /* 82543GC does not have an internal PHY */

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

@@ -3292 +3292 @@
                 | 0x0004    /* Link up. */
                 | 0x0001;   /* Extended Capability, i.e. registers 4+ valid. */
-            if (!pThis->fLinkUp || pThis->fLinkTempDown || isolate) {
+            if (!pcnetIsLinkUp(pThis) || isolate) {
                 val &= ~(0x0020 | 0x0004);
                 pThis->cLinkDownReported++;
@@ -3338 +3338 @@
         case 5:
             /* Link partner ability register. */
-            if (pThis->fLinkUp && !pThis->fLinkTempDown && !isolate)
+            if (pcnetIsLinkUp(pThis) && !isolate)
                 val =   0x8000  /* Next page bit. */
                       | 0x4000  /* Link partner acked us. */
@@ -3353 +3353 @@
         case 6:
             /* Auto negotiation expansion register. */
-            if (pThis->fLinkUp && !pThis->fLinkTempDown && !isolate)
+            if (pcnetIsLinkUp(pThis) && !isolate)
                 val =   0x0008  /* Link partner supports npage. */
                       | 0x0004  /* Enable npage words. */
@@ -3366 +3366 @@
         case 18:
             /* Diagnostic Register (FreeBSD pcn/ac101 driver reads this). */
-            if (pThis->fLinkUp && !pThis->fLinkTempDown && !isolate)
+            if (pcnetIsLinkUp(pThis) && !isolate)
             {
                 val =   0x0100  /* Receive PLL locked. */

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

@@ -359 +359 @@
 
 #ifdef IN_RING3
+/**
+ * A helper function to detect the link state to the other side of "the wire".
+ *
+ * When deciding to bring up the link we need to take into account both if the
+ * cable is connected and if our device is actually connected to the outside
+ * world. If no driver is attached we won't start the TX thread nor we will
+ * initialize the TX semaphore, which is a problem for the TX queue handler.
+ *
+ * @returns true if the device is connected to something.
+ *
+ * @param   pDevIns     The device instance.
+ */
+DECLINLINE(bool) vnetR3IsConnected(PPDMDEVINS pDevIns)
+{
+    PVNETSTATE   pThis   = PDMDEVINS_2_DATA(pDevIns, PVNETSTATE);
+    PVNETSTATECC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PVNETSTATECC);
+    return pThis->fCableConnected && pThisCC->pDrv;
+}
+
 /**
  * Dump a packet to debug log.
@@ -524 +543 @@
 static DECLCALLBACK(int) vnetIoCb_Reset(PPDMDEVINS pDevIns)
 {
+#ifndef IN_RING3
+    RT_NOREF(pDevIns);
+    return VINF_IOM_R3_IOPORT_WRITE;
+#else
     PVNETSTATE   pThis   = PDMDEVINS_2_DATA(pDevIns, PVNETSTATE);
-#ifdef IN_RING3
     PVNETSTATECC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PVNETSTATECC);
-#endif
+
     Log(("%s Reset triggered\n", INSTANCE(pThis)));
 
@@ -540 +562 @@
 
     /// @todo Implement reset
-    if (pThis->fCableConnected)
+    if (vnetR3IsConnected(pDevIns))
         pThis->config.uStatus = VNET_S_LINK_UP;
     else
         pThis->config.uStatus = 0;
-    Log(("%s vnetIoCb_Reset: Link is %s\n", INSTANCE(pThis), pThis->fCableConnected ? "up" : "down"));
+    Log(("%s vnetIoCb_Reset: Link is %s\n", INSTANCE(pThis), vnetR3IsConnected(pDevIns) ? "up" : "down"));
 
     /*
@@ -556 +578 @@
     memset(pThis->aVlanFilter, 0, sizeof(pThis->aVlanFilter));
     pThis->uIsTransmitting   = 0;
-#ifndef IN_RING3
-    return VINF_IOM_R3_IOPORT_WRITE;
-#else
     if (pThisCC->pDrv)
         pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, true);
@@ -1131 +1150 @@
         if (fNewUp)
         {
-            Log(("%s Link is up\n", INSTANCE(pThis)));
             pThis->fCableConnected = true;
-            pThis->config.uStatus |= VNET_S_LINK_UP;
-            vnetR3RaiseInterrupt(pDevIns, pThis, VERR_SEM_BUSY, VPCI_ISR_CONFIG);
+            /* The link state depends both on the cable connected and device attached. */
+            if (vnetR3IsConnected(pDevIns))
+            {
+                Log(("%s Link is up\n", INSTANCE(pThis)));
+                pThis->config.uStatus |= VNET_S_LINK_UP;
+                vnetR3RaiseInterrupt(pDevIns, pThis, VERR_SEM_BUSY, VPCI_ISR_CONFIG);
+            }
         }
         else
@@ -1344 +1367 @@
     }
 
-    if (!pThis->fCableConnected)
+    if (!vnetR3IsConnected(pDevIns))
     {
         Log(("%s Ignoring transmit requests while cable is disconnected.\n", INSTANCE(pThis)));