Unify datapath

.azure/OneBranch.Official.yml

@@ -86,22 +86,6 @@ extends:
         parameters:
           config: Debug
 
-    - stage: build_windows_xdp
-      displayName: Build Windows XDP
-      dependsOn: []
-      jobs:
-      - template: .azure/obtemplates/build-winuser-xdp.yml@self
-        parameters:
-          config: Release
-          tls: schannel
-      - template: .azure/obtemplates/build-winuser-xdp.yml@self
-        parameters:
-          config: Release
-          tls: openssl
-      - template: .azure/obtemplates/build-winuser-xdp.yml@self
-        parameters:
-          config: Debug
-
     - stage: build_windows
       displayName: Build Windows
       dependsOn: []
@@ -204,7 +188,6 @@ extends:
       dependsOn:
       - build_windows
       - build_uwp
-      - build_windows_xdp
       jobs:
       - template: .azure/obtemplates/build-nuget.yml@self
         ${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags/') }}:

.azure/OneBranch.PullRequest.yml

@@ -82,22 +82,6 @@ extends:
         parameters:
           config: Debug
 
-    - stage: build_windows_xdp
-      displayName: Build Windows XDP
-      dependsOn: []
-      jobs:
-      - template: .azure/obtemplates/build-winuser-xdp.yml@self
-        parameters:
-          config: Release
-          tls: schannel
-      - template: .azure/obtemplates/build-winuser-xdp.yml@self
-        parameters:
-          config: Release
-          tls: openssl
-      - template: .azure/obtemplates/build-winuser-xdp.yml@self
-        parameters:
-          config: Debug
-
     - stage: build_windows
       displayName: Build Windows
       dependsOn: []
@@ -198,6 +182,5 @@ extends:
       dependsOn:
       - build_windows
       - build_uwp
-      - build_windows_xdp
       jobs:
       - template: .azure/obtemplates/build-nuget.yml@self

.azure/azure-pipelines.perf.yml

@@ -157,7 +157,7 @@ stages:
         arch: ${{ parameters.arch }}
         config: Release
 
-- ${{ if or(eq(parameters.winkernel, true), eq(parameters.winuser_schannel, true)) }}:
+- ${{ if or(eq(parameters.winkernel, true), eq(parameters.winuser_schannel, true), eq(parameters.winuser_xdp, true)) }}:
   - stage: build_winuser_schannel
     displayName: Build Windows (Schannel)
     dependsOn: []
@@ -177,27 +177,6 @@ stages:
         ${{ if eq(parameters.pgo_mode, true) }}:
           extraBuildArgs: -DisableTest -DisableTools -PGO
 
-- ${{ if eq(parameters.winuser_xdp, true) }}:
-  - stage: build_winuser_xdp
-    displayName: Build Windows (XDP)
-    dependsOn: []
-    variables:
-      runCodesignValidationInjection: false
-    jobs:
-    - template: ./templates/build-config-user.yml
-      parameters:
-        image: windows-latest
-        platform: windows
-        arch: ${{ parameters.arch }}
-        tls: schannel
-        config: Release
-        extraName: 'xdp'
-        extraPrepareArgs: -DisableTest -InstallXdpSdk
-        ${{ if eq(parameters.pgo_mode, false) }}:
-          extraBuildArgs: -DisableTest -DisableTools -UseXdp -ExtraArtifactDir Xdp
-        ${{ if eq(parameters.pgo_mode, true) }}:
-          extraBuildArgs: -DisableTest -DisableTools -UseXdp -ExtraArtifactDir Xdp -PGO
-
 - ${{ if eq(parameters.winuser_openssl, true) }}:
   - stage: build_winuser_openssl
     displayName: Build Windows (OpenSSL)
@@ -331,7 +310,7 @@ stages:
   - stage: perf_winuser_xdp
     displayName: Performance Testing Windows (XDP)
     dependsOn:
-    - build_winuser_xdp
+    - build_winuser_schannel
     jobs:
     - template: ./templates/run-performance.yml
       parameters:
@@ -344,7 +323,6 @@ stages:
         protocol: ${{ parameters.protocol }}
         logProfile: ${{ parameters.logging }}
         timeout: ${{ parameters.timeout }}
-        extraArtifactDir: '_Xdp'
         ${{ if eq(parameters.QTIP, true) }}:
           extraTestArgs: -ExtraArtifactDir _Xdp -XDP -QTIP
         ${{ else }}:

.azure/azure-pipelines.periodic.yml

@@ -84,7 +84,7 @@ stages:
       config: Release
       extraName: 'xdp'
       extraPrepareArgs: -DisableTest -InstallXdpSdk
-      extraBuildArgs: -DisableTest -DisableTools -UseXdp -ExtraArtifactDir Xdp -PGO
+      extraBuildArgs: -DisableTest -DisableTools -ExtraArtifactDir Xdp -PGO
 
 #
 # Performance Tests

.azure/obtemplates/build-winuser.yml

@@ -13,6 +13,13 @@ jobs:
     ob_sdl_binskim_break: true # https://aka.ms/obpipelines/sdl
     ob_sdl_codeSignValidation_excludes: -|**\*.exe # Disable signing requirements for test executables
   steps:
+  - task: PowerShell@2
+    displayName: Prepare Build Machine
+    target: windows_build_container2
+    inputs:
+      pwsh: true
+      filePath: scripts/prepare-machine.ps1
+      arguments: -InstallXdpSdk -ForContainerBuild
   - task: PowerShell@2
     displayName: x64
     target: windows_build_container2

.github/workflows/build-reuse-win.yml

@@ -47,10 +47,6 @@ on:
         #   - openssl
         #   - openssl3
         #   - schannel
-      xdp:
-        required: false
-        default: ''
-        type: string
       static:
         required: false
         default: ''
@@ -89,11 +85,11 @@ jobs:
     - name: Build For Test
       if: inputs.test == '-Test'
       shell: pwsh
-      run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} -Tls ${{ inputs.tls }} -DisablePerf -DynamicCRT ${{ inputs.xdp }} ${{ inputs.sanitize }}
+      run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} -Tls ${{ inputs.tls }} -DisablePerf -DynamicCRT ${{ inputs.sanitize }}
     - name: Build
       if: inputs.test == ''
       shell: pwsh
