Linux XDP support

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

@@ -65,6 +65,10 @@ on:
         required: false
         default: ''
         type: string
+      xdp:
+        required: false
+        default: ''
+        type: string
       sanitize:
         required: false
         default: ''
@@ -95,7 +99,7 @@ jobs:
         chown -R $(id -u):$(id -g) $PWD
     - name: Prepare Machine
       shell: pwsh
-      run: scripts/prepare-machine.ps1 ${{ inputs.plat == 'linux' && '-ForContainerBuild' || '-ForBuild' }} -Tls ${{ inputs.tls }}
+      run: scripts/prepare-machine.ps1 ${{ inputs.plat == 'linux' && '-ForContainerBuild' || '-ForBuild' }} -Tls ${{ inputs.tls }} ${{ inputs.xdp }}
     - name: Build For Test
       if: inputs.build == '-Test'
       shell: pwsh

.github/workflows/codeql-analysis.yml

@@ -41,7 +41,10 @@ jobs:
          sudo apt-add-repository ppa:lttng/stable-2.13
          sudo apt-get update
          sudo apt-get install -y liblttng-ust-dev libnuma-dev
+         sudo apt-get install -y libnl-3-dev libnl-genl-3-dev libnl-route-3-dev zlib1g-dev zlib1g pkg-config m4 clang libpcap-dev libelf-dev
+         sudo apt-get -y install --no-install-recommends libc6-dev-i386
          sudo sh scripts/install-powershell-docker.sh
+         sed -i '/BPF_CFLAGS += -I$(HEADER_DIR)/ { /${ARCH_INCLUDES}/! s|$| ${ARCH_INCLUDES}| }' submodules/xdp-tools/lib/libxdp/Makefile
          mkdir build
          cd build
          cmake ..

.github/workflows/test.yml

