Changeset 81708 in vbox

Timestamp:

Nov 6, 2019 2:25:11 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134470

Message:

DevVirtioNet: Replaced the CanRxQueue and hEventMoreRxDescAvail semaphore with a SUPSEMEVENT semaphore. bugref:9218

File:

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

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

@@ -131 +131 @@
     R3PTRTYPE(PPDMINETWORKUP) pDrv;    /**< Connector of attached network driver. */
 
-    R3PTRTYPE(PPDMQUEUE)    pCanRxQueueR3;           /**< Rx wakeup signaller - R3. */
-    R0PTRTYPE(PPDMQUEUE)    pCanRxQueueR0;           /**< Rx wakeup signaller - R0. */
-    RCPTRTYPE(PPDMQUEUE)    pCanRxQueueRC;           /**< Rx wakeup signaller - RC. */
-# if HC_ARCH_BITS == 64
-    uint32_t                padding;
-# endif
-
     /**< Link Up(/Restore) Timer. */
     PTMTIMERR3              pLinkUpTimer;
@@ -203 +196 @@
 
     /** EMT: Gets signalled when more RX descriptors become available. */
-    RTSEMEVENT              hEventMoreRxDescAvail;
+    SUPSEMEVENT             hEventMoreRxDescAvail;
 
     /** @name Statistic
@@ -529 +522 @@
 }
 
-#ifdef IN_RING3
 
 /**
  * Wakeup the RX thread.
  */
-static void vnetR3WakeupReceive(PPDMDEVINS pDevIns)
+static void vnetWakeupReceive(PPDMDEVINS pDevIns)
 {
     PVNETSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PVNETSTATE);
     if (    pThis->fMaybeOutOfSpace
-        &&  pThis->hEventMoreRxDescAvail != NIL_RTSEMEVENT)
+        &&  pThis->hEventMoreRxDescAvail != NIL_SUPSEMEVENT)
     {
         STAM_COUNTER_INC(&pThis->StatRxOverflowWakeup);
         Log(("%s Waking up Out-of-RX-space semaphore\n",  INSTANCE(pThis)));
-/**
- * @todo r=bird: We can wake stuff up from ring-0 too, see vmsvga, nvme,
- *        buslogic, lsilogic, ata, ahci, xhci.  Also, please address similar
- *        TODO in E1000.
- *
- *        The API Is SUPSem*, btw.
- */
-        RTSemEventSignal(pThis->hEventMoreRxDescAvail);
-    }
-}
-
+        int rc = PDMDevHlpSUPSemEventSignal(pDevIns, pThis->hEventMoreRxDescAvail);
+        AssertRC(rc);
+    }
+}
+
+#ifdef IN_RING3
 
 /**
@@ -603 +590 @@
     STATUS |= VNET_S_LINK_UP;
     vnetR3RaiseInterrupt(pThis, VERR_SEM_BUSY, VPCI_ISR_CONFIG);
-    vnetR3WakeupReceive(pDevIns);
+    vnetWakeupReceive(pDevIns);
     vnetR3CsLeave(pThis);
     Log(("%s vnetR3LinkUpTimer: Link is up\n", INSTANCE(pThis)));
@@ -617 +604 @@
 {
     RT_NOREF(pItem);
-    vnetR3WakeupReceive(pDevIns);
+    vnetWakeupReceive(pDevIns);
     return true;
 }
@@ -632 +619 @@
     PVNETSTATE pThis = RT_FROM_MEMBER(pVPciState, VNETSTATE, VPCI);
     Log(("%s Driver became ready, waking up RX thread...\n", INSTANCE(pThis)));
-/**
- * @todo r=bird: We can wake stuff up from ring-0 too, see vmsvga, nvme,
- *        buslogic, lsilogic, ata, ahci, xhci.  Also, please address similar
- *        TODO in E1000.
- *
- *        The API Is SUPSem*, btw.
- */
-#ifdef IN_RING3
-    vnetR3WakeupReceive(pThis->VPCI.CTX_SUFF(pDevIns));
-#else
-    PPDMQUEUEITEMCORE pItem = PDMQueueAlloc(pThis->CTX_SUFF(pCanRxQueue));
-    if (pItem)
-        PDMQueueInsert(pThis->CTX_SUFF(pCanRxQueue), pItem);
-#endif
+    vnetWakeupReceive(pThis->VPCI.CTX_SUFF(pDevIns));
 }
 
