Fix epoll

microsoft · Jan 3, 2025 · 00f4574 · 00f4574
1 parent d86e76c
commit 00f4574
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/platform/datapath_epoll.c b/src/platform/datapath_epoll.c
@@ -206,9 +206,9 @@ typedef struct CXPLAT_RECV_MSG_CONTROL_BUFFER {
 #define CXPLAT_DBG_ASSERT_CMSG(CMsg, type)
 #endif
 
-CXPLAT_EVENT_COMPLETION CxPlatSocketContextUninitializeComplete;
+CXPLAT_EVENT_COMPLETION CxPlatSocketContextUninitializeEventComplete;
 CXPLAT_EVENT_COMPLETION CxPlatSocketContextFlushTxEventComplete;
-CXPLAT_EVENT_COMPLETION CxPlatSocketContextProcessIoCompletion;
+CXPLAT_EVENT_COMPLETION CxPlatSocketContextIoEventComplete;
 
 void
 CxPlatDataPathCalculateFeatureSupport(
@@ -579,7 +579,7 @@ CxPlatSocketContextSqeInitialize(
 
     if (!CxPlatSqeInitialize(
             SocketContext->DatapathPartition->EventQ,
-            CxPlatSocketContextUninitializeComplete,
+            CxPlatSocketContextUninitializeEventComplete,
             &SocketContext->ShutdownSqe)) {
         Status = errno;
         QuicTraceEvent(
@@ -594,7 +594,7 @@ CxPlatSocketContextSqeInitialize(
 
     if (!CxPlatSqeInitialize(
             SocketContext->DatapathPartition->EventQ,
-            CxPlatSocketContextProcessIoCompletion,
+            CxPlatSocketContextIoEventComplete,
             &SocketContext->IoSqe)) {
         Status = errno;
         QuicTraceEvent(
@@ -1128,11 +1128,9 @@ CxPlatSocketRelease(
 
 void
 CxPlatSocketContextUninitializeComplete(
-    _In_ CXPLAT_CQE* Cqe
+    _In_ CXPLAT_SOCKET_CONTEXT* SocketContext
     )
 {
-    CXPLAT_SOCKET_CONTEXT* SocketContext =
-        CXPLAT_CONTAINING_RECORD(CxPlatCqeGetSqe(Cqe), CXPLAT_SOCKET_CONTEXT, ShutdownSqe);
 #if DEBUG
     CXPLAT_DBG_ASSERT(!SocketContext->Freed);
     SocketContext->Freed = TRUE;
@@ -1171,6 +1169,16 @@ CxPlatSocketContextUninitializeComplete(
     CxPlatSocketRelease(SocketContext->Binding);
 }
 
+void
+CxPlatSocketContextUninitializeEventComplete(
+    _In_ CXPLAT_CQE* Cqe
+    )
+{
+    CXPLAT_SOCKET_CONTEXT* SocketContext =
+        CXPLAT_CONTAINING_RECORD(CxPlatCqeGetSqe(Cqe), CXPLAT_SOCKET_CONTEXT, ShutdownSqe);
+    CxPlatSocketContextUninitializeComplete(SocketContext);
+}
+
 void
 CxPlatSocketContextUninitialize(
     _In_ CXPLAT_SOCKET_CONTEXT* SocketContext
@@ -2811,7 +2819,7 @@ CxPlatSocketGetTcpStatistics(
 }
 
 void
-CxPlatSocketContextProcessIoCompletion(
+CxPlatSocketContextIoEventComplete(
     _In_ CXPLAT_CQE* Cqe
     )
 {

diff --git a/src/platform/datapath_kqueue.c b/src/platform/datapath_kqueue.c
@@ -162,7 +162,7 @@ typedef struct QUIC_CACHEALIGN CXPLAT_SOCKET_CONTEXT {
     //
     // The event for the shutdown event.
     //
-    DATAPATH_SQE ShutdownSqe;
+    CXPLAT_SQE ShutdownSqe;
 
     //
     // The user data for the IO event.
@@ -1011,7 +1011,6 @@ CxPlatSocketContextUninitialize(
 
         CxPlatEventQEnqueue(
             SocketContext->DatapathPartition->EventQ,
-            &SocketContext->ShutdownSqe.Sqe,
             &SocketContext->ShutdownSqe);
     }
 }
@@ -1425,8 +1424,6 @@ CxPlatSocketCreateUdp(
     for (uint32_t i = 0; i < SocketCount; i++) {
         Binding->SocketContexts[i].Binding = Binding;
         Binding->SocketContexts[i].SocketFd = INVALID_SOCKET;
-        Binding->SocketContexts[i].ShutdownSqe.CqeType = CXPLAT_CQE_TYPE_SOCKET_SHUTDOWN;
-        Binding->SocketContexts[i].IoCqeType = CXPLAT_CQE_TYPE_SOCKET_IO;
         Binding->SocketContexts[i].RecvIov.iov_len =
             Binding->Mtu - CXPLAT_MIN_IPV4_HEADER_SIZE - CXPLAT_UDP_HEADER_SIZE;
         Binding->SocketContexts[i].DatapathPartition =