Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ETW event manifest for high frequency events #3830

Draft
wants to merge 22 commits into
base: main
Choose a base branch
from
Draft

Add ETW event manifest for high frequency events #3830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0592303
WIP
mtfriesen Sep 12, 2024
634835f
Merge remote-tracking branch 'origin/main' into manifest_etw
mtfriesen Sep 12, 2024
98750ee
WIP
mtfriesen Sep 13, 2024
b55b2c3
add installer
mtfriesen Sep 13, 2024
7d5343d
WIP
mtfriesen Sep 16, 2024
c333dfb
WIP
mtfriesen Sep 16, 2024
daf2a6f
mess with build
mtfriesen Sep 16, 2024
4507dab
more build
mtfriesen Sep 16, 2024
465a778
more fixes
mtfriesen Sep 16, 2024
a20919d
add manifest to expected MSI files
mtfriesen Sep 16, 2024
70df9e5
fix typo
mtfriesen Sep 16, 2024
2b36e65
add to nuget
mtfriesen Sep 16, 2024
b3aa9c6
Merge branch 'main' into manifest_etw
mtfriesen Sep 16, 2024
e75c3ca
fix fuzzer flavor
mtfriesen Sep 16, 2024
ce68e3e
try without usermode init/uninit
mtfriesen Sep 17, 2024
7cba9a0
check if unit test regression is due to removed logs?
mtfriesen Sep 17, 2024
c4425b5
ok, what if there are no logs at all?
mtfriesen Sep 17, 2024
855b7bf
Merge branch 'microsoft:main' into manifest_etw
mtfriesen Sep 17, 2024
4bee155
try reordering headers.
mtfriesen Sep 17, 2024
301f451
undef MCGEN_CONTROL_CALLBACK
mtfriesen Sep 17, 2024
e5379c3
try um apis
mtfriesen Sep 17, 2024
a0aed7e
Fix merge conflict
Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<!-- Add the resource to applications, dlls, and drivers except if the resource file doesn't exist-->
<ItemGroup Condition="('$(ConfigurationType)'=='Application' Or '$(ConfigurationType)'=='DynamicLibrary' Or '$(ConfigurationType)'=='Driver') And Exists('$(SolutionDir)resource\ebpf_resource.rc')">
<ResourceCompile Include="$(SolutionDir)resource\ebpf_resource.rc">
<AdditionalIncludeDirectories>$(SolutionDir)include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemGroup>
</Project>
90 changes: 46 additions & 44 deletions ebpf-for-windows.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "execution_context_kernel", "libs\execution_context\kernel\execution_context_kernel.vcxproj", "{26E7ED0B-C128-4D7C-A90E-C246DEF40AD3}"
ProjectSection(ProjectDependencies) = postProject
{231EE32B-EBA4-4FE5-A55B-DB18F539D403} = {231EE32B-EBA4-4FE5-A55B-DB18F539D403}
{D1B81388-23CA-4E4B-916F-8D37989AE836} = {D1B81388-23CA-4E4B-916F-8D37989AE836}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "execution_context_user", "libs\execution_context\user\execution_context_user.vcxproj", "{18127B0D-8381-4AFE-9A3A-CF53241992D3}"
ProjectSection(ProjectDependencies) = postProject
{231EE32B-EBA4-4FE5-A55B-DB18F539D403} = {231EE32B-EBA4-4FE5-A55B-DB18F539D403}
{9388DD45-7941-45D7-B4FF-BC00F550AF17} = {9388DD45-7941-45D7-B4FF-BC00F550AF17}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ubpf_user", "libs\ubpf\user\ubpf_user.vcxproj", "{245F0EC7-1EBC-4D68-8B1F-F758EA9196AE}"
Expand Down Expand Up @@ -329,7 +331,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usersim", "external\usersim
{231EE32B-EBA4-4FE5-A55B-DB18F539D403} = {231EE32B-EBA4-4FE5-A55B-DB18F539D403}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbtf", "external\ebpf-verifier\build\external\libbtf\libbtf\libbtf.vcxproj", "{9FD0723C-6979-3D32-8D17-6CECA34B7026}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbtf", "external\ebpf-verifier\build\external\libbtf\libbtf\libbtf.vcxproj", "{C15BA92B-C9A9-332F-8048-7653B21428ED}"
ProjectSection(ProjectDependencies) = postProject
{231EE32B-EBA4-4FE5-A55B-DB18F539D403} = {231EE32B-EBA4-4FE5-A55B-DB18F539D403}
EndProjectSection
Expand Down Expand Up @@ -2790,48 +2792,48 @@ Global
{030A7AC6-14DC-45CF-AF34-891057AB1402}.RelWithDebInfo|x64.Build.0 = Release|x64
{030A7AC6-14DC-45CF-AF34-891057AB1402}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
{030A7AC6-14DC-45CF-AF34-891057AB1402}.RelWithDebInfo|x86.Build.0 = Release|Win32
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.Debug|ARM64.ActiveCfg = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.Debug|ARM64.Build.0 = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.Debug|x64.ActiveCfg = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.Debug|x64.Build.0 = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.Debug|x86.ActiveCfg = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.Debug|x86.Build.0 = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.FuzzerDebug|ARM64.ActiveCfg = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.FuzzerDebug|ARM64.Build.0 = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.FuzzerDebug|x64.ActiveCfg = FuzzerDebug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.FuzzerDebug|x64.Build.0 = FuzzerDebug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.FuzzerDebug|x86.ActiveCfg = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.FuzzerDebug|x86.Build.0 = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.MinSizeRel|ARM64.ActiveCfg = MinSizeRel|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.MinSizeRel|ARM64.Build.0 = MinSizeRel|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.MinSizeRel|x86.Build.0 = MinSizeRel|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.NativeOnlyDebug|ARM64.ActiveCfg = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.NativeOnlyDebug|ARM64.Build.0 = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.NativeOnlyDebug|x64.ActiveCfg = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.NativeOnlyDebug|x64.Build.0 = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.NativeOnlyDebug|x86.ActiveCfg = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.NativeOnlyDebug|x86.Build.0 = Debug|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.NativeOnlyRelease|ARM64.ActiveCfg = Release|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.NativeOnlyRelease|ARM64.Build.0 = Release|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.NativeOnlyRelease|x64.ActiveCfg = Release|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.NativeOnlyRelease|x64.Build.0 = Release|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.NativeOnlyRelease|x86.ActiveCfg = Release|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.NativeOnlyRelease|x86.Build.0 = Release|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.Release|ARM64.ActiveCfg = Release|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.Release|ARM64.Build.0 = Release|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.Release|x64.ActiveCfg = Release|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.Release|x64.Build.0 = Release|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.Release|x86.ActiveCfg = Release|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.Release|x86.Build.0 = Release|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64
{9FD0723C-6979-3D32-8D17-6CECA34B7026}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.Debug|ARM64.ActiveCfg = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.Debug|ARM64.Build.0 = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.Debug|x64.ActiveCfg = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.Debug|x64.Build.0 = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.Debug|x86.ActiveCfg = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.Debug|x86.Build.0 = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.FuzzerDebug|ARM64.ActiveCfg = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.FuzzerDebug|ARM64.Build.0 = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.FuzzerDebug|x64.ActiveCfg = FuzzerDebug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.FuzzerDebug|x64.Build.0 = FuzzerDebug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.FuzzerDebug|x86.ActiveCfg = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.FuzzerDebug|x86.Build.0 = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.MinSizeRel|ARM64.ActiveCfg = MinSizeRel|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.MinSizeRel|ARM64.Build.0 = MinSizeRel|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.MinSizeRel|x86.Build.0 = MinSizeRel|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.NativeOnlyDebug|ARM64.ActiveCfg = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.NativeOnlyDebug|ARM64.Build.0 = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.NativeOnlyDebug|x64.ActiveCfg = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.NativeOnlyDebug|x64.Build.0 = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.NativeOnlyDebug|x86.ActiveCfg = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.NativeOnlyDebug|x86.Build.0 = Debug|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.NativeOnlyRelease|ARM64.ActiveCfg = Release|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.NativeOnlyRelease|ARM64.Build.0 = Release|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.NativeOnlyRelease|x64.ActiveCfg = Release|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.NativeOnlyRelease|x64.Build.0 = Release|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.NativeOnlyRelease|x86.ActiveCfg = Release|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.NativeOnlyRelease|x86.Build.0 = Release|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.Release|ARM64.ActiveCfg = Release|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.Release|ARM64.Build.0 = Release|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.Release|x64.ActiveCfg = Release|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.Release|x64.Build.0 = Release|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.Release|x86.ActiveCfg = Release|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.Release|x86.Build.0 = Release|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64
{C15BA92B-C9A9-332F-8048-7653B21428ED}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x64
{1937DB41-F3EB-4955-A636-6386DCB394F6}.Debug|ARM64.ActiveCfg = Debug|x64
{1937DB41-F3EB-4955-A636-6386DCB394F6}.Debug|ARM64.Build.0 = Debug|x64
{1937DB41-F3EB-4955-A636-6386DCB394F6}.Debug|x64.ActiveCfg = Debug|x64
Expand Down Expand Up @@ -3351,7 +3353,7 @@ Global
{4F082524-9496-44FA-8CBA-4BC0BDC62568} = {492C9B22-9237-4996-9E33-CA14D3533616}
{AA933B9F-B5D8-4AA8-AC18-98FE1A161E8A} = {69CDB6A1-434D-4BC9-9BFF-D12DF7EDBB6B}
{030A7AC6-14DC-45CF-AF34-891057AB1402} = {69CDB6A1-434D-4BC9-9BFF-D12DF7EDBB6B}
{9FD0723C-6979-3D32-8D17-6CECA34B7026} = {69CDB6A1-434D-4BC9-9BFF-D12DF7EDBB6B}
{C15BA92B-C9A9-332F-8048-7653B21428ED} = {69CDB6A1-434D-4BC9-9BFF-D12DF7EDBB6B}
{1937DB41-F3EB-4955-A636-6386DCB394F6} = {69CDB6A1-434D-4BC9-9BFF-D12DF7EDBB6B}
{1FDAD2FD-EBD8-462A-B285-ED5174E55079} = {97D3096A-20FB-4ACB-A038-88E652FE61E3}
{9388DD45-7941-45D7-B4FF-BC00F550AF17} = {69CDB6A1-434D-4BC9-9BFF-D12DF7EDBB6B}
Expand Down
18 changes: 14 additions & 4 deletions ebpfcore/EbpfCore.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SolutionDir)include;$(SolutionDir)libs\runtime;$(SolutionDir)libs\runtime\kernel;$(SolutionDir)libs\shared;$(SolutionDir)libs\shared\kernel;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winkernel;$(SolutionDir)libs\execution_context;$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\kernel;$(SolutionDir)resource</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SolutionDir)include;$(SolutionDir)libs\runtime;$(SolutionDir)libs\runtime\kernel;$(SolutionDir)libs\shared;$(SolutionDir)libs\shared\kernel;$(SolutionDir)libs\shared\kernel\$(Platform)\Release;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winkernel;$(SolutionDir)libs\execution_context;$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\kernel;$(SolutionDir)resource</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO;NDEBUG</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
Expand All @@ -132,7 +132,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NativeOnlyRelease|x64'">
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SolutionDir)include;$(SolutionDir)libs\runtime;$(SolutionDir)libs\runtime\kernel;$(SolutionDir)libs\shared;$(SolutionDir)libs\shared\kernel;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winkernel;$(SolutionDir)libs\execution_context;$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\kernel;$(SolutionDir)resource</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SolutionDir)include;$(SolutionDir)libs\runtime;$(SolutionDir)libs\runtime\kernel;$(SolutionDir)libs\shared;$(SolutionDir)libs\shared\kernel;$(SolutionDir)libs\shared\kernel\$(Platform)\Release;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winkernel;$(SolutionDir)libs\execution_context;$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\kernel;$(SolutionDir)resource</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO;NDEBUG</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
Expand All @@ -152,7 +152,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SolutionDir)include;$(SolutionDir)libs\runtime;$(SolutionDir)libs\runtime\kernel;$(SolutionDir)libs\shared;$(SolutionDir)libs\shared\kernel;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winkernel;$(SolutionDir)libs\execution_context;$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\kernel;$(SolutionDir)resource</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SolutionDir)include;$(SolutionDir)libs\runtime;$(SolutionDir)libs\runtime\kernel;$(SolutionDir)libs\shared;$(SolutionDir)libs\shared\kernel;$(SolutionDir)libs\shared\kernel\$(Platform)\Debug;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winkernel;$(SolutionDir)libs\execution_context;$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\kernel;$(SolutionDir)resource</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
Expand All @@ -171,7 +171,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NativeOnlyDebug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SolutionDir)include;$(SolutionDir)libs\runtime;$(SolutionDir)libs\runtime\kernel;$(SolutionDir)libs\shared;$(SolutionDir)libs\shared\kernel;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winkernel;$(SolutionDir)libs\execution_context;$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\kernel;$(SolutionDir)resource</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SolutionDir)include;$(SolutionDir)libs\runtime;$(SolutionDir)libs\runtime\kernel;$(SolutionDir)libs\shared;$(SolutionDir)libs\shared\kernel;$(SolutionDir)libs\shared\kernel\$(Platform)\Debug;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winkernel;$(SolutionDir)libs\execution_context;$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\kernel;$(SolutionDir)resource</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
Expand All @@ -188,6 +188,16 @@
<FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
</DriverSign>
</ItemDefinitionGroup>
<ItemGroup Condition="'$(Configuration)' == 'NativeOnlyRelease' OR '$(Configuration)' == 'Release'">
<ResourceCompile Include="$(SolutionDir)libs\shared\kernel\$(Platform)\Release\ebpf_etw_gen.rc">
<AdditionalIncludeDirectories>$(SolutionDir)libs\shared\kernel\$(Platform)\Release;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'NativeOnlyDebug' OR '$(Configuration)' == 'Debug'">
<ResourceCompile Include="$(SolutionDir)libs\shared\kernel\$(Platform)\Debug\ebpf_etw_gen.rc">
<AdditionalIncludeDirectories>$(SolutionDir)libs\shared\kernel\$(Platform)\Debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ebpf_drv.c" />
</ItemGroup>
Expand Down
12 changes: 12 additions & 0 deletions ebpfcore/ebpf_drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/

#include "ebpf_core.h"
#include "ebpf_etw.h"
#include "ebpf_tracelog.h"
#include "ebpf_version.h"
#include "git_commit_id.h"
Expand Down Expand Up @@ -390,6 +391,16 @@ DriverEntry(_In_ DRIVER_OBJECT* driver_object, _In_ UNICODE_STRING* registry_pat
goto Exit;
}

status = EventRegisterEbpfForWindowsProvider();
if (!NT_SUCCESS(status)) {
EBPF_LOG_MESSAGE_NTSTATUS(
EBPF_TRACELOG_LEVEL_CRITICAL,
EBPF_TRACELOG_KEYWORD_ERROR,
(char*)"EventRegisterEbpfForWindowsProvider failed",
status);
goto Exit;
}

EBPF_LOG_ENTRY();

// Request NX Non-Paged Pool when available
Expand All @@ -409,6 +420,7 @@ DriverEntry(_In_ DRIVER_OBJECT* driver_object, _In_ UNICODE_STRING* registry_pat
Exit:
EBPF_LOG_EXIT();
if (!NT_SUCCESS(status)) {
EventUnregisterEbpfForWindowsProvider();
ebpf_trace_terminate();
}
return status;
Expand Down
Loading
Loading