@@ -732 +706 @@
 {
     PVNETSTATE pThis = RT_FROM_MEMBER(pInterface, VNETSTATE, INetworkDown);
+    PPDMDEVINS pDevIns = pThis->VPCI.pDevInsR3;
     LogFlow(("%s vnetR3NetworkDown_WaitReceiveAvail(cMillies=%u)\n", INSTANCE(pThis), cMillies));
+
     int rc = vnetR3CanReceive(pThis);
-
     if (RT_SUCCESS(rc))
         return VINF_SUCCESS;
-    if (RT_UNLIKELY(cMillies == 0))
+
+    if (cMillies == 0)
         return VERR_NET_NO_BUFFER_SPACE;
 
@@ -755 +731 @@
         }
         Log(("%s vnetR3NetworkDown_WaitReceiveAvail: waiting cMillies=%u...\n", INSTANCE(pThis), cMillies));
-        RTSemEventWait(pThis->hEventMoreRxDescAvail, cMillies);
+        rc2 = PDMDevHlpSUPSemEventWaitNoResume(pDevIns, pThis->hEventMoreRxDescAvail, cMillies);
+        if (RT_FAILURE(rc2) && rc2 != VERR_TIMEOUT && rc2 != VERR_INTERRUPTED)
+            RTThreadSleep(1);
     }
     STAM_PROFILE_STOP(&pThis->StatRxOverflow, a);
@@ -1141 +1119 @@
     RT_NOREF(pThis, pQueue);
     Log(("%s Receive buffers has been added, waking up receive thread.\n", INSTANCE(pThis)));
-    vnetR3WakeupReceive(pDevIns);
+    vnetWakeupReceive(pDevIns);
 }
 
@@ -2100 +2078 @@
 {
     /* Poke thread waiting for buffer space. */
-    vnetR3WakeupReceive(pDevIns);
+    vnetWakeupReceive(pDevIns);
 }
 
@@ -2110 +2088 @@
 {
     /* Poke thread waiting for buffer space. */
-    vnetR3WakeupReceive(pDevIns);
+    vnetWakeupReceive(pDevIns);
 }
 
@@ -2119 +2097 @@
 static DECLCALLBACK(void) vnetR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
+    vpciRelocate(pDevIns, offDelta);
+#ifdef VNET_TX_DELAY
     PVNETSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PVNETSTATE);
-    vpciRelocate(pDevIns, offDelta);
-    pThis->pCanRxQueueRC = PDMQueueRCPtr(pThis->pCanRxQueueR3);
-#ifdef VNET_TX_DELAY
-    pThis->pTxTimerRC    = TMTimerRCPtr(pThis->pTxTimerR3);
-#endif /* VNET_TX_DELAY */
-    // TBD
+    pThis->pTxTimerRC = TMTimerRCPtr(pThis->pTxTimerR3);
+#endif
 }
 
@@ -2142 +2118 @@
 
     Log(("%s Destroying instance\n", INSTANCE(pThis)));
-    if (pThis->hEventMoreRxDescAvail != NIL_RTSEMEVENT)
-    {
-        RTSemEventSignal(pThis->hEventMoreRxDescAvail);
-        RTSemEventDestroy(pThis->hEventMoreRxDescAvail);
-        pThis->hEventMoreRxDescAvail = NIL_RTSEMEVENT;
+    if (pThis->hEventMoreRxDescAvail != NIL_SUPSEMEVENT)
+    {
+        PDMDevHlpSUPSemEventSignal(pDevIns, pThis->hEventMoreRxDescAvail);
+        PDMDevHlpSUPSemEventClose(pDevIns, pThis->hEventMoreRxDescAvail);
+        pThis->hEventMoreRxDescAvail = NIL_SUPSEMEVENT;
     }
 
@@ -2169 +2145 @@
      * Initialize the instance data suffiencently for the destructor not to blow up.
      */
-    pThis->hEventMoreRxDescAvail = NIL_RTSEMEVENT;
+    pThis->hEventMoreRxDescAvail = NIL_SUPSEMEVENT;
 #ifndef VNET_TX_DELAY
     pThis->hTxEvent              = NIL_SUPSEMEVENT;
@@ -2248 +2224 @@
     AssertRCReturn(rc, rc);
 
-    /* Create the RX notifier signaller. */
-    rc = PDMDevHlpQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 1, 0,
-                              vnetR3CanRxQueueConsumer, true, "VNet-Rcv", &pThis->pCanRxQueueR3);
-    AssertRCReturn(rc, rc);
-    pThis->pCanRxQueueR0 = PDMQueueR0Ptr(pThis->pCanRxQueueR3);
-    pThis->pCanRxQueueRC = PDMQueueRCPtr(pThis->pCanRxQueueR3);
-
     /* Create Link Up Timer */
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, vnetR3LinkUpTimer, pThis, TMTIMER_FLAGS_NO_CRIT_SECT,
@@ -2295 +2264 @@
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to attach the network LUN"));
 
-    rc = RTSemEventCreate(&pThis->hEventMoreRxDescAvail);
+    rc = PDMDevHlpSUPSemEventCreate(pDevIns, &pThis->hEventMoreRxDescAvail);
     AssertRCReturn(rc, rc);