consume ebpf 0.20.0 and clean up

microsoft · Dec 9, 2024 · 2c6d847 · 2c6d847
1 parent 6d1aa1a
commit 2c6d847
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 66 deletions.
diff --git a/published/external/xdp/ebpfhook.h b/published/external/xdp/ebpfhook.h
@@ -12,13 +12,6 @@
 extern "C" {
 #endif
 
-//
-// Older versions of eBPF defined conflicting versions of XDP structures.
-// Define XDP versions only if eBPF has not already defined them.
-//
-
-#ifndef XDP_EXT_HELPER_FN_BASE
-
 typedef struct xdp_md_ {
     void *data;               ///< Pointer to start of packet data.
     void *data_end;           ///< Pointer to end of packet data.
@@ -51,8 +44,6 @@ xdp_hook_t(
     xdp_md_t *context
     );
 
-#endif // XDP_EXT_HELPER_FN_BASE
-
 #ifdef __cplusplus
 } // extern "C"
 #endif

diff --git a/src/xdp.props b/src/xdp.props
@@ -16,15 +16,12 @@
     <ResolveNuGetPackages>false</ResolveNuGetPackages>
     <HostPlatform>$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)</HostPlatform>
     <XdpWdkVersion>10.0.26100.2161</XdpWdkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)' != 'x64'">
-    <RestoreAdditionalProjectSources>$(SolutionDir)artifacts/nuget</RestoreAdditionalProjectSources>
+    <XdpEbpfVersion>0.20.0</XdpEbpfVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- eBPF currently has separate packages for each architecture. -->
-    <PackageReference Include="eBPF-for-Windows" Version="0.18.0" GeneratePathProperty="true" Condition="'$(ImportEbpf)' == 'true' AND '$(Platform)' == 'x64'"/>
-    <PackageReference Include="eBPF-for-Windows.arm64" Version="0.20.0" GeneratePathProperty="true" Condition="'$(ImportEbpf)' == 'true' AND '$(Platform)' != 'x64'"/>
-    <PackageReference Include="eBPF-for-Windows.x64" Version="0.20.0" GeneratePathProperty="true" Condition="'$(ImportEbpf)' == 'true' AND '$(Platform)' != 'x64'"/>
+    <PackageReference Include="eBPF-for-Windows.$(Platform)" Version="$(XdpEbpfVersion)" GeneratePathProperty="true" Condition="'$(ImportEbpf)' == 'true'"/>
+    <PackageReference Include="eBPF-for-Windows.$(HostPlatform)" Version="$(XdpEbpfVersion)" GeneratePathProperty="true" Condition="'$(ImportEbpf)' == 'true' AND '$(HostPlatform)' != '$(Platform)'"/>
     <PackageReference Include="Microsoft.Build.Tasks.Git" Version="1.0.0" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.SourceLink.Common" Version="1.0.0" />
@@ -37,7 +34,4 @@
   <PropertyGroup>
     <WntPackagePath>$(Pkgwin-net-test)\</WntPackagePath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)' == 'x64'">
-    <EbpfHostBinPath>$(EbpfBinPath)</EbpfHostBinPath>
-  </PropertyGroup>
 </Project>
diff --git a/tools/common.ps1 b/tools/common.ps1
@@ -105,7 +105,7 @@ function Get-EbpfInstallPath {
 }
 
 function Get-EbpfMsiVersion {
-    return "0.18.0"
+    return "0.20.0"
 }
 
 # Returns the eBPF MSI full path
@@ -116,7 +116,7 @@ function Get-EbpfMsiFullPath {
     )
     $RootDir = Split-Path $PSScriptRoot -Parent
     $EbpfVersion = Get-EbpfMsiVersion
