meson: restore previous libbpf version and update bpftool #400
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
The upstrem bpftool git repo (https://github.com/libbpf/bpftool.git) is periodically force pushed and the specific commit that we needed is not available anymore. Instead of failing we are actually fetching the latest bpftool (HEAD) that introduced some breakage initially fixed by commit e59c48a ("Update libbpf commit hash"). However, updating libbpf seems to introduce a run-time problem and all the schedulers are failing to start: libbpf: failed to find skeleton map '' libbpf: failed to populate skeleton maps for 'bpf_bpf': -3 So, revert libbpf to the previous version and update the commit for bpftool to use a version that still allows to generate a compatible BPF skel. Fixes: e59c48a ("Update libbpf commit hash") Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
|
Fixes the segfaults and co. Tested-by: Peter Jung ptr1337@cachyos.org |
|
Merging this so that we can continue to build and test the scx schedulers. We will investigate later how to move to the new libbpf properly if it's needed. |
arighi
pushed a commit
that referenced
this pull request
Jun 28, 2024
When fetching external git repositories (libbpf and bpftool) we don't check if the target commit exists. This can leads to issues such as #400, because we may silently use HEAD, instead of the specified commit. Prevent this by returning an error when the target SHA1 cannot be found. Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
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.
The upstrem bpftool git repo (https://github.com/libbpf/bpftool.git) is periodically force pushed and the specific commit that we needed is not available anymore.
Instead of failing we are actually fetching the latest bpftool (HEAD) that introduced some breakage initially fixed by commit e59c48a ("Update libbpf commit hash").
However, updating libbpf seems to introduce a run-time problem and all the schedulers are failing to start:
libbpf: failed to find skeleton map ''
libbpf: failed to populate skeleton maps for 'bpf_bpf': -3
So, revert libbpf to the previous version and update the commit for bpftool to use a version that still allows to generate a compatible BPF skel.
Fixes: e59c48a ("Update libbpf commit hash")