adjust newer xdp api restriction

microsoft · Nov 12, 2024 · 4202c51 · 4202c51
1 parent 058c635
commit 4202c51
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/src/platform/datapath_raw_xdp_win.c b/src/platform/datapath_raw_xdp_win.c
@@ -43,7 +43,6 @@ typedef struct XDP_DATAPATH {
     BOOLEAN TxAlwaysPoke;
     BOOLEAN SkipXsum;
     BOOLEAN Running;        // Signal to stop partitions.
-    // XDP_QEO_SET_FN *XdpQeoSet;
 
     XDP_PARTITION Partitions[0];
 } XDP_DATAPATH;
@@ -175,6 +174,7 @@ CxPlatGetRssQueueProcessors(
         if (QUIC_FAILED(Status)) { return Status; }
 
         XSK_UMEM_REG TxUmem = {0};
+        UINT32 EnableAffinity = 1;
         TxUmem.Address = &TxPacket;
         TxUmem.ChunkSize = sizeof(XDP_TX_PACKET);
         TxUmem.Headroom = FIELD_OFFSET(XDP_TX_PACKET, FrameBuffer);
@@ -189,6 +189,9 @@ CxPlatGetRssQueueProcessors(
         Status = XskSetSockopt(TxXsk, XSK_SOCKOPT_TX_COMPLETION_RING_SIZE, &TxRingSize, sizeof(TxRingSize));
         if (QUIC_FAILED(Status)) { CloseHandle(TxXsk); return Status; }
 
+        Status = XskSetSockopt(TxXsk, XSK_SOCKOPT_TX_PROCESSOR_AFFINITY, &EnableAffinity, sizeof(EnableAffinity));
+        if (QUIC_FAILED(Status)) { CloseHandle(TxXsk); return Status; }
+
         uint32_t Flags = XSK_BIND_FLAG_TX;
         Status = XskBind(TxXsk, InterfaceIndex, i, Flags);
         if (QUIC_FAILED(Status)) {
@@ -943,7 +946,6 @@ CxPlatDpRawInitialize(
     }
 
     CxPlatListInitializeHead(&Xdp->Interfaces);
-    // Xdp->XdpQeoSet = (XDP_QEO_SET_FN *)XdpGetRoutine(XDP_QEO_SET_FN_NAME);
 
     CxPlatXdpReadConfig(Xdp);
     Xdp->PollingIdleTimeoutUs = Config ? Config->PollingIdleTimeoutUs : 0;
@@ -1268,16 +1270,11 @@ RawSocketUpdateQeo(
 
     BOOLEAN AtLeastOneSucceeded = FALSE;
     for (CXPLAT_LIST_ENTRY* Entry = Xdp->Interfaces.Flink; Entry != &Xdp->Interfaces; Entry = Entry->Flink) {
-        // if (Xdp->XdpQeoSet != NULL) {
-        //     Status =
-        //         Xdp->XdpQeoSet(
-        //             CONTAINING_RECORD(Entry, XDP_INTERFACE, Link)->XdpHandle,
-        //             Connections,
-        //             sizeof(Connections));
-        if (FALSE) {
-        } else {
-            Status = E_NOINTERFACE;
-        }
+        Status =
+            XdpQeoSet(
+                CONTAINING_RECORD(Entry, XDP_INTERFACE, Link)->XdpHandle,
+                Connections,
+                sizeof(Connections));
         if (QUIC_FAILED(Status)) {
             QuicTraceEvent(
                 LibraryErrorStatus,