-      run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} -Tls ${{ inputs.tls }} ${{ inputs.xdp }} ${{ inputs.sanitize }} ${{ inputs.static }}
+      run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} -Tls ${{ inputs.tls }} ${{ inputs.sanitize }} ${{ inputs.static }}
     - name: Filter Build Artifacts
       shell: pwsh
       run: |
@@ -103,5 +99,5 @@ jobs:
     - name: Upload build artifacts
       uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
       with:
-        name: ${{ inputs.config }}-${{ inputs.plat }}-${{ inputs.os }}-${{ inputs.arch }}-${{ inputs.tls }}${{ inputs.xdp }}${{ inputs.sanitize }}${{ inputs.static }}${{ inputs.test }}
+        name: ${{ inputs.config }}-${{ inputs.plat }}-${{ inputs.os }}-${{ inputs.arch }}-${{ inputs.tls }}${{ inputs.sanitize }}${{ inputs.static }}${{ inputs.test }}
         path: artifacts

.github/workflows/build.yml

@@ -32,7 +32,6 @@ jobs:
         arch: [x86, x64, arm64]
         tls: [schannel, openssl, openssl3]
         static: ['', '-Static']
-        xdp: ['', '-UseXdp']
         exclude:
         # OpenSSL doesn't support arm64
         - tls: openssl
@@ -46,15 +45,6 @@ jobs:
         # TODO: FIX: Static builds fail with UWP
         - plat: uwp
           static: '-Static'
-        # XDP not supported in UWP
-        - plat: uwp
-          xdp: '-UseXdp'
-        # XDP only supports x64 currently
-        - arch: x86
-          xdp: '-UseXdp'
-        # XDP only supports x64 currently
-        - arch: arm64
-          xdp: '-UseXdp'
     uses: ./.github/workflows/build-reuse-win.yml
     with:
       config: ${{ matrix.config }}
@@ -63,7 +53,6 @@ jobs:
       arch: ${{ matrix.arch }}
       tls: ${{ matrix.tls }}
       static: ${{ matrix.static }}
-      xdp: ${{ matrix.xdp }}
 
   build-windows-kernel:
     name: WinKernel
@@ -201,8 +190,6 @@ jobs:
           { plat: "uwp",  tls: "openssl", arg: "-UWP" },
           { plat: "windows",  tls: "openssl" },
           { plat: "windows",  tls: "schannel" },
