Changeset 106129 in vbox

Timestamp:

Sep 23, 2024 11:46:42 PM (5 months ago)

Author:

vboxsync

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

164907

Message:

Devices/Network: Fix windows slow packet throughput by kicking NAT thread more regularly. bugref:10268

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Network/DrvNATlibslirp.cpp (modified) (6 diffs)
• Network/RTWinPollLibslirp.cpp (copied) (copied from trunk/src/VBox/NetworkServices/NAT/RTWinPoll.cpp ) (3 diffs)
• Network/winpoll.h (copied) (copied from trunk/src/VBox/NetworkServices/NAT/winpoll.h ) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -777 +777 @@
   VBoxDD_DEFS   += VBOX_WITH_LIBSLIRP
   VBoxDD_SOURCES += \
-        Network/DrvNATlibslirp.cpp
+        Network/DrvNATlibslirp.cpp \
+        Network/RTWinPollLibslirp.cpp
   Network/DrvNATlibslirp.cpp_INCS   += \
         $(PATH_ROOT)/src/libs/libslirp-4.8.0/src \

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

@@ -58 +58 @@
 #ifdef RT_OS_WINDOWS
 # include <iprt/win/winsock2.h>
+# include "winpoll.h"
 # define inet_aton(x, y) inet_pton(2, x, y)
 # define AF_INET6 23
@@ -93 +94 @@
 #define DRVNAT_MAXFRAMESIZE (16 * 1024)
 #define DRVNAT_DEFAULT_TIMEOUT (3600*1000)
-
-/**
- * @todo: This is a bad hack to prevent freezing the guest during high network
- *        activity. Windows host only. This needs to be fixed properly.
- */
-#define VBOX_NAT_DELAY_HACK
 
 #define GET_EXTRADATA(pdrvins, node, name, rc, type, type_name, var)                                  \
@@ -609 +604 @@
     rc = RTPipeWrite(pThis->hPipeWrite, "", 1, &cbIgnored);
 #else
-    RT_NOREF(pThis);
+    /* kick WSAWaitForMultipleEvents */
+    rc = WSASetEvent(pThis->hWakeupEvent);
 #endif
     AssertRC(rc);
@@ -708 +704 @@
 {
     PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
-#ifdef RT_OS_WINDOWS
+#ifdef VBOX_NAT_DELAY_HACK
     unsigned int cBreak = 0;
-#else /* RT_OS_WINDOWS */
+#endif
+#ifndef RT_OS_WINDOWS
     unsigned int cPollNegRet = 0;
     drvNAT_AddPollCb(RTPipeToNative(pThis->hPipeRead), SLIRP_POLL_IN | SLIRP_POLL_HUP, pThis);
@@ -789 +786 @@
         drvNAT_UpdateTimeout(&uTimeout, pThis);
 
-        int cChangedFDs = WSAPoll(pThis->pNATState->polls, pThis->pNATState->nsock, uTimeout /* timeout */);
-        int error = WSAGetLastError();
-
-        if (cChangedFDs < 0)
+        int cChangedFDs;
+        int error = RTWinPoll(pThis->pNATState->polls, pThis->pNATState->nsock, uTimeout /* timeout */, &cChangedFDs, pThis->hWakeupEvent);
+
+        if (error != 0)
         {
             LogFlow(("NAT: WSAPoll returned %d (error %d)\n", cChangedFDs, error));
             LogFlow(("NSOCK = %d\n", pThis->pNATState->nsock));
-
-            if (error == 10022)
-                RTThreadSleep(100);
         }
 
@@ -1699 +1693 @@
 
 #ifndef RT_OS_WINDOWS
-    /**
-     * Create the control pipe.
-     */
+    // Create the control pipe.
     rc = RTPipeCreate(&pThis->hPipeRead, &pThis->hPipeWrite, 0 /*fFlags*/);
     AssertRCReturn(rc, rc);
+#else
+    // Create the wakeup event handle.
+    pThis->hWakeupEvent = NULL;
+    pThis->hWakeupEvent = CreateEvent(NULL, FALSE, FALSE, NULL); /* auto-reset event */
+    Assert(pThis->hWakeupEvent != NULL);
 #endif
 

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

@@ -25 +25 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
-#define LOG_GROUP LOG_GROUP_NAT_SERVICE
+#define LOG_GROUP LOG_GROUP_DRV_NAT
 
 #include <iprt/asm.h>
@@ -42 +42 @@
 static HANDLE g_hNetworkEvent;
 
-int
-RTWinPoll(struct pollfd *pFds, unsigned int nfds, int timeout, int *pNready)
+int RTWinPoll(struct pollfd *pFds, unsigned int nfds, int timeout, int *pNready, HANDLE phControl)
 {
     AssertPtrReturn(pFds, VERR_INVALID_PARAMETER);
+    HANDLE pHandleArr[] = {phControl, g_hNetworkEvent};
 
     if (g_hNetworkEvent == WSA_INVALID_EVENT)
@@ -89 +89 @@
     }
 
-    DWORD index = WSAWaitForMultipleEvents(1,
-                                           &g_hNetworkEvent,
+    DWORD index = WSAWaitForMultipleEvents(2,
+                                           pHandleArr,
                                            FALSE,
                                            timeout == RT_INDEFINITE_WAIT ? WSA_INFINITE : timeout,

trunk/src/VBox/Devices/Network/winpoll.h

@@ -59 +59 @@
 #endif
 RT_C_DECLS_BEGIN
-int RTWinPoll(struct pollfd *pFds, unsigned int nfds, int timeout, int *pNready);
+int RTWinPoll(struct pollfd *pFds, unsigned int nfds, int timeout, int *pNready, HANDLE phControl);
 RT_C_DECLS_END
 #endif /* !VBOX_INCLUDED_SRC_NAT_winpoll_h */