v1.9 backports: maglev: Delete map if previous M's do not match #14424
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
[ upstream commit ad16d0f ] It was reported by a user, that when the M param (--bpf-lb-maglev-table-size) changes, then the verifier is failing to load the program on the 5.4 kernel with the following error: invalid access to map value, value_size=32762 off=65520 size=2 R0 max value is outside of the array range processed 507 insns (limit 1000000) max_states_per_insn 1 total_states 34 peak_states 34 mark_read 17 Fix this by recreating the map when we detect that the M has changed. Reported-by: Han Zhou <hzhou8@ebay.com> Signed-off-by: Martynas Pumputis <m@lambda.lt>
[ upstream commit 762e8e2 ] Move the GetKernelVersion() from pkg/datapath/linux to pkg/version so that it can be included by pkg/maps/lbmap which is included by pkg/datapath/linux. Otherwise, we have a circular dependency. Also, make the function to return an error instead of calling log.Fatal, as it's caller's responsibility to decide what to do with an error. Signed-off-by: Martynas Pumputis <m@lambda.lt>
[ upstream commit 8031a30 ] Unfortunately, we run the privileged unit tests on the 4.9 kernel which does not have the map-in-map support. Therefore, add a skip based on the kernel version so that the CI does not fail. Signed-off-by: Martynas Pumputis <m@lambda.lt>
brb
added
kind/backports
|
test-backport-1.9 |
joestringer
approved these changes
Dec 16, 2020
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.
Once this PR is merged, you can update the PR labels via: