From 7d2e0cecd0f7f87e0466865dc7199e43c8ba86cc Mon Sep 17 00:00:00 2001 From: Michael Friesen <3517159+mtfriesen@users.noreply.github.com> Date: Thu, 27 Jul 2023 12:04:52 -0400 Subject: [PATCH 1/2] consume XDP v0.17.0 --- scripts/prepare-machine.ps1 | 10 +--- scripts/xdp-devkit.json | 2 +- scripts/xdp-install.ps1 | 14 +++--- src/platform/datapath_raw_xdp_win.c | 72 +++++++++++++++++------------ 4 files changed, 52 insertions(+), 46 deletions(-) diff --git a/scripts/prepare-machine.ps1 b/scripts/prepare-machine.ps1 index 26b17c80d7..b81599e035 100644 --- a/scripts/prepare-machine.ps1 +++ b/scripts/prepare-machine.ps1 @@ -222,11 +222,6 @@ function Install-Xdp-Sdk { if (!$IsWindows) { return } # Windows only $XdpPath = Join-Path $ArtifactsPath "xdp" if ($Force) { - try { - # Make sure an old driver isn't installed. - netcfg.exe -u ms_xdp - pnputil.exe /delete-driver "$XdpPath\bin\xdp.inf" - } catch {} rm -Force -Recurse $XdpPath -ErrorAction Ignore | Out-Null } if (!(Test-Path $XdpPath)) { @@ -251,7 +246,7 @@ function Install-Xdp-Driver { } Write-Host "Installing XDP driver" - netcfg.exe -l "$XdpPath\bin\xdp.inf" -c s -i ms_xdp + msiexec.exe /i $XdpPath\bin\xdp-for-windows.msi /quiet } # Completely removes the XDP driver and SDK. @@ -261,8 +256,7 @@ function Uninstall-Xdp { if (!(Test-Path $XdpPath)) { return; } Write-Host "Uninstalling XDP" - try { netcfg.exe -u ms_xdp } catch {} - try { pnputil.exe /delete-driver "$XdpPath\bin\xdp.inf" } catch {} + try { msiexec.exe /x $XdpPath\bin\xdp-for-windows.msi /quiet } catch {} rm -Force -Recurse $XdpPath -ErrorAction Ignore | Out-Null } diff --git a/scripts/xdp-devkit.json b/scripts/xdp-devkit.json index 823b5757d8..98ee12d1bd 100644 --- a/scripts/xdp-devkit.json +++ b/scripts/xdp-devkit.json @@ -1,3 +1,3 @@ { - "path" : "https://github.com/microsoft/xdp-for-windows/releases/download/v0.16.8/xdp-devkit-x64-0.16.8-prerelease.zip" + "path" : "https://github.com/microsoft/xdp-for-windows/releases/download/v0.17.0/xdp-devkit-x64-0.17.0.zip" } diff --git a/scripts/xdp-install.ps1 b/scripts/xdp-install.ps1 index c1dee52343..4806649edf 100644 --- a/scripts/xdp-install.ps1 +++ b/scripts/xdp-install.ps1 @@ -31,16 +31,15 @@ $ProgressPreference = 'SilentlyContinue' $NetworkPath = (irm "https://raw.githubusercontent.com/microsoft/msquic/main/scripts/xdp-devkit.json").path $ZipPath = Join-Path $Destination "xdp.zip" $XdpPath = Join-Path $Destination "xdp" -$XdpInstalled = Test-Path "$XdpPath\bin\xdp.inf" +$InstallId = (Get-CimInstance Win32_Product -Filter "Name = 'XDP for Windows'").IdentifyingNumber if (!$Uninstall) { # Clean up any previous install. Don't delete the old directory as it might # contain some other non-XDP files. - if ($XdpInstalled) { + if ($InstallId) { Write-Output "Uninstalling old XDP driver" try { - netcfg.exe -u ms_xdp - pnputil.exe /delete-driver "$XdpPath\bin\xdp.inf" + msiexec.exe /x $InstallId /quiet } catch { } } @@ -60,14 +59,13 @@ if (!$Uninstall) { # Install the XDP driver. Write-Host "Installing XDP driver" - netcfg.exe -l "$XdpPath\bin\xdp.inf" -c s -i ms_xdp + msiexec.exe /i $XdpPath\bin\xdp-for-windows.msi /quiet -} elseif ($XdpInstalled) { +} elseif ($InstallId) { # Uninstall the XDP driver and delete the folder. Write-Output "Uninstalling XDP driver" try { - netcfg.exe -u ms_xdp - pnputil.exe /delete-driver "$XdpPath\bin\xdp.inf" + msiexec.exe /x $InstallId /quiet } catch { } Remove-Item -Path $XdpPath -Recurse -Force } diff --git a/src/platform/datapath_raw_xdp_win.c b/src/platform/datapath_raw_xdp_win.c index ea8cd4ae2a..eb44b63e94 100644 --- a/src/platform/datapath_raw_xdp_win.c +++ b/src/platform/datapath_raw_xdp_win.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #ifdef QUIC_CLOG @@ -40,6 +41,7 @@ typedef struct XDP_DATAPATH { BOOLEAN Running; // Signal to stop workers. XDP_LOAD_API_CONTEXT XdpApiLoadContext; const XDP_API_TABLE *XdpApi; + XDP_QEO_SET_FN *XdpQeoSet; XDP_WORKER Workers[0]; } XDP_DATAPATH; @@ -476,7 +478,8 @@ CxPlatDpRawInterfaceUninitialize( if (Interface->Rules != NULL) { for (uint8_t i = 0; i < Interface->RuleCount; ++i) { if (Interface->Rules[i].Pattern.IpPortSet.PortSet.PortSet) { - CxPlatFree(Interface->Rules[i].Pattern.IpPortSet.PortSet.PortSet, PORT_SET_TAG); + CxPlatFree( + (uint8_t*)Interface->Rules[i].Pattern.IpPortSet.PortSet.PortSet, PORT_SET_TAG); } } CxPlatFree(Interface->Rules, RULE_TAG); @@ -588,10 +591,10 @@ CxPlatDpRawInterfaceInitialize( } XSK_UMEM_REG RxUmem = {0}; - RxUmem.address = Queue->RxBuffers; - RxUmem.chunkSize = RxPacketSize; - RxUmem.headroom = RxHeadroom; - RxUmem.totalSize = Xdp->RxBufferCount * RxPacketSize; + RxUmem.Address = Queue->RxBuffers; + RxUmem.ChunkSize = RxPacketSize; + RxUmem.Headroom = RxHeadroom; + RxUmem.TotalSize = Xdp->RxBufferCount * RxPacketSize; Status = Xdp->XdpApi->XskSetSockopt(Queue->RxXsk, XSK_SOCKOPT_UMEM_REG, &RxUmem, sizeof(RxUmem)); if (QUIC_FAILED(Status)) { @@ -661,8 +664,8 @@ CxPlatDpRawInterfaceInitialize( goto Error; } - XskRingInitialize(&Queue->RxFillRing, &RxRingInfo.fill); - XskRingInitialize(&Queue->RxRing, &RxRingInfo.rx); + XskRingInitialize(&Queue->RxFillRing, &RxRingInfo.Fill); + XskRingInitialize(&Queue->RxRing, &RxRingInfo.Rx); for (uint32_t j = 0; j < Xdp->RxBufferCount; j++) { InterlockedPushEntrySList( @@ -710,10 +713,10 @@ CxPlatDpRawInterfaceInitialize( } XSK_UMEM_REG TxUmem = {0}; - TxUmem.address = Queue->TxBuffers; - TxUmem.chunkSize = sizeof(XDP_TX_PACKET); - TxUmem.headroom = FIELD_OFFSET(XDP_TX_PACKET, FrameBuffer); - TxUmem.totalSize = Xdp->TxBufferCount * sizeof(XDP_TX_PACKET); + TxUmem.Address = Queue->TxBuffers; + TxUmem.ChunkSize = sizeof(XDP_TX_PACKET); + TxUmem.Headroom = FIELD_OFFSET(XDP_TX_PACKET, FrameBuffer); + TxUmem.TotalSize = Xdp->TxBufferCount * sizeof(XDP_TX_PACKET); Status = Xdp->XdpApi->XskSetSockopt(Queue->TxXsk, XSK_SOCKOPT_UMEM_REG, &TxUmem, sizeof(TxUmem)); if (QUIC_FAILED(Status)) { @@ -783,8 +786,8 @@ CxPlatDpRawInterfaceInitialize( goto Error; } - XskRingInitialize(&Queue->TxRing, &TxRingInfo.tx); - XskRingInitialize(&Queue->TxCompletionRing, &TxRingInfo.completion); + XskRingInitialize(&Queue->TxRing, &TxRingInfo.Tx); + XskRingInitialize(&Queue->TxCompletionRing, &TxRingInfo.Completion); for (uint32_t j = 0; j < Xdp->TxBufferCount; j++) { InterlockedPushEntrySList( @@ -1023,6 +1026,8 @@ CxPlatDpRawInitialize( goto Error; } + Xdp->XdpQeoSet = (XDP_QEO_SET_FN *)Xdp->XdpApi->XdpGetRoutine(XDP_QEO_SET_FN_NAME); + CxPlatXdpReadConfig(Xdp); Xdp->PollingIdleTimeoutUs = Config ? Config->PollingIdleTimeoutUs : 0; @@ -1346,11 +1351,15 @@ CxPlatSocketUpdateQeo( BOOLEAN AtLeastOneSucceeded = FALSE; for (CXPLAT_LIST_ENTRY* Entry = Xdp->Interfaces.Flink; Entry != &Xdp->Interfaces; Entry = Entry->Flink) { - Status = - Xdp->XdpApi->XdpQeoSet( - CONTAINING_RECORD(Entry, XDP_INTERFACE, Link)->XdpHandle, - Connections, - sizeof(Connections)); + if (Xdp->XdpQeoSet != NULL) { + Status = + Xdp->XdpQeoSet( + CONTAINING_RECORD(Entry, XDP_INTERFACE, Link)->XdpHandle, + Connections, + sizeof(Connections)); + } else { + Status = E_NOINTERFACE; + } if (QUIC_FAILED(Status)) { QuicTraceEvent( LibraryErrorStatus, @@ -1480,7 +1489,8 @@ CxPlatDpRawPlumbRulesOnSocket( if (IsCreated) { if (Rule) { CxPlatDpRawSetPortBit( - Rule->Pattern.IpPortSet.PortSet.PortSet, Socket->LocalAddress.Ipv4.sin_port); + (uint8_t*)Rule->Pattern.IpPortSet.PortSet.PortSet, + Socket->LocalAddress.Ipv4.sin_port); CxPlatLockRelease(&Interface->RuleLock); } else { CxPlatLockRelease(&Interface->RuleLock); @@ -1492,7 +1502,9 @@ CxPlatDpRawPlumbRulesOnSocket( .Redirect.Target = NULL, }; if (NewRule.Pattern.IpPortSet.PortSet.PortSet) { - CxPlatZeroMemory(NewRule.Pattern.IpPortSet.PortSet.PortSet, XDP_PORT_SET_BUFFER_SIZE); + CxPlatZeroMemory( + (uint8_t*)NewRule.Pattern.IpPortSet.PortSet.PortSet, + XDP_PORT_SET_BUFFER_SIZE); } else { QuicTraceEvent( AllocFailure, @@ -1502,7 +1514,8 @@ CxPlatDpRawPlumbRulesOnSocket( return; } CxPlatDpRawSetPortBit( - NewRule.Pattern.IpPortSet.PortSet.PortSet, Socket->LocalAddress.Ipv4.sin_port); + (uint8_t*)NewRule.Pattern.IpPortSet.PortSet.PortSet, + Socket->LocalAddress.Ipv4.sin_port); memcpy( &NewRule.Pattern.IpPortSet.Address, IpAddress, IpAddressSize); CxPlatDpRawInterfaceAddRules(Interface, &NewRule, 1); @@ -1513,7 +1526,8 @@ CxPlatDpRawPlumbRulesOnSocket( // if (Rule) { CxPlatDpRawClearPortBit( - Rule->Pattern.IpPortSet.PortSet.PortSet, Socket->LocalAddress.Ipv4.sin_port); + (uint8_t*)Rule->Pattern.IpPortSet.PortSet.PortSet, + Socket->LocalAddress.Ipv4.sin_port); } CxPlatLockRelease(&Interface->RuleLock); } @@ -1559,8 +1573,8 @@ CxPlatXdpRx( for (uint32_t i = 0; i < BuffersCount; i++) { XSK_BUFFER_DESCRIPTOR* Buffer = XskRingGetElement(&Queue->RxRing, RxIndex++); XDP_RX_PACKET* Packet = - (XDP_RX_PACKET*)(Queue->RxBuffers + XskDescriptorGetAddress(Buffer->address)); - uint8_t* FrameBuffer = (uint8_t*)Packet + XskDescriptorGetOffset(Buffer->address); + (XDP_RX_PACKET*)(Queue->RxBuffers + Buffer->Address.BaseAddress); + uint8_t* FrameBuffer = (uint8_t*)Packet + Buffer->Address.Offset; CxPlatZeroMemory(Packet, sizeof(XDP_RX_PACKET)); Packet->Route = &Packet->RouteStorage; @@ -1571,7 +1585,7 @@ CxPlatXdpRx( (CXPLAT_DATAPATH*)Xdp, (CXPLAT_RECV_DATA*)Packet, FrameBuffer, - (uint16_t)Buffer->length); + (uint16_t)Buffer->Length); // // The route has been filled in with the packet's src/dst IP and ETH addresses, so @@ -1765,14 +1779,14 @@ CxPlatXdpTx( CXPLAT_LIST_ENTRY* Entry = CxPlatListRemoveHead(&Queue->WorkerTxQueue); XDP_TX_PACKET* Packet = CONTAINING_RECORD(Entry, XDP_TX_PACKET, Link); - Buffer->address = (uint8_t*)Packet - Queue->TxBuffers; - XskDescriptorSetOffset(&Buffer->address, FIELD_OFFSET(XDP_TX_PACKET, FrameBuffer)); - Buffer->length = Packet->Buffer.Length; + Buffer->Address.BaseAddress = (uint8_t*)Packet - Queue->TxBuffers; + Buffer->Address.Offset = FIELD_OFFSET(XDP_TX_PACKET, FrameBuffer); + Buffer->Length = Packet->Buffer.Length; ProdCount++; } if (ProdCount > 0 || - (CompCount > 0 && XskRingProducerReserve(&Queue->TxRing, MAXUINT32, &TxIndex) != Queue->TxRing.size)) { + (CompCount > 0 && XskRingProducerReserve(&Queue->TxRing, MAXUINT32, &TxIndex) != Queue->TxRing.Size)) { XskRingProducerSubmit(&Queue->TxRing, ProdCount); if (Xdp->TxAlwaysPoke || XskRingProducerNeedPoke(&Queue->TxRing)) { XSK_NOTIFY_RESULT_FLAGS OutFlags; From 0ea857242f166a56a2c65cab090c6580659810fb Mon Sep 17 00:00:00 2001 From: Michael Friesen <3517159+mtfriesen@users.noreply.github.com> Date: Thu, 27 Jul 2023 13:19:42 -0400 Subject: [PATCH 2/2] wait for MSI to run --- scripts/prepare-machine.ps1 | 4 ++-- scripts/xdp-install.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/prepare-machine.ps1 b/scripts/prepare-machine.ps1 index b81599e035..29801514cb 100644 --- a/scripts/prepare-machine.ps1 +++ b/scripts/prepare-machine.ps1 @@ -246,7 +246,7 @@ function Install-Xdp-Driver { } Write-Host "Installing XDP driver" - msiexec.exe /i $XdpPath\bin\xdp-for-windows.msi /quiet + msiexec.exe /i $XdpPath\bin\xdp-for-windows.msi /quiet | Out-Null } # Completely removes the XDP driver and SDK. @@ -256,7 +256,7 @@ function Uninstall-Xdp { if (!(Test-Path $XdpPath)) { return; } Write-Host "Uninstalling XDP" - try { msiexec.exe /x $XdpPath\bin\xdp-for-windows.msi /quiet } catch {} + try { msiexec.exe /x $XdpPath\bin\xdp-for-windows.msi /quiet | Out-Null } catch {} rm -Force -Recurse $XdpPath -ErrorAction Ignore | Out-Null } diff --git a/scripts/xdp-install.ps1 b/scripts/xdp-install.ps1 index 4806649edf..75687a4557 100644 --- a/scripts/xdp-install.ps1 +++ b/scripts/xdp-install.ps1 @@ -39,7 +39,7 @@ if (!$Uninstall) { if ($InstallId) { Write-Output "Uninstalling old XDP driver" try { - msiexec.exe /x $InstallId /quiet + msiexec.exe /x $InstallId /quiet | Out-Null } catch { } } @@ -59,7 +59,7 @@ if (!$Uninstall) { # Install the XDP driver. Write-Host "Installing XDP driver" - msiexec.exe /i $XdpPath\bin\xdp-for-windows.msi /quiet + msiexec.exe /i $XdpPath\bin\xdp-for-windows.msi /quiet | Out-Null } elseif ($InstallId) { # Uninstall the XDP driver and delete the folder.