update cilium/ebpf to fix haveBpfProgReplace() check#3009
Merged
mrunalp merged 1 commit intoopencontainers:masterfrom Jun 11, 2021
Merged
update cilium/ebpf to fix haveBpfProgReplace() check#3009mrunalp merged 1 commit intoopencontainers:masterfrom
mrunalp merged 1 commit intoopencontainers:masterfrom
Conversation
0d4912d to
aa69502
Compare
cyphar
previously approved these changes
Jun 9, 2021
Member
cyphar
left a comment
There was a problem hiding this comment.
LGTM, hopefully this works into the future. I can implement the fallback in a more ugly way (assuming the failure is EINVAL and retry without BPF_F_REPLACE to see if it works). But let's keep that ace in our back pocket for now...
Contributor
|
(updated description to link to cilium/ebpf#320) The only two minor issues I see are:
I guess this is minor and we really should release 1.0.0 GA now, so LGTM. |
kolyshkin
previously approved these changes
Jun 9, 2021
Contributor
|
Filed an issue to cilium asking them to tag a release cilium/ebpf#323 |
|
We've tagged https://github.com/cilium/ebpf/releases/tag/v0.6.1. |
Contributor
|
thanks @ti-mo ! |
Member
|
@AkihiroSuda Can you update this to use the new release? |
aa69502 to
c28d402
Compare
Member
Author
|
Thanks, updated |
c28d402 to
719a7bd
Compare
The `errors.Is(err, unix.EINVAL)` check in `haveBpfProgReplace()` was broken because the `cilium/ebpf` library did not "wrap" errors. https://github.com/cilium/ebpf/blob/v0.6.0/link/program.go#L72 So the eBPF support of runc was broken for kernel prior to 5.6. This commit bumps up cilium/ebpf to contain cilium/ebpf PR 320. Fix opencontainers/runc issue 3008 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
719a7bd to
46940ed
Compare
mrunalp
approved these changes
Jun 11, 2021
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
The
errors.Is(err, unix.EINVAL)check inhaveBpfProgReplace()was broken because thecilium/ebpflibrary did not "wrap" errors: https://github.com/cilium/ebpf/blob/v0.6.0/link/program.go#L72So the eBPF support of runc was broken for kernel prior to 5.6.
The fix for the above is cilium/ebpf#320. This PR bumps cilium/ebpf to include the fix.
Fixes: #3008
Tested in Moby CI moby/moby#42450