@@ -71,6 +71,7 @@ jobs:
           { config: "Debug", plat: "linux", os: "ubuntu-20.04", arch: "x64", tls: "openssl3", sanitize: "-Sanitize", build: "-Test" },
           { config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl", sanitize: "-Sanitize", build: "-Test" },
           { config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3", sanitize: "-Sanitize", build: "-Test" },
+          { config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3", build: "-Test" },
           { config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3", systemcrypto: "-UseSystemOpenSSLCrypto", sanitize: "-Sanitize", build: "-Test" },
         ]
     uses: ./.github/workflows/build-reuse-unix.yml
@@ -96,6 +97,7 @@ jobs:
           { config: "Debug", plat: "linux", os: "ubuntu-20.04", arch: "x64", tls: "openssl3", sanitize: "-Sanitize", build: "-Test"  },
           { config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl", sanitize: "-Sanitize", build: "-Test"  },
           { config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3", sanitize: "-Sanitize", build: "-Test"  },
+          { config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3", xdp: "-UseXdp", build: "-Test"  },
           { config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3", systemcrypto: "-UseSystemOpenSSLCrypto", sanitize: "-Sanitize", build: "-Test"  },
           { config: "Debug", plat: "windows", os: "windows-2019", arch: "x64", tls: "openssl", build: "-Test" },
           { config: "Debug", plat: "windows", os: "windows-2019", arch: "x64", tls: "openssl3", build: "-Test" },
@@ -142,13 +144,18 @@ jobs:
         $ManifestPath = ".\src\manifest\MsQuicEtw.man"
         wevtutil.exe um $ManifestPath
         wevtutil.exe im $ManifestPath /rf:$($MsQuicDll) /mf:$($MsQuicDll)
+    - name: Test
+      if: matrix.vec.os == 'ubuntu-22.04' && matrix.vec.xdp == '-UseXdp'
+      shell: bash
+      timeout-minutes: 120
+      run: sudo pwsh scripts/test.ps1 -Config ${{ matrix.vec.config }} -Arch ${{ matrix.vec.arch }} -Tls ${{ matrix.vec.tls }} -OsRunner ${{ matrix.vec.os }} -GHA -LogProfile Full.Light -GenerateXmlResults ${{ matrix.vec.xdp }} ${{ matrix.vec.qtip }}
     - name: Test
       if: matrix.vec.os == 'WinServerPrerelease'
       shell: pwsh
       timeout-minutes: 120
       run: scripts/test.ps1 -Config ${{ matrix.vec.config }} -Arch ${{ matrix.vec.arch }} -Tls ${{ matrix.vec.tls }} -GHA -LogProfile Full.Light -GenerateXmlResults ${{ matrix.vec.xdp }} ${{ matrix.vec.qtip }}
     - name: Test
-      if: matrix.vec.os != 'WinServerPrerelease'
+      if: matrix.vec.os != 'WinServerPrerelease' && !(matrix.vec.os == 'ubuntu-22.04' && matrix.vec.xdp == '-UseXdp')
       shell: pwsh
       timeout-minutes: 120
       run: scripts/test.ps1 -Config ${{ matrix.vec.config }} -Arch ${{ matrix.vec.arch }} -Tls ${{ matrix.vec.tls }} -OsRunner ${{ matrix.vec.os }} -GHA -LogProfile Full.Light -GenerateXmlResults ${{ matrix.vec.xdp }} ${{ matrix.vec.qtip }}

.gitmodules

@@ -12,6 +12,10 @@
 [submodule "submodules/clog"]
 	path = submodules/clog
 	url = https://github.com/microsoft/CLOG.git
+[submodule "submodules/xdp-tools"]
+	path = submodules/xdp-tools
+	url = https://github.com/xdp-project/xdp-tools.git
+	branch = v1.4.2
 [submodule "submodules/xdp-for-windows"]
 	path = submodules/xdp-for-windows
 	url = https://github.com/microsoft/xdp-for-windows.git

CMakeLists.txt

@@ -64,6 +64,11 @@ elseif (APPLE)
     set(CX_PLATFORM "darwin")
 elseif (UNIX)
     set(CX_PLATFORM "linux")
+    find_program(LSB_RELEASE lsb_release)
+    execute_process(COMMAND ${LSB_RELEASE} -rs
+      OUTPUT_VARIABLE UBUNTU_VERSION
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
 endif()
 message(STATUS "QUIC Platform: ${CX_PLATFORM}")
 
@@ -434,13 +439,13 @@ if (NOT MSVC AND NOT APPLE AND NOT ANDROID)
     endif()
 endif()
 
-if(WIN32)
-    if (CMAKE_GENERATOR_PLATFORM STREQUAL "")
-        string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} SYSTEM_PROCESSOR)
-    else()
-        string(TOLOWER ${CMAKE_GENERATOR_PLATFORM} SYSTEM_PROCESSOR)
-    endif()
+if (CMAKE_GENERATOR_PLATFORM STREQUAL "")
+string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} SYSTEM_PROCESSOR)
+else()
+string(TOLOWER ${CMAKE_GENERATOR_PLATFORM} SYSTEM_PROCESSOR)
+endif()
 
+if(WIN32)
     # Generate the MsQuicEtw header file.
     file(MAKE_DIRECTORY ${QUIC_BUILD_DIR}/inc)
 

scripts/DotNetTest.ps1

@@ -41,6 +41,7 @@ if ($IsWindows) {
 
 # Root directory of the project.
 $RootDir = Split-Path $PSScriptRoot -Parent
+$env:LD_LIBRARY_PATH = $RootArtifactDir
 
 dotnet build (Join-Path $RootDir src cs)
 dotnet run --project (Join-Path $RootDir src cs tool) -- (Join-Path $RootArtifactDir $LibName)

scripts/build.rs

@@ -19,7 +19,8 @@ fn main() {
     config
         .define("QUIC_ENABLE_LOGGING", logging_enabled)
         .define("QUIC_TLS", "openssl")
-        .define("QUIC_OUTPUT_DIR", "../lib");
+        .define("QUIC_OUTPUT_DIR", "../lib")
+        .define("CARGO_BUILD", "on");
 
     match target.as_str() {
         "x86_64-apple-darwin" => config
@@ -34,4 +35,4 @@ fn main() {
     let dst = config.build();
     let lib_path = Path::join(Path::new(&dst), Path::new(path_extra));
     println!("cargo:rustc-link-search=native={}", lib_path.display());
-}
+}

scripts/duonic.sh

@@ -0,0 +1,102 @@
+#!/bin/bash
+
+# Set the number of NIC pairs
+NumNicPairs=1
+
+if [ "$1" == "install" ]; then
+    # Configure each pair separately with its own hard-coded subnet, ie 192.168.x.0/24 and fc00::x/112
+    for ((i=1; i<=NumNicPairs; i++)); do
+        echo "Plumbing IP config for pair $i"
+
+        # Generate the "ID" of the NICs, eg 1 and 2 for the first pair
+        nic1="duo$((i * 2 - 1))"
+        nic2="duo$((i * 2))"
+
+        # Create veth pair
+        sudo ip link add ${nic1} type veth peer name ${nic2}
+
+        # Set the veth interfaces up
+        sudo ip link set ${nic1} up
+        sudo ip link set ${nic2} up
+
+        # Assign IPv4 addresses
+        sudo ip addr add 192.168.${i}.11/24 dev ${nic1}
+        sudo ip addr add 192.168.${i}.12/24 dev ${nic2}
+
+        # Assign IPv6 addresses
+        sudo ip -6 addr add fc00::${i}:11/112 dev ${nic1}
+        sudo ip -6 addr add fc00::${i}:12/112 dev ${nic2}
+
+        # Add static neighbor entries (ARP)
+        sudo ip neigh add 192.168.${i}.12 lladdr 22:22:22:22:00:0$((i * 2)) dev ${nic1} nud permanent
+        sudo ip neigh add 192.168.${i}.11 lladdr 22:22:22:22:00:0$((i * 2 - 1)) dev ${nic2} nud permanent
+
+        # Add static neighbor entries (IPv6)
+        sudo ip -6 neigh add fc00::${i}:12 lladdr 22:22:22:22:00:0$((i * 2)) dev ${nic1} nud permanent
+        sudo ip -6 neigh add fc00::${i}:11 lladdr 22:22:22:22:00:0$((i * 2 - 1)) dev ${nic2} nud permanent
+
+        # Configure routing rules for IPv4
+        sudo ip route add 192.168.${i}.12/32 dev ${nic1} metric 0
+        sudo ip route add 192.168.${i}.11/32 dev ${nic2} metric 0
+
+
+
+        # Configure routing rules for IPv6
+        sudo ip -6 route add fc00::${i}:12/128 dev ${nic1} metric 0
+        sudo ip -6 route add fc00::${i}:11/128 dev ${nic2} metric 0
+
+        # Configure firewall rules for IPv4
+        sudo iptables -A INPUT -p all -s 192.168.${i}.0/24 -i ${nic1} -j ACCEPT
+        sudo iptables -A INPUT -p all -s 192.168.${i}.0/24 -i ${nic2} -j ACCEPT
+
+        # Configure firewall rules for IPv6
+        sudo ip6tables -A INPUT -p all -s fc00::${i}:0/112 -i ${nic1} -j ACCEPT
+        sudo ip6tables -A INPUT -p all -s fc00::${i}:0/112 -i ${nic2} -j ACCEPT
+
+        sleep 2
+        sudo ip route change 192.168.${i}.12 dev duo1 src 192.168.${i}.11
+        sudo ip route change 192.168.${i}.11 dev duo2 src 192.168.${i}.12
+
+        sudo ip -6 route change fc00::${i}:12 dev duo1 src fc00::${i}:11
+        sudo ip -6 route change fc00::${i}:11 dev duo2 src fc00::${i}:12
+    done
+elif [ "$1" == "uninstall" ]; then
+    # Cleanup each pair separately
+    for ((i=1; i<=NumNicPairs; i++)); do
+        echo "Cleaning up pair $i"
+
+        # Generate the "ID" of the NICs, eg 1 and 2 for the first pair
+        nic1="duo$((i * 2 - 1))"
+        nic2="duo$((i * 2))"
+
+        # Delete firewall rules for IPv4
+        sudo iptables -D INPUT -p all -s 192.168.${i}.0/24 -i ${nic1} -j ACCEPT
+        sudo iptables -D INPUT -p all -s 192.168.${i}.0/24 -i ${nic2} -j ACCEPT
+
+        # Delete firewall rules for IPv6
+        sudo ip6tables -D INPUT -p all -s fc00::${i}:0/112 -i ${nic1} -j ACCEPT
+        sudo ip6tables -D INPUT -p all -s fc00::${i}:0/112 -i ${nic2} -j ACCEPT
+
+        # Remove routing rules for IPv4
+        sudo ip route del 192.168.${i}.12/32 dev ${nic1}
+        sudo ip route del 192.168.${i}.11/32 dev ${nic2}
+
+        # Remove routing rules for IPv6
+        sudo ip -6 route del fc00::${i}:12/128 dev ${nic1}
+        sudo ip -6 route del fc00::${i}:11/128 dev ${nic2}
+
+        # Remove static neighbor entries (ARP)
+        sudo ip neigh del 192.168.${i}.12 lladdr 22:22:22:22:00:0$((i * 2)) dev ${nic1}
+        sudo ip neigh del 192.168.${i}.11 lladdr 22:22:22:22:00:0$((i * 2 - 1)) dev ${nic2}
+
+        # Remove static neighbor entries (IPv6)
+        sudo ip -6 neigh del fc00::${i}:12 lladdr 22:22:22:22:00:0$((i * 2)) dev ${nic1}
+        sudo ip -6 neigh del fc00::${i}:11 lladdr 22:22:22:22:00:0$((i * 2 - 1)) dev ${nic2}
+
+        # Remove the veth pair
+        sudo ip link delete ${nic1}
+    done
+else
+    echo "Usage: $0 {install|uninsatll}"
+    exit 1
+fi

scripts/prepare-machine.ps1

@@ -228,13 +228,18 @@ function Uninstall-Xdp {
 
 # Installs DuoNic from the CoreNet-CI repo.
 function Install-DuoNic {
-    if (!$IsWindows) { return } # Windows only
     # Install the DuoNic driver.
-    Write-Host "Installing DuoNic driver"
-    $DuoNicPath = Join-Path $SetupPath duonic
-    $DuoNicScript = (Join-Path $DuoNicPath duonic.ps1)
-    if (!(Test-Path $DuoNicScript)) { Write-Error "Missing file: $DuoNicScript" }
-    Invoke-Expression "cmd /c `"pushd $DuoNicPath && pwsh duonic.ps1 -Install`""
+    if ($IsWindows) {
+        Write-Host "Installing DuoNic driver"
+        $DuoNicPath = Join-Path $SetupPath duonic
+        $DuoNicScript = (Join-Path $DuoNicPath duonic.ps1)
+        if (!(Test-Path $DuoNicScript)) { Write-Error "Missing file: $DuoNicScript" }
+        Invoke-Expression "cmd /c `"pushd $DuoNicPath && pwsh duonic.ps1 -Install`""
+    } elseif ($IsLinux) {
+        Write-Host "Creating DuoNic endpoints"
+        $DuoNicScript = Join-Path $PSScriptRoot "duonic.sh"
+        Invoke-Expression "sudo bash $DuoNicScript install"
+    }
 }
 
 function Update-Path($NewPath) {
@@ -468,6 +473,12 @@ if ($ForBuild -or $ForContainerBuild) {
     }
 
     git submodule update --jobs=8
+    if ($IsLinux) {
+        Write-Host "Initializing xdp-tools submodules"
+        git submodule update --init --recursive --jobs=8 submodules/xdp-tools
+        # temporal workaround for libxdp v1.4.0
+        sed -i '/BPF_CFLAGS += -I$(HEADER_DIR)/ { /${ARCH_INCLUDES}/! s|$| ${ARCH_INCLUDES}| }' submodules/xdp-tools/lib/libxdp/Makefile
+    }
 }
 
 if ($InstallCoreNetCiDeps) { Download-CoreNet-Deps }
@@ -504,6 +515,10 @@ if ($IsLinux) {
         sudo apt-get install -y ruby ruby-dev rpm
         sudo gem install public_suffix -v 4.0.7
         sudo gem install fpm
+
+        # XDP dependencies
+        sudo apt-get -y install libnl-3-dev libnl-genl-3-dev libnl-route-3-dev zlib1g-dev zlib1g pkg-config m4 clang libpcap-dev libelf-dev
+        sudo apt-get -y install --no-install-recommends libc6-dev-i386
     }
 
     if ($ForTest) {
@@ -512,6 +527,11 @@ if ($IsLinux) {
         sudo apt-get install -y lttng-tools
         sudo apt-get install -y liblttng-ust-dev
         sudo apt-get install -y gdb
+        sudo apt-get install -y libnl-3-200 libnl-route-3-200 libnl-genl-3-200
+        if ($UseXdp) {
+            sudo apt-get -y install iproute2 iptables
+            Install-DuoNic
+        }
 
         # Enable core dumps for the system.
         Write-Host "Setting core dump size limit"

scripts/test.ps1

@@ -217,17 +217,23 @@ if ($CodeCoverage) {
     }
 }
 
-if ($UseXdp) {
-    # Helper for XDP usage
-    $DuoNic = $true
-}
-
 $BuildConfig = & (Join-Path $PSScriptRoot get-buildconfig.ps1) -Tls $Tls -Arch $Arch -ExtraArtifactDir $ExtraArtifactDir -Config $Config
 
 $Tls = $BuildConfig.Tls
 $Arch = $BuildConfig.Arch
 $RootArtifactDir = $BuildConfig.ArtifactsDir
 
+if ($UseXdp) {
+    # Helper for XDP usage
+    $DuoNic = $true
+    if ($IsLinux) {
+        # Temporal feature flag for Linux
+        $env:MSQUIC_ENABLE_XDP = 1
+        $env:LIBXDP_OBJECT_PATH = $RootArtifactDir
+        $env:MSQUIC_XDP_OBJECT_PATH = $RootArtifactDir
+    }
+}
+
 # Root directory of the project.
 $RootDir = Split-Path $PSScriptRoot -Parent