CI: Update kernel from v6.7 to v6.8#1452
Merged
ti-mo merged 2 commits intocilium:mainfrom Apr 29, 2024
Merged
Conversation
Contributor
|
Thanks for diagnosing this! Can you add a link to the upstream commit in the commit message? You'll also have to update the kernel versions we test against in CI. |
dylandreimerink
force-pushed
the
feature/fix-have-program-type-ext-probe-v6.8
branch
from
c2ce945 to
cf2e272
Compare
In kernel v6.8, logic was added that restricts valid func info BTF for programs that can be replaced with an BPF_PROG_TYPE_EXT program. Before this change the parameters of the extension program had to be the same as the original program. Commit torvalds/linux@5eccd2db42d77e357 made it so the verifier asserts that the BTF func info of "main" programs must have exactly 1 parameter of a pointer type to the context struct, even if the code doesn't use the context like in our case. Signed-off-by: Dylan Reimerink <[email protected]>
Kernel 6.8 is currently the latest stable kernel release, so test against it. Also add 6.6 to the test matrix since it is an LTS release. Signed-off-by: Dylan Reimerink <[email protected]>
dylandreimerink
force-pushed
the
feature/fix-have-program-type-ext-probe-v6.8
branch
from
cf2e272 to
8d709e6
Compare
dylandreimerink
changed the title
TestHaveProgramType/Extension in kernel >=v6.8
1 task
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
4 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.
This PR updates the kernels we test against in CI to the latest stable kernel, v6.8. However, the feature probe for the extension program type fails on this kernel, so we also include a fix to the probe.
In kernel v6.8, logic was added that restricts valid func info BTF for programs that can be replaced with an BPF_PROG_TYPE_EXT program. Before this change the parameters of the extension program had to be the same as the original program. However, now the verifier asserts that the BTF func info of "main" programs must have exactly 1 parameter of a pointer type to the context struct, even if the code doesn't use the context like in our case.
Fixes: #1451