Add versioning to native module NMR interface #4256
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…thub.com/saxena-anurag/ebpf-for-windows-1 into user/anusa/multiple_load_native_module_2
…thub.com/saxena-anurag/ebpf-for-windows-1 into user/anusa/multiple_load_native_module_2
saxena-anurag
requested review from
matthewige,
mikeagun,
mtfriesen,
poornagmsft,
shankarseal and
vpidatala94
as code owners
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
matthewige
reviewed
Mar 13, 2025
dthaler
reviewed
Mar 18, 2025
dthaler
previously approved these changes
Mar 21, 2025
libs/execution_context/ebpf_native.c
Outdated
Comment on lines
1526
to
1527
| helper_function_entry_t* entry = | ||
| (helper_function_entry_t*)ARRAY_ELEMENT_INDEX(helper_info, i, helper_entry_size); |
There was a problem hiding this comment.
Suggested change
| helper_function_entry_t* entry = | |
| (helper_function_entry_t*)ARRAY_ELEMENT_INDEX(helper_info, i, helper_entry_size); | |
| const helper_function_entry_t* entry = | |
| (const helper_function_entry_t*)ARRAY_ELEMENT_INDEX(helper_info, i, helper_entry_size); |
Comment on lines
+1299
to
+1300
| global_variable_section_info_t* global_variable_section_info = | ||
| (global_variable_section_info_t*)ARRAY_ELEMENT_INDEX( |
There was a problem hiding this comment.
Suggested change
| global_variable_section_info_t* global_variable_section_info = | |
| (global_variable_section_info_t*)ARRAY_ELEMENT_INDEX( | |
| const global_variable_section_info_t* global_variable_section_info = | |
| (const global_variable_section_info_t*)ARRAY_ELEMENT_INDEX( |
| @@ -718,22 +1002,26 @@ _ebpf_native_initialize_maps( | |||
| } | |||
|
|
|||
| for (uint32_t i = 0; i < map_count; i++) { | |||
| if (maps[i].definition.pinning != LIBBPF_PIN_NONE && maps[i].definition.pinning != LIBBPF_PIN_BY_NAME) { | |||
| // Copy the map_entry_t from native module to ebpf_native_map_t. | |||
| map_entry_t* map_entry = (map_entry_t*)ARRAY_ELEMENT_INDEX(maps, i, map_entry_size); | |||
There was a problem hiding this comment.
Suggested change
| map_entry_t* map_entry = (map_entry_t*)ARRAY_ELEMENT_INDEX(maps, i, map_entry_size); | |
| const map_entry_t* map_entry = (const map_entry_t*)ARRAY_ELEMENT_INDEX(maps, i, map_entry_size); |
libs/execution_context/ebpf_native.c
Outdated
| @@ -496,43 +792,30 @@ _ebpf_native_provider_attach_client_callback( | |||
| ebpf_native_module_t** module = NULL; | |||
| bool lock_acquired = false; | |||
| metadata_table_t* table = NULL; | |||
There was a problem hiding this comment.
Suggested change
| metadata_table_t* table = NULL; |
libs/execution_context/ebpf_native.c
Outdated
|
|
||
| table = (metadata_table_t*)client_dispatch; |
There was a problem hiding this comment.
Suggested change
| table = (metadata_table_t*)client_dispatch; | |
| const metadata_table_t* table = (const metadata_table_t*)client_dispatch; |
libs/execution_context/ebpf_native.c
Outdated
| memcpy(&local_global_section_info, global_variable_section_info, global_variable_section_info_size); | ||
| global_variable_section_info = NULL; | ||
|
|
||
| ebpf_native_map_t* native_map = _ebpf_native_find_map_by_name(instance, local_global_section_info.name); |
There was a problem hiding this comment.
Suggested change
| ebpf_native_map_t* native_map = _ebpf_native_find_map_by_name(instance, local_global_section_info.name); | |
| const ebpf_native_map_t* native_map = _ebpf_native_find_map_by_name(instance, local_global_section_info.name); |
…ithub.com/saxena-anurag/ebpf-for-windows-1 into user/anusa/native_module_npi_versioning_2
dthaler
approved these changes
Mar 21, 2025
matthewige
approved these changes
Mar 21, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #4266
This pull request includes significant changes to the
include/bpf2c.handlibs/shared/shared_common.cfiles to add version headers to various eBPF native module data structures. The changes also introduce new validation functions and update existing structures to include these headers.Introduction of Version Headers:
ebpf_native_module_header_tto multiple data structures ininclude/bpf2c.hto ensure backward compatibility and facilitate future extensions. [1] [2] [3] [4]include/bpf2c.h.Validation Functions:
libs/shared/ebpf_shared_framework.h.libs/shared/shared_common.c.Updates to Existing Structures:
_ebpf_pe_get_map_definitionsinlibs/api/ebpf_api.cppto handle new alignment requirements for map entries.struct bpf_prog_infoininclude/ebpf_structs.h.Additional Changes:
ARRAY_ELEM_INDEXmacro fromlibs/shared/shared_common.ctolibs/shared/ebpf_shared_framework.h. [1] [2]These changes ensure that the eBPF native module data structures are backward compatible and can be extended in the future without breaking existing functionality.