-          { plat: "windows",  tls: "openssl", xdp: "-UseXdp", arg: "-XDP" },
-          { plat: "windows",  tls: "schannel", xdp: "-UseXdp", arg: "-XDP" },
         ]
     runs-on: windows-2022
     steps:
@@ -211,19 +198,19 @@ jobs:
     - name: Download Build Artifacts
       uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615
       with:
-        name: Release-${{ matrix.vec.plat }}-windows-2022-x86-${{ matrix.vec.tls }}${{ matrix.vec.xdp }}
+        name: Release-${{ matrix.vec.plat }}-windows-2022-x86-${{ matrix.vec.tls }}
         path: artifacts
         if_no_artifact_found: ignore
     - name: Download Build Artifacts
       uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615
       with:
-        name: Release-${{ matrix.vec.plat }}-windows-2022-x64-${{ matrix.vec.tls }}${{ matrix.vec.xdp }}
+        name: Release-${{ matrix.vec.plat }}-windows-2022-x64-${{ matrix.vec.tls }}
         path: artifacts
         if_no_artifact_found: ignore
     - name: Download Build Artifacts
       uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615
       with:
-        name: Release-${{ matrix.vec.plat }}-windows-2022-arm64-${{ matrix.vec.tls }}${{ matrix.vec.xdp }}
+        name: Release-${{ matrix.vec.plat }}-windows-2022-arm64-${{ matrix.vec.tls }}
         path: artifacts
         if_no_artifact_found: ignore
     - name: Build Package
@@ -232,5 +219,5 @@ jobs:
     - name: Upload build artifacts
       uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
       with:
