Submodule XDP (#3967)

.azure/azure-pipelines.perf.yml

@@ -171,7 +171,7 @@ stages:
         arch: ${{ parameters.arch }}
         tls: schannel
         config: Release
-        extraPrepareArgs: -DisableTest -InstallXdpSdk
+        extraPrepareArgs: -DisableTest
         ${{ if eq(parameters.pgo_mode, false) }}:
           extraBuildArgs: -DisableTest -DisableTools
         ${{ if eq(parameters.pgo_mode, true) }}:

.gitmodules

@@ -12,3 +12,7 @@
 [submodule "submodules/clog"]
 	path = submodules/clog
 	url = https://github.com/microsoft/CLOG.git
+[submodule "submodules/xdp-for-windows"]
+	path = submodules/xdp-for-windows
+	url = https://github.com/microsoft/xdp-for-windows.git
+	branch = release/1.0

Cargo.toml

@@ -32,6 +32,7 @@ include = [
     "/submodules/openssl/ssl",
     "/submodules/openssl/util",
     "/submodules/openssl/VMS",
+    "/submodules/xdp-for-windows/published/external",
     "/scripts/build.rs",
     "/src/*.rs",
     "/src/bin",
@@ -40,7 +41,6 @@ include = [
     "/src/generated",
     "/src/manifest",
     "/src/platform",
-    "/artifacts/xdp/include",
     "/THIRD-PARTY-NOTICES",
 ]
 

scripts/prepare-machine.ps1

@@ -67,9 +67,6 @@ param (
     [Parameter(Mandatory = $false)]
     [switch]$InstallJom,
 
-    [Parameter(Mandatory = $false)]
-    [switch]$InstallXdpSdk,
-
     [Parameter(Mandatory = $false)]
     [switch]$UseXdp,
 
@@ -123,7 +120,6 @@ if ($ForBuild) {
     # enabled for any possible build.
     $InstallNasm = $true
     $InstallJom = $true
-    $InstallXdpSdk = $true
     $InstallCoreNetCiDeps = $true; # For kernel signing certs
 }
 
@@ -151,8 +147,6 @@ if ($ForTest) {
 }
 
 if ($InstallXdpDriver) {
-    # The XDP SDK contains XDP driver, so ensure it's downloaded.
-    $InstallXdpSdk = $true
     $InstallSigningCertificates = $true;
 }
 
@@ -211,26 +205,6 @@ function Install-SigningCertificates {
     }
 }
 
-# Downloads the latest version of XDP (for building).
-function Install-Xdp-Sdk {
-    if (!$IsWindows) { return } # Windows only
-    $XdpPath = Join-Path $ArtifactsPath "xdp"
-    if ($Force) {
-        rm -Force -Recurse $XdpPath -ErrorAction Ignore | Out-Null
-    }
-    if (!(Test-Path $XdpPath)) {
-        Write-Host "Downloading XDP kit"
-        $ZipPath = Join-Path $ArtifactsPath "xdp.zip"
-        Invoke-WebRequest -Uri (Get-Content (Join-Path $PSScriptRoot "xdp.json") | ConvertFrom-Json).kit -OutFile $ZipPath
-        Write-Host "Extracting XDP kit"
-        Expand-Archive -Path $ZipPath -DestinationPath $XdpPath -Force
-        New-Item -Path "$ArtifactsPath\bin\xdp" -ItemType Directory -Force
-        Copy-Item -Path "$XdpPath\symbols\*" -Destination "$ArtifactsPath\bin\xdp" -Force
-        Copy-Item -Path "$XdpPath\bin\*" -Destination "$ArtifactsPath\bin\xdp" -Force
-        Remove-Item -Path $ZipPath
-    }
-}
-
 # Installs the XDP driver (for testing).
 # NB: XDP can be uninstalled via Uninstall-Xdp
 function Install-Xdp-Driver {
@@ -250,11 +224,6 @@ function Uninstall-Xdp {
         Write-Host "Uninstalling XDP driver"
         try { msiexec.exe /x $MsiPath /quiet | Out-Null } catch {}
     }
-    $XdpPath = Join-Path $ArtifactsPath "xdp"
-    if (Test-Path $XdpPath) {
-        Write-Host "Deleting XDP kit"
-        rm -Force -Recurse $XdpPath -ErrorAction Ignore | Out-Null
-    }
 }
 
 # Installs DuoNic from the CoreNet-CI repo.
@@ -478,6 +447,11 @@ if ($ForBuild -or $ForContainerBuild) {
     Write-Host "Initializing clog submodule"
     git submodule init submodules/clog
 
+    if (!$IsLinux) {
+        Write-Host "Initializing XDP-for-Windows submodule"
+        git submodule init submodules/xdp-for-windows
+    }
+
     if ($Tls -eq "openssl") {
         Write-Host "Initializing openssl submodule"
         git submodule init submodules/openssl
@@ -499,7 +473,6 @@ if ($ForBuild -or $ForContainerBuild) {
 if ($InstallCoreNetCiDeps) { Download-CoreNet-Deps }
 if ($InstallSigningCertificates) { Install-SigningCertificates }
 if ($InstallDuoNic) { Install-DuoNic }
-if ($InstallXdpSdk) { Install-Xdp-Sdk }
 if ($InstallXdpDriver) { Install-Xdp-Driver }
 if ($UninstallXdp) { Uninstall-Xdp }
 if ($InstallNasm) { Install-NASM }

scripts/xdp.json

@@ -1,4 +1,3 @@
 {
-    "kit" : "https://github.com/microsoft/xdp-for-windows/releases/download/v1.0.0/xdp-devkit-x64-1.0.0.zip",
     "installer": "https://github.com/microsoft/xdp-for-windows/releases/download/v1.0.0/xdp-for-windows.1.0.0.msi"
 }

src/platform/CMakeLists.txt

@@ -73,7 +73,7 @@ if ("${CX_PLATFORM}" STREQUAL "windows")
         platform
         PRIVATE
         ${EXTRA_PLATFORM_INCLUDE_DIRECTORIES}
-        ${PROJECT_SOURCE_DIR}/artifacts/xdp/include)
+        ${PROJECT_SOURCE_DIR}/submodules/xdp-for-windows/published/external)
 endif()
 
 if (MSVC AND (QUIC_TLS STREQUAL "openssl" OR QUIC_TLS STREQUAL "schannel") AND NOT QUIC_ENABLE_SANITIZERS)

submodules/xdp-for-windows

@@ -0,0 +1 @@
+Subproject commit dfd8b1de3a6a2783554b5e260f2890e6716080bd