Skip to content

Commit

Permalink
Release v0.9.1 (#2534)
Browse files Browse the repository at this point in the history
* Fix build errors with Visual Studio 17.6.0 (#2483)

* Fix build errors with Visual Studio 17.6.0

Signed-off-by: Dave Thaler <[email protected]>

* PR feedback

Signed-off-by: Dave Thaler <[email protected]>

---------

Signed-off-by: Dave Thaler <[email protected]>

* Cherry-pick #2499, #2483.

* Remove wfp compression

* Move the timestamp calculation.

* wip

* feedback

* Update scripts/ebpf_tracing.cmd

Co-authored-by: Dave Thaler <[email protected]>

* Setting max_file_size_mb to the final max allowed.

* maximize sizes

---------

Co-authored-by: Dave Thaler <[email protected]>

* Source update to v0.9.1

* Revert "Cherry-pick #2499, #2483."

This reverts commit eab9bbe.

* Capture bpftool output in diagnostic scripts (#2484)

* tmp working commit

* working script

* working E2E scripts

* minor formatting

* Tune ebpf_tracing.cmd to use the least amount of CPU. (#2499)

* Remove wfp compression

* Move the timestamp calculation.

* wip

* feedback

* Update scripts/ebpf_tracing.cmd

Co-authored-by: Dave Thaler <[email protected]>

* Setting max_file_size_mb to the final max allowed.

* maximize sizes

---------

Co-authored-by: Dave Thaler <[email protected]>

* Add rundown files compression as an option to `ebpf_tracing.cmd`. (#2537)

* Add 'compress_rundown_state_files' option

* nit

* typo

* fix CICD failure (#2548)

Co-authored-by: Dhiren Vispute <[email protected]>

* nit src refresh (whitespace)

* Fix redirected_by_self check for dual stack sockets (#2562)

* Cherry -picks from #2600

* fix typo

---------

Signed-off-by: Dave Thaler <[email protected]>
Co-authored-by: Dave Thaler <[email protected]>
Co-authored-by: Matthew Ige <[email protected]>
Co-authored-by: Delaram Amiri <[email protected]>
Co-authored-by: Dhiren Vispute <[email protected]>
Co-authored-by: Anurag Saxena <[email protected]>
  • Loading branch information
6 people authored Jun 19, 2023
1 parent 4f41426 commit 9a43c05
Show file tree
Hide file tree
Showing 141 changed files with 2,393 additions and 2,396 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,13 @@ jobs:
cancel_others: 'false'
paths_ignore: '["**.md", "**/docs/**"]'

- name: Set MSVC Environment Variables
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
powershell.exe "echo 'msvc_tools_path=%VCToolsInstallDir%' | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append"
powershell.exe "echo 'msvc_tools_version=%VCToolsVersion%' | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append"
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
if: steps.skip_check.outputs.should_skip != 'true'
with:
Expand Down Expand Up @@ -124,7 +131,7 @@ jobs:
cache-name: cache-nuget-modules
with:
path: packages
key: ${{ runner.os }}-${{env.BUILD_PLATFORM}}-${{env.BUILD_CONFIGURATION}}-${{env.BUILD_ARTIFACT_NAME}}-${{ hashFiles('**/packages.config') }}
key: ${{ runner.os }}-${{env.BUILD_PLATFORM}}-${{env.BUILD_CONFIGURATION}}-${{env.BUILD_ARTIFACT_NAME}}-${{ hashFiles('**/packages.config') }}-${{env.msvc_tools_version}}

- name: Restore NuGet packages
if: steps.skip_check.outputs.should_skip != 'true'
Expand All @@ -139,7 +146,7 @@ jobs:
cache-name: cache-verifier-project
with:
path: external/ebpf-verifier/build
key: ${{ runner.os }}-${{env.BUILD_PLATFORM}}-${{env.BUILD_CONFIGURATION}}-${{env.BUILD_ARTIFACT_NAME}}-${{ hashFiles('.git/modules/external/ebpf-verifier/HEAD') }}-${{ hashFiles('external/Directory.Build.props')}}
key: ${{ runner.os }}-${{env.BUILD_PLATFORM}}-${{env.BUILD_CONFIGURATION}}-${{env.BUILD_ARTIFACT_NAME}}-${{ hashFiles('.git/modules/external/ebpf-verifier/HEAD') }}-${{ hashFiles('external/Directory.Build.props')}}-${{env.msvc_tools_version}}

- name: Create verifier project
if: steps.skip_check.outputs.should_skip != 'true'
Expand Down Expand Up @@ -176,7 +183,7 @@ jobs:
- name: Copy LLVM libs for Fuzzing & Address Sanitizing
if: steps.skip_check.outputs.should_skip != 'true'
working-directory: ./${{env.BUILD_PLATFORM}}/${{env.BUILD_CONFIGURATION}}
run: copy "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.34.31933\bin\Hostx64\x64\clang*" .
run: copy "${{env.msvc_tools_path}}\bin\Hostx64\x64\clang*" .

- name: Download demo repository
if: steps.skip_check.outputs.should_skip != 'true' && matrix.configurations != 'FuzzerDebug'
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WarningLevel>Level4</WarningLevel>
<LanguageStandard>stdcpplatest</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<TreatWarningAsError>true</TreatWarningAsError>
<SDLCheck>true</SDLCheck>
<SupportJustMyCode>false</SupportJustMyCode>
Expand Down
2 changes: 1 addition & 1 deletion installer/Product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SPDX-License-Identifier: MIT
<?define ProductVersion="022C44B5-8969-4B75-8DB0-73F98B1BD7DC"?>
<?define UpgradeCode="B6BCACB1-C872-4159-ABCB-43A50668056C"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:ui="http://schemas.microsoft.com/wix/UIExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Id="$(var.ProductVersion)" Name="eBPF for Windows" Language="1033" Version="0.9.0" Manufacturer="Microsoft" UpgradeCode="$(var.UpgradeCode)">
<Product Id="$(var.ProductVersion)" Name="eBPF for Windows" Language="1033" Version="0.9.1" Manufacturer="Microsoft" UpgradeCode="$(var.UpgradeCode)">
<Package Description="eBPF for Windows" InstallerVersion="301" Compressed="yes" InstallScope="perMachine" Manufacturer="Microsoft" Platform="x64" />
<MajorUpgrade AllowSameVersionUpgrades="yes"
Disallow="yes" DisallowUpgradeErrorMessage="An older version of [ProductName] is already installed. Please remove it first."
Expand Down
4 changes: 2 additions & 2 deletions libs/execution_context/unit/execution_context_unit_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -874,9 +874,9 @@ TEST_CASE("ring_buffer_async_query", "[execution_context]")

struct _completion
{
uint8_t* buffer;
uint8_t* buffer = nullptr;
ebpf_ring_buffer_map_async_query_result_t async_query_result = {};
uint64_t value;
uint64_t value{};
} completion;

REQUIRE(ebpf_ring_buffer_map_query_buffer(map.get(), &completion.buffer) == EBPF_SUCCESS);
Expand Down
2 changes: 0 additions & 2 deletions libs/platform/user/platform_user.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>$(SolutionDir)libs\execution_context;$(SolutionDir)include;$(SolutionDir)libs\platform;$(SolutionDir)libs\platform\user;$(SolutionDir)external\ebpf-verifier\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<LanguageStandard>stdcpplatest</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>
Expand All @@ -131,7 +130,6 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>$(SolutionDir)libs\execution_context;$(SolutionDir)include;$(SolutionDir)libs\platform;$(SolutionDir)libs\platform\user;$(SolutionDir)external\ebpf-verifier\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<LanguageStandard>stdcpplatest</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>
Expand Down
4 changes: 2 additions & 2 deletions netebpfext/net_ebpf_ext.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ static net_ebpf_ext_wfp_callout_state_t _net_ebpf_ext_wfp_callout_states[] = {
&EBPF_HOOK_ALE_CONNECT_REDIRECT_V4_CALLOUT,
&FWPM_LAYER_ALE_CONNECT_REDIRECT_V4,
net_ebpf_extension_sock_addr_redirect_connection_classify,
net_ebpf_ext_connect_redirect_filter_change_notify,
net_ebpf_ext_filter_change_notify,
_net_ebpf_ext_flow_delete,
L"ALE Connect Redirect eBPF Callout v4",
L"ALE Connect Redirect callout for eBPF",
Expand All @@ -195,7 +195,7 @@ static net_ebpf_ext_wfp_callout_state_t _net_ebpf_ext_wfp_callout_states[] = {
&EBPF_HOOK_ALE_CONNECT_REDIRECT_V6_CALLOUT,
&FWPM_LAYER_ALE_CONNECT_REDIRECT_V6,
net_ebpf_extension_sock_addr_redirect_connection_classify,
net_ebpf_ext_connect_redirect_filter_change_notify,
net_ebpf_ext_filter_change_notify,
_net_ebpf_ext_flow_delete,
L"ALE Connect Redirect eBPF Callout v6",
L"ALE Connect Redirect callout for eBPF",
Expand Down
Loading

0 comments on commit 9a43c05

Please sign in to comment.