Changeset 106608 in vbox for trunk/src

Timestamp:

Oct 23, 2024 4:20:54 AM (5 weeks ago)

Author:

vboxsync

Message:

Devices/Network: switched back to poll paradigm for windows and non-windows. bugref:10268

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Network/DrvNATlibslirp.cpp (modified) (9 diffs)
• Network/RTWinPollLibslirp.cpp (deleted)
• Network/RTWinSocketPair.cpp (copied) (copied from trunk/src/VBox/NetworkServices/NAT/RTWinSocketPair.cpp )
• Network/winpoll.h (deleted)
• Network/winutils.h (copied) (copied from trunk/src/VBox/NetworkServices/NAT/winutils.h ) (2 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -780 +780 @@
         Network/DrvNATlibslirp.cpp
   VBoxDD_SOURCES.win += \
-        Network/RTWinPollLibslirp.cpp
+        Network/RTWinSocketPair.cpp
   Network/DrvNATlibslirp.cpp_INCS   += \
         $(PATH_ROOT)/src/libs/libslirp-4.8.0/src \

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

@@ -37 +37 @@
 # include <iprt/win/winsock2.h>
 # include <iprt/win/ws2tcpip.h>
+# include "winutils.h"
+# define inet_aton(x, y) inet_pton(2, x, y)
+# define AF_INET6 23
 #endif
 
@@ -52 +55 @@
 # include <errno.h>
 #endif
+
 #ifdef RT_OS_FREEBSD
 # include <netinet/in.h>
 #endif
 
-#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
-#endif
-
+#include <iprt/asm.h>
 #include <iprt/assert.h>
 #include <iprt/critsect.h>
@@ -221 +219 @@
     /** The read end of the control pipe. */
     RTPIPE                  hPipeRead;
-# if HC_ARCH_BITS == 32
-    uint32_t                u32Padding;
-# endif
 #else
-    /** for external notification */
-    HANDLE                  hWakeupEvent;
+    /* wakeup socket pair for NAT thread */
+    SOCKET                  pWakeupSockPair[2];
 #endif
+    /* count of bytes sent to notify NAT thread */
+    volatile uint64_t       cbWakeupNotifs;
 
 #define DRV_PROFILE_COUNTER(name, dsc)     STAMPROFILE Stat ## name
@@ -603 +600 @@
     size_t cbIgnored;
     rc = RTPipeWrite(pThis->hPipeWrite, "", 1, &cbIgnored);
+    if (RT_SUCCESS(rc))
+    {
+        /* Count how many bites we send down the socket */
+        ASMAtomicIncU64(&pThis->cbWakeupNotifs);
+    }
 #else
-    /* kick WSAWaitForMultipleEvents */
-    rc = WSASetEvent(pThis->hWakeupEvent);
+    int cbWritten = send(pThis->pWakeupSockPair[0], "", 1, NULL);
+    if (cbWritten == SOCKET_ERROR)
+    {
+        int error = WSAGetLastError();
+        Log4(("Notify NAT Thread Error %d\n", error));
+    }
+    else
+    {
+        /* Count how many bites we send down the socket */
+        ASMAtomicIncU64(&pThis->cbWakeupNotifs);
+    }
 #endif
     AssertRC(rc);
@@ -704 +715 @@
 {
     PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
-#ifdef VBOX_NAT_DELAY_HACK
-    unsigned int cBreak = 0;
-#endif
-#ifndef RT_OS_WINDOWS
+#ifdef RT_OS_WINDOWS
+    drvNAT_AddPollCb(pThis->pWakeupSockPair[1], SLIRP_POLL_IN | SLIRP_POLL_HUP, pThis);
+    pThis->pNATState->polls[0].fd = pThis->pWakeupSockPair[1];
+#else
     unsigned int cPollNegRet = 0;
     drvNAT_AddPollCb(RTPipeToNative(pThis->hPipeRead), SLIRP_POLL_IN | SLIRP_POLL_HUP, pThis);
@@ -764 +775 @@
              * device's thread sends before we've entered multiplex,
              * so to avoid false alarm drain pipe here to the very end
-             *
-             * @todo: Probably we should counter drvNATSend to count how
-             * deep pipe has been filed before drain.
-             *
              */
-            /** @todo XXX: Make it reading exactly we need to drain the
-             * pipe.*/
             char ch;
             size_t cbRead;
-            RTPipeRead(pThis->hPipeRead, &ch, 1, &cbRead);
+            uint64_t cbWakeupNotifs = ASMAtomicReadU64(&pThis->cbWakeupNotifs);
+            RTPipeRead(pThis->hPipeRead, &ch, cbWakeupNotifs, &cbRead);
+            ASMAtomicSubU64(&pThis->cbWakeupNotifs, cbRead);
         }
 
@@ -782 +789 @@
 #else /* RT_OS_WINDOWS */
         uint32_t msTimeout = DRVNAT_DEFAULT_TIMEOUT;
-        pThis->pNATState->nsock = 0;
+        pThis->pNATState->nsock = 1;
         slirp_pollfds_fill(pThis->pNATState->pSlirp, &msTimeout, drvNAT_AddPollCb /* SlirpAddPollCb */, pThis /* opaque */);
         drvNAT_UpdateTimeout(&msTimeout, pThis);
 
-        int cChangedFDs = 0;
-        int vrc = RTWinPoll(pThis->pNATState->polls, pThis->pNATState->nsock, msTimeout, &cChangedFDs, pThis->hWakeupEvent);
-        if (vrc != VINF_SUCCESS)
-        {
-            if (vrc != VERR_TIMEOUT)
-                LogRel(("NAT: RTWinPoll returned vrc=%Rrc (cChangedFDs=%d)\n", vrc, cChangedFDs));
+        int cChangedFDs = WSAPoll(pThis->pNATState->polls, pThis->pNATState->nsock, msTimeout /* timeout */);
+        int error = WSAGetLastError();
+        if (cChangedFDs == SOCKET_ERROR)
+        {
+            LogRel(("NAT: RTWinPoll returned error=%Rrc (cChangedFDs=%d)\n", error, cChangedFDs));
             Log4(("NAT: NSOCK = %d\n", pThis->pNATState->nsock));
+        }
+
+        if (pThis->pNATState->polls[0].revents & (POLLIN))
+        {
+            /* drain the pipe
+             *
+             * Note! drvNATSend decoupled so we don't know how many times
+             * device's thread sends before we've entered multiplex,
+             * so to avoid false alarm drain pipe here to the very end
+             */
+            char ch;
+            size_t cbRead;
+            uint64_t cbWakeupNotifs = ASMAtomicReadU64(&pThis->cbWakeupNotifs);
+            cbRead = recv(pThis->pWakeupSockPair[1], &ch, cbWakeupNotifs, NULL);
+            ASMAtomicSubU64(&pThis->cbWakeupNotifs, cbRead);
         }
 
@@ -809 +830 @@
         RTReqQueueProcess(pThis->hSlirpReqQueue, 0);
         drvNAT_CheckTimeout(pThis);
-# ifdef VBOX_NAT_DELAY_HACK
-        if (cBreak++ > 128)
-        {
-            cBreak = 0;
-            RTThreadSleep(2);
-        }
-# endif
 #endif /* RT_OS_WINDOWS */
     }
@@ -1703 +1717 @@
     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);
+    // Create the wakeup socket pair.
+    pThis->pWakeupSockPair[0] = NULL;
+    pThis->pWakeupSockPair[1] = NULL;
+
+    /* idx=0 is write, idx=1 is read */
+    rc = RTWinSocketPair(AF_INET, SOCK_DGRAM, 0, pThis->pWakeupSockPair);
+    AssertRCReturn(rc, rc);
 #endif
+    /* initalize the notifier counter */
+    pThis->cbWakeupNotifs = 0;
 
     rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pSlirpThread, pThis, drvNATAsyncIoThread,

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

@@ -26 +26 @@
  */
 
-#ifndef VBOX_INCLUDED_SRC_NAT_winutils_h
-#define VBOX_INCLUDED_SRC_NAT_winutils_h
+#ifndef VBOX_INCLUDED_SRC_Network_winutils_h
+#define VBOX_INCLUDED_SRC_Network_winutils_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -218 +218 @@
 }
 
-#endif /* !VBOX_INCLUDED_SRC_NAT_winutils_h */
+#endif /* !VBOX_INCLUDED_SRC_Network_winutils_h */