Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consume XDP v0.17.0 #3779

Merged
merged 2 commits into from
Jul 28, 2023
Merged

Consume XDP v0.17.0 #3779

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d2e0ce
consume XDP v0.17.0
mtfriesen Jul 27, 2023
0ea8572
wait for MSI to run
mtfriesen Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions scripts/prepare-machine.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this automatically uninstalls anything previously installed? Is that why you removed the delete above?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It uninstalls anything that has been installed using this package. It would be an error for something else to leave XDP installed.

}

# Completely removes the XDP driver and SDK.
Expand All @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/xdp-devkit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
nibanks marked this conversation as resolved.
Show resolved Hide resolved
}
14 changes: 6 additions & 8 deletions scripts/xdp-install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
csujedihy marked this conversation as resolved.
Show resolved Hide resolved

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 { }
}

Expand All @@ -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
}
72 changes: 43 additions & 29 deletions src/platform/datapath_raw_xdp_win.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <wbemidl.h>
#include <afxdp_helper.h>
#include <xdpapi.h>
#include <xdpapi_experimental.h>
#include <stdio.h>

#ifdef QUIC_CLOG
Expand All @@ -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;
Expand Down Expand Up @@ -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);
nibanks marked this conversation as resolved.
Show resolved Hide resolved
}
}
CxPlatFree(Interface->Rules, RULE_TAG);
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -1023,6 +1026,8 @@ CxPlatDpRawInitialize(
goto Error;
}

Xdp->XdpQeoSet = (XDP_QEO_SET_FN *)Xdp->XdpApi->XdpGetRoutine(XDP_QEO_SET_FN_NAME);
nibanks marked this conversation as resolved.
Show resolved Hide resolved

CxPlatXdpReadConfig(Xdp);
Xdp->PollingIdleTimeoutUs = Config ? Config->PollingIdleTimeoutUs : 0;

Expand Down Expand Up @@ -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(
nibanks marked this conversation as resolved.
Show resolved Hide resolved
CONTAINING_RECORD(Entry, XDP_INTERFACE, Link)->XdpHandle,
Connections,
sizeof(Connections));
} else {
Status = E_NOINTERFACE;
}
if (QUIC_FAILED(Status)) {
QuicTraceEvent(
LibraryErrorStatus,
Expand Down Expand Up @@ -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,
mtfriesen marked this conversation as resolved.
Show resolved Hide resolved
Socket->LocalAddress.Ipv4.sin_port);
CxPlatLockRelease(&Interface->RuleLock);
} else {
CxPlatLockRelease(&Interface->RuleLock);
Expand All @@ -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,
Expand All @@ -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);
Expand All @@ -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);
}
Expand Down Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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;
Expand Down
Loading