-        name: Nuget-Release-${{ matrix.vec.plat }}-windows-2022-arm64-${{ matrix.vec.tls }}${{ matrix.vec.xdp }}
+        name: Nuget-Release-${{ matrix.vec.plat }}-windows-2022-arm64-${{ matrix.vec.tls }}
         path: artifacts/dist/*.nupkg

.github/workflows/cargo.yml

@@ -45,4 +45,4 @@ jobs:
     - name: Cargo test
       run: cargo test --all
     - name: Cargo Publish (dry run)
-      run: cargo publish --dry-run
+      run: cargo publish --dry-run --allow-dirty

.github/workflows/code-coverage.yml

@@ -59,7 +59,7 @@ jobs:
     - name: Download Build Artifacts
       uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
       with:
-        name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.xdp }}${{ matrix.vec.sanitize }}${{ matrix.vec.test }}
+        name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.sanitize }}${{ matrix.vec.test }}
         path: artifacts
     - name: Prepare Machine
       run: scripts/prepare-machine.ps1 -Tls ${{ matrix.vec.tls }} -ForTest ${{ matrix.vec.xdp }} -InstallCodeCoverage
@@ -79,7 +79,7 @@ jobs:
     - name: Upload Results
       uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
       with:
-        name: BVT-${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.xdp }}${{ matrix.vec.qtip }}${{ matrix.vec.systemcrypto }}${{ matrix.vec.sanitize }}
+        name: BVT-${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.qtip }}${{ matrix.vec.systemcrypto }}${{ matrix.vec.sanitize }}
         path: artifacts/coverage/*.cov
 
   stress-winlatest:
@@ -109,7 +109,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
       with:
-        name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.xdp }}${{ matrix.vec.sanitize }}${{ matrix.vec.test }}
+        name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.sanitize }}${{ matrix.vec.test }}
         path: artifacts
     - name: Prepare Machine
       run: scripts/prepare-machine.ps1 -Tls ${{ matrix.vec.tls }} -ForTest ${{ matrix.vec.xdp }} -InstallCodeCoverage

.github/workflows/stress.yml

@@ -28,15 +28,10 @@ jobs:
         vec: [
           { config: "Debug", plat: "windows", os: "windows-2019", arch: "x64", tls: "openssl", test: "-Test" },
           { config: "Debug", plat: "windows", os: "windows-2019", arch: "x64", tls: "openssl3", test: "-Test" },
-          { config: "Debug", plat: "windows", os: "windows-2019", arch: "x64", tls: "openssl", xdp: "-UseXdp", test: "-Test" },
-          { config: "Debug", plat: "windows", os: "windows-2019", arch: "x64", tls: "openssl3", xdp: "-UseXdp", test: "-Test" },
           { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "schannel", test: "-Test" },
           { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "schannel", sanitize: "-Sanitize", test: "-Test" },
-          { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "schannel", xdp: "-UseXdp", sanitize: "-Sanitize", test: "-Test" },
           { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl", test: "-Test" },
-          { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl", xdp: "-UseXdp", test: "-Test" },
           { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3", test: "-Test" },
-          { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3", xdp: "-UseXdp", test: "-Test" }
         ]
     uses: ./.github/workflows/build-reuse-win.yml
     with:
@@ -45,7 +40,6 @@ jobs:
       os: ${{ matrix.vec.os }}
       arch: ${{ matrix.vec.arch }}
       tls: ${{ matrix.vec.tls }}
-      xdp: ${{ matrix.vec.xdp }}
       sanitize: ${{ matrix.vec.sanitize }}
       test: ${{ matrix.vec.test }}
 
@@ -108,7 +102,7 @@ jobs:
     - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
       if: matrix.vec.plat == 'windows'
       with:
-        name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os == 'WSPrerelease' && 'windows-2022' || matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.xdp }}${{ matrix.vec.sanitize }}${{ matrix.vec.test }}
+        name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os == 'WSPrerelease' && 'windows-2022' || matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.sanitize }}${{ matrix.vec.test }}
         path: artifacts
     - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
       if: matrix.vec.plat == 'linux' || matrix.vec.plat == 'macos'

.github/workflows/test.yml

@@ -46,15 +46,10 @@ jobs:
         vec: [
           { config: "Debug", plat: "windows", os: "windows-2019", arch: "x64", tls: "openssl", test: "-Test" },
           { config: "Debug", plat: "windows", os: "windows-2019", arch: "x64", tls: "openssl3", test: "-Test" },
-          { config: "Debug", plat: "windows", os: "windows-2019", arch: "x64", tls: "openssl", xdp: "-UseXdp", test: "-Test" },
-          { config: "Debug", plat: "windows", os: "windows-2019", arch: "x64", tls: "openssl3", xdp: "-UseXdp", test: "-Test" },
           { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "schannel", test: "-Test" },
           { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "schannel", sanitize: "-Sanitize", test: "-Test" },
-          { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "schannel", xdp: "-UseXdp", sanitize: "-Sanitize", test: "-Test" },
           { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl", test: "-Test" },
-          { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl", xdp: "-UseXdp", test: "-Test" },
           { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3", test: "-Test" },
-          { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3", xdp: "-UseXdp", test: "-Test" },
           { config: "Release", plat: "windows", os: "windows-2022", arch: "x64", tls: "schannel", test: "-Test" }
         ]
     uses: ./.github/workflows/build-reuse-win.yml
@@ -64,7 +59,6 @@ jobs:
       os: ${{ matrix.vec.os }}
       arch: ${{ matrix.vec.arch }}
       tls: ${{ matrix.vec.tls }}
-      xdp: ${{ matrix.vec.xdp }}
       sanitize: ${{ matrix.vec.sanitize }}
       test: ${{ matrix.vec.test }}
 
@@ -127,7 +121,7 @@ jobs:
       uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
       if: matrix.vec.plat == 'windows'
       with: # note that BVT for WSPrerelease uses binaries built on windows-2022.
-        name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os == 'WSPrerelease' && 'windows-2022' || matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.xdp }}${{ matrix.vec.sanitize }}${{ matrix.vec.test }}
+        name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os == 'WSPrerelease' && 'windows-2022' || matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.sanitize }}${{ matrix.vec.test }}
         path: artifacts
     - name: Download Build Artifacts
       uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
@@ -234,7 +228,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
       with:
-        name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.xdp }}${{ matrix.vec.sanitize }}${{ matrix.vec.test }}
+        name: ${{ matrix.vec.config }}-${{ matrix.vec.plat }}-${{ matrix.vec.os }}-${{ matrix.vec.arch }}-${{ matrix.vec.tls }}${{ matrix.vec.sanitize }}${{ matrix.vec.test }}
         path: artifacts
     - name: Prepare Machine
       run: scripts/prepare-machine.ps1 -ForTest ${{ matrix.vec.xdp }}