Implement bpf_object__open_mem #3416
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
Signed-off-by: Alan Jowett <alan.jowett@microsoft.com>
Alan-Jowett
requested review from
dthaler,
poornagmsft,
saxena-anurag,
shankarseal,
dv-msft,
gtrevi,
shpalani,
matthewige,
mtfriesen and
rectified95
as code owners
rectified95
reviewed
Apr 1, 2024
| std::string path = std::get<std::string>(file_or_data); | ||
| new_object->file_name = cxplat_duplicate_string(path.c_str()); | ||
| } else { | ||
| new_object->file_name = cxplat_duplicate_string("memory"); |
There was a problem hiding this comment.
nit: maybe make this more unique? eg. EBPF_PROG_ID_MEMORY_BUF or similar
There was a problem hiding this comment.
Looks like libbpf uses the name from the opts file, so I will switch it.
rectified95
reviewed
Apr 1, 2024
rectified95
approved these changes
Apr 1, 2024
saxena-anurag
approved these changes
Apr 1, 2024
Merged
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.
Resolves: #3352
Description
This pull request introduces changes that allow the EBPF verifier to load EBPF programs not only from files but also from memory. This is achieved by using
std::variantto hold either a file path or a memory buffer. The most significant changes include adding a new methodbpf_object__open_memfor opening an ELF file from memory, modifying several methods inlibs/api/Verifier.cppandlibs/api/ebpf_api.cppto handle the variant type, and adding a new test case for loading an EBPF program from memory.Changes to the API:
ebpfapi/Source.def: Added a new functionbpf_object__open_memto the exports.libs/api/api_internal.h: Defined a new functionebpf_object_open_memorythat opens an ELF file from memory without loading the programs.libs/api/libbpf_object.cpp: Implementedbpf_object__open_memthat usesebpf_object_open_memoryto open an ELF file from memory.Changes to the Verifier:
libs/api/Verifier.cppandlibs/api/Verifier.h: Modified_get_program_and_map_namesandload_byte_codeto accept astd::variantthat can be either a file path or a memory buffer. [1] [2] [3] [4] [5]Changes to the EBPF API:
libs/api/ebpf_api.cpp: Added the implementation forebpf_object_open_memoryand modified_initialize_ebpf_object_from_elf,_initialize_ebpf_object_from_fileand other related methods to handle thestd::varianttype. [1] [2] [3] [4]Changes to the test suite:
tests/unit/libbpf_test.cpp: Added a new test case for loading an EBPF program from memory.Testing
CI/CD + new tests.
Documentation
No.
Installation
No.