Changeset 28121 in vbox for trunk/src/VBox/Devices/Network/DevE1000.cpp

Timestamp:

Apr 9, 2010 7:58:35 AM (15 years ago)

Author:

vboxsync

Message:

DevE1000: TX thread wakeup experiment.

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (12 diffs)

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

@@ -47 +47 @@
 //#define E1K_INT_STATS
 //#define E1K_REL_STATS
+//#define E1K_USE_SUPLIB_SEMEVENT
 
 #include <iprt/crc32.h>
@@ -956 +957 @@
 #endif
     /** Transmit thread blocker. */
+#ifdef E1K_USE_SUPLIB_SEMEVENT
+    SUPSEMEVENT hTxSem;
+#else
     RTSEMEVENT  hTxSem;
+#endif
     /** Base address of memory-mapped registers. */
     RTGCPHYS    addrMMReg;
@@ -2854 +2859 @@
 
     /* IPv4 checksum offset. */
-    if (RT_UNLIKELY( pCtx->dw2.fIP && pCtx->ip.u8CSO - pCtx->ip.u8CSS != RT_OFFSETOF(RTNETIPV4, ip_sum) ))
+    if (RT_UNLIKELY( pCtx->dw2.fIP && pCtx->ip.u8CSO - pCtx->ip.u8CSS != RT_UOFFSETOF(RTNETIPV4, ip_sum) ))
     {
         E1kLog(("e1kSetupGsoCtx: IPCSO=%#x IPCSS=%#x\n", pCtx->ip.u8CSO, pCtx->ip.u8CSS));
@@ -2862 +2867 @@
     /* TCP/UDP checksum offsets. */
     if (RT_UNLIKELY( pCtx->tu.u8CSO - pCtx->tu.u8CSS != ( pCtx->dw2.fTCP
-                                                         ? RT_OFFSETOF(RTNETTCP, th_sum)
-                                                         : RT_OFFSETOF(RTNETUDP, uh_sum) ) ))
+                                                         ? RT_UOFFSETOF(RTNETTCP, th_sum)
+                                                         : RT_UOFFSETOF(RTNETUDP, uh_sum) ) ))
     {
         E1kLog(("e1kSetupGsoCtx: TUCSO=%#x TUCSS=%#x TCP=%d\n", pCtx->ip.u8CSO, pCtx->ip.u8CSS, pCtx->dw2.fTCP));
@@ -3734 +3739 @@
 {
     E1KSTATE *pState = PDMINS_2_DATA(pDevIns, E1KSTATE *);
+#ifdef E1K_USE_SUPLIB_SEMEVENT
+    int rc = SUPSemEventSignal(PDMDevHlpGetVM(pDevIns)->pSession, pState->hTxSem);
+#else
     int rc = RTSemEventSignal(pState->hTxSem);
+#endif
     AssertRC(rc);
     return VINF_SUCCESS;
@@ -3753 +3762 @@
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
-        int rc = RTSemEventWait(pState->hTxSem, RT_INDEFINITE_WAIT);
+#ifdef E1K_USE_SUPLIB_SEMEVENT
+        int rc = SUPSemEventWaitNoResume(PDMDevHlpGetVM(pDevIns)->pSession, pState->hTxSem, RT_INDEFINITE_WAIT);
+#else
+        int rc = RTSemEventWaitNoResume(pState->hTxSem, RT_INDEFINITE_WAIT);
+#endif
+        if (rc == VERR_INTERRUPTED)
+            continue;
         AssertRCReturn(rc, rc);
         if (RT_UNLIKELY(pThread->enmState != PDMTHREADSTATE_RUNNING))
@@ -3807 +3822 @@
     E1KSTATE *pState = PDMINS_2_DATA(pDevIns, E1KSTATE *);
     E1kLog2(("%s e1kTxQueueConsumer: Waking up TX thread...\n", INSTANCE(pState)));
+#ifdef E1K_USE_SUPLIB_SEMEVENT
+    int rc = SUPSemEventSignal(PDMDevHlpGetVM(pDevIns)->pSession, pState->hTxSem);
+#else
     int rc = RTSemEventSignal(pState->hTxSem);
+#endif
     AssertRC(rc);
     return true;
@@ -3852 +3871 @@
         E1kLog(("%s e1kRegWriteTDT: %d descriptors to process, waking up E1000_TX thread\n",
                  INSTANCE(pState), e1kGetTxLen(pState)));
-#ifdef IN_RING3
+#if (defined(IN_RING3) || defined(IN_RING0)) && defined(E1K_USE_SUPLIB_SEMEVENT)
+        rc = SUPSemEventSignal(PDMDevHlpGetVM(pState->CTX_SUFF(pDevIns))->pSession, pState->hTxSem);
+        AssertRC(rc);
+#elif defined(IN_RING3)
         rc = RTSemEventSignal(pState->hTxSem);
         AssertRC(rc);
@@ -5407 +5429 @@
             pState->hEventMoreRxDescAvail = NIL_RTSEMEVENT;
         }
+#ifdef E1K_USE_SUPLIB_SEMEVENT
+        if (pState->hTxSem != NIL_SUPSEMEVENT)
+        {
+            SUPSemEventClose(PDMDevHlpGetVM(pDevIns)->pSession, pState->hTxSem);
+            pState->hTxSem = NIL_SUPSEMEVENT;
+        }
+#else
         if (pState->hTxSem != NIL_RTSEMEVENT)
         {
@@ -5412 +5441 @@
             pState->hTxSem = NIL_RTSEMEVENT;
         }
+#endif
 #ifndef E1K_GLOBAL_MUTEX
         PDMR3CritSectDelete(&pState->csRx);
@@ -5538 +5568 @@
     RTStrPrintf(pState->szInstance, sizeof(pState->szInstance), "E1000#%d", iInstance);
     E1kLog(("%s Constructing new instance sizeof(E1KRXDESC)=%d\n", INSTANCE(pState), sizeof(E1KRXDESC)));
+#ifdef E1K_USE_SUPLIB_SEMEVENT
+    pState->hTxSem = NIL_SUPSEMEVENT;
+#else
     pState->hTxSem = NIL_RTSEMEVENT;
+#endif
     pState->hEventMoreRxDescAvail = NIL_RTSEMEVENT;
 
@@ -5771 +5805 @@
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to attach the network LUN"));
 
+#ifdef E1K_USE_SUPLIB_SEMEVENT
+    rc = SUPSemEventCreate(PDMDevHlpGetVM(pDevIns)->pSession, &pState->hTxSem);
+#else
     rc = RTSemEventCreate(&pState->hTxSem);
+#endif
     if (RT_FAILURE(rc))
         return rc;