bpf(): improve map and program compatibility #3980
Open
+396
−44
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
lmb
requested review from
dthaler,
poornagmsft,
Alan-Jowett,
saxena-anurag,
shankarseal,
dv-msft,
gtrevi,
shpalani,
matthewige,
mtfriesen and
rectified95
as code owners
dthaler
reviewed
Nov 3, 2024
lmb
force-pushed
the
bpf-names-info
branch
2 times, most recently
from
047d4c2 to
9140f0f
Compare
dthaler
reviewed
Nov 11, 2024
dthaler
previously approved these changes
Nov 12, 2024
|
@lmb - the CICD tests are failing on this PR. Can you please take a look? |
|
Yes, I’m aware. My dev environment destroyed itself and setting it back up had to take lower priority. I’ll update when I can. |
|
Rebased this on |
Hi, since the build is passing in CICD pipeline, you can probably use the artifacts from the pipeline to run the tests locally. |
Allow passing a name for maps and programs and allow retrieving it via BPF_OBJ_GET_INFO_BY_FD. This requires a bunch of glue code because the bpf_prog_info, etc. structs are not compatible with Linux.
Internally both zero and EBPF_ID_NONE are used to refer to non-existing ID. Use zero when retrieving link info, since that aligns with Linux better.
|
Tests are finally passing! |
dthaler
previously approved these changes
Dec 18, 2024
| @@ -652,7 +652,7 @@ ebpf_link_get_info( | |||
|
|
|||
| memset(info, 0, sizeof(*info)); | |||
| info->id = link->object.id; | |||
| info->prog_id = (link->program) ? ((ebpf_core_object_t*)link->program)->id : EBPF_ID_NONE; | |||
| info->prog_id = (link->program) ? ((ebpf_core_object_t*)link->program)->id : 0; | |||
There was a problem hiding this comment.
Question: should EBPF_ID_NONE be defined to be 0?
| attr.info.info = (uintptr_t)&info; | ||
| attr.info.info_len = sizeof(info); | ||
| REQUIRE(bpf(BPF_OBJ_GET_INFO_BY_FD, &attr, sizeof(attr)) == 0); | ||
| // TODO: Should this be BPF_LINK_TYPE_PLAIN? |
There was a problem hiding this comment.
As far as I know, yes.
Suggested change
| // TODO: Should this be BPF_LINK_TYPE_PLAIN? | |
| // TODO: This should be BPF_LINK_TYPE_PLAIN. |
Co-authored-by: Dave Thaler <[email protected]>
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.
Allow passing a name for maps and programs and allow retrieving it via BPF_OBJ_GET_INFO_BY_FD. This requires a bunch of glue code because the bpf_prog_info, etc. structs are not compatible with Linux.