-    return "$RootDir\artifacts\ebpfmsi\ebpf-for-windows.$EbpfVersion.$Platform.msi"
+    return "$RootDir\artifacts\ebpfmsi\ebpf-for-windows.$Platform.$EbpfVersion.msi"
 }
 
 function Get-EbpfMsiUrl {
@@ -125,11 +125,7 @@ function Get-EbpfMsiUrl {
         [string]$Platform
     )
     $EbpfVersion = Get-EbpfMsiVersion -Platform $Platform
-    if ($Platform -eq "x64") {
-        return "https://github.com/microsoft/ebpf-for-windows/releases/download/Release-v$EbpfVersion/ebpf-for-windows.$EbpfVersion.msi"
-    } else {
-        return "https://github.com/microsoft/xdp-for-windows/releases/download/main-prerelease/ebpf-for-windows.$Platform.0.20.0.msi"
-    }
+    return "https://github.com/microsoft/ebpf-for-windows/releases/download/Release-v$EbpfVersion/ebpf-for-windows.$Platform.$EbpfVersion.msi"
 }
 
 function Get-FnVersion {

diff --git a/tools/prepare-machine.ps1 b/tools/prepare-machine.ps1
@@ -83,7 +83,6 @@ $RootDir = Split-Path $PSScriptRoot -Parent
 . $RootDir\tools\common.ps1
 
 $ArtifactsDir = "$RootDir\artifacts"
-$NugetDir = "$ArtifactsDir/nuget"
 
 if (!$ForBuild -and !$ForEbpfBuild -and !$ForTest -and !$ForFunctionalTest -and !$ForSpinxskTest -and !$ForPerfTest -and !$ForLogging) {
     Write-Error 'Must one of -ForBuild, -ForTest, -ForFunctionalTest, -ForSpinxskTest, -ForPerfTest, or -ForLogging'
@@ -116,36 +115,6 @@ function Download-CoreNet-Deps {
     }
 }
 
-function Download-eBpf-Nuget {
-    param (
-        [Parameter()]
-        [string]$Platform
-    )
-    # Download private eBPF Nuget package.
-    $EbpfNugetVersion = "eBPF-for-Windows.$Platform.0.20.0"
-    $EbpfNugetBuild = ""
-    $EbpfNuget = "$EbpfNugetVersion$EbpfNugetBuild.nupkg"
-    $EbpfNugetUrl = "https://github.com/microsoft/xdp-for-windows/releases/download/main-prerelease/$EbpfNugetVersion$EbpfNugetBuild.nupkg"
-    $EbpfNugetRestoreDir = "$RootDir/packages/$EbpfNugetVersion"
-
-    if ($Force -and (Test-Path $NugetDir)) {
-        Remove-Item -Recurse -Force $NugetDir
-    }
-    if (!(Test-Path $NugetDir)) {
-        mkdir $NugetDir | Write-Verbose
-    }
-
-    if (!(Test-Path $NugetDir/$EbpfNuget)) {
-        # Remove any old builds of the package.
-        if (Test-Path $EbpfNugetRestoreDir) {
-            Remove-Item -Recurse -Force $EbpfNugetRestoreDir
-        }
-        Remove-Item -Force $NugetDir/$EbpfNugetVersion*
-
-        Invoke-WebRequest-WithRetry -Uri $EbpfNugetUrl -OutFile $NugetDir/$EbpfNuget
-    }
-}
-
 function Download-Ebpf-Msi {
     # Download and extract private eBPF installer MSI package.
     $EbpfMsiFullPath = Get-EbpfMsiFullPath -Platform $Platform
@@ -259,16 +228,7 @@ if ($Cleanup) {
     }
 } else {
     if ($ForBuild) {
-        if (!(Test-Path $NugetDir)) {
-            mkdir $NugetDir | Write-Verbose
-        }
-
-        if ($Platform -eq "arm64") {
-            # Download prerelease versions for arm64, and a matching x64 for
-            # local cross-compile (bpf2c) binaries.
-            Download-eBpf-Nuget -Platform arm64
-            Download-eBpf-Nuget -Platform x64
-        }
+        # There are currently no pre-build steps required.
     }
 
     if ($ForEbpfBuild) {