Changeset 8610 in vbox for trunk

Timestamp:

May 5, 2008 8:09:26 PM (17 years ago)

Author:

vboxsync

Message:

PCNet: completed fix for broken hostif with certain guests. Make sure the PCNet poll timer is actually running if fMaybeOutOfSpace is set. Never exit the TAP recv thread if pfnWaitReceiveAvail() as this means we were woken up during a VM state transition.

Location:

trunk/src/VBox/Devices/Network

Files:

• DevPCNet.cpp (modified) (6 diffs)
• DrvTAP.cpp (modified) (1 diff)
• DrvTAPOs2.cpp (modified) (1 diff)
• DrvTAPWin32.cpp (modified) (1 diff)

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

@@ -600 +600 @@
 static int pcnetSyncTransmit(PCNetState *pData);
 #endif
+static void pcnetPollTimerStart(PCNetState *pData);
 
 /**
@@ -1581 +1582 @@
     pData->aCSR[0] &= ~0x0004;       /* clear STOP bit */
     pData->aCSR[0] |=  0x0002;       /* STRT */
-    pcnetPollTimer(pData);           /* start timer if it was stopped */
+    pcnetPollTimerStart(pData);      /* start timer if it was stopped */
 }
 
@@ -2533 +2534 @@
 
 /**
- * Update the poller timer
- * @thread EMT,
+ * Start the poller timer.
+ * Poll timer interval is fixed to 500Hz. Don't stop it.
+ * @thread EMT, TAP.
+ */
+static void pcnetPollTimerStart(PCNetState *pData)
+{
+    TMTimerSet(pData->CTXSUFF(pTimerPoll),
+               TMTimerGet(pData->CTXSUFF(pTimerPoll))
+               + TMTimerFromMilli(pData->CTXSUFF(pTimerPoll), 2));
+}
+
+
+/**
+ * Update the poller timer.
+ * @thread EMT.
  */
 static void pcnetPollTimer(PCNetState *pData)
@@ -2569 +2583 @@
      * disabled. We wouldn't need to poll for new TX descriptors in that case but it will
      * not hurt as waiting for RX descriptors should occur very seldom */
-    if (   RT_UNLIKELY(pData->fMaybeOutOfSpace)
-        || RT_LIKELY(!CSR_STOP(pData) && !CSR_SPND(pData) && !CSR_DPOLL(pData)))
+    if (RT_LIKELY(   !CSR_STOP(pData)
+                  && !CSR_SPND(pData)
+                  && (   !CSR_DPOLL(pData)
+                      || pData->fMaybeOutOfSpace)))
     {
         /* We ensure that we poll at least every 2ms (500Hz) but not more often than
@@ -2588 +2604 @@
         }
         if (!TMTimerIsActive(pData->CTXSUFF(pTimerPoll)))
-            /* Poll timer interval is fixed to 500Hz. Don't stop it. */
-            TMTimerSet(pData->CTXSUFF(pTimerPoll),
-                       TMTimerGet(pData->CTXSUFF(pTimerPoll))
-                       + TMTimerFromMilli(pData->CTXSUFF(pTimerPoll), 2));
+            pcnetPollTimerStart(pData);
 #endif
     }
@@ -4332 +4345 @@
         }
         LogFlow(("pcnetWaitReceiveAvail: waiting cMillies=%u...\n", cMillies));
+        /* Start the poll timer once which will remain active as long fMaybeOutOfSpace
+         * is true -- even if (transmit) polling is disabled (CSR_DPOLL). */
+        rc2 = PDMCritSectEnter(&pData->CritSect, VERR_SEM_BUSY);
+        AssertReleaseRC(rc2);
+        pcnetPollTimerStart(pData);
+        PDMCritSectLeave(&pData->CritSect);
         RTSemEventWait(pData->hEventOutOfRxSpace, cMillies);
     }

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

@@ -305 +305 @@
                 int rc = pData->pPort->pfnWaitReceiveAvail(pData->pPort, RT_INDEFINITE_WAIT);
                 STAM_PROFILE_ADV_START(&pData->StatReceive, a);
+
+                /*
+                 * A return code != VINF_SUCCESS means that we were woken up during a VM
+                 * state transistion. Drop the packet and wait for the next one.
+                 */
                 if (RT_FAILURE(rc))
-                    break;
+                    continue;
 
                 /*

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

@@ -256 +256 @@
 
             /*
-             * Wait for the device to have some room.
+             * Wait for the device to have some room. A return code != VINF_SUCCESS
+             * means that we were woken up during a VM state transition. Drop the
+             * current packet and wait for the next one.
              */
             rc = pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, RT_INDEFINITE_WAIT);
             if (RT_FAILURE(rc))
-                break;
+                continue;
 
             /*

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

@@ -225 +225 @@
         }
 
-        /* Not very nice, but what else can we do? */
+        /*
+         * Wait for the device to have some room. A return code != VINF_SUCCESS
+         * means that we were woken up during a VM state transition. Drop the
+         * current packet and wait for the next one.
+         */
         rc = pData->pPort->pfnWaitReceiveAvail(pData->pPort, RT_INDEFINITE_WAIT);
         if (RT_FAILURE(rc))
-            break;
+            continue;
 
         STAM_COUNTER_INC(&pData->StatPktRecv);