Extend K8sVerifier to maximize program sizes on 4.19 and net-next kernels #14451
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
pchaigno
added
sig/loader
pchaigno
changed the title
pchaigno
force-pushed
the
pr/pchaigno/bpf-max-options-newer-kernels
branch
from
6d7cf1e
to
d387d77
Compare
Base automatically changed from
pr/pchaigno/fix-prefilter-ipv6-regression
to
master
December 21, 2020 12:42
pchaigno
force-pushed
the
pr/pchaigno/bpf-max-options-newer-kernels
branch
from
d387d77
to
00e46e3
Compare
pchaigno
removed
the
dont-merge/blocked
pchaigno
force-pushed
the
pr/pchaigno/bpf-max-options-newer-kernels
branch
2 times, most recently
from
6fedf16
to
3767097
Compare
kkourt
approved these changes
Jan 5, 2021
twpayne
reviewed
Jan 12, 2021
pchaigno
force-pushed
the
pr/pchaigno/bpf-max-options-newer-kernels
branch
from
3767097
to
38d46ee
Compare
The NAT46 change in node_config.h is required to define CONNTRACK is ENABLE_NAT46 is defined. This wasn't previously required because ENABLE_NAT46 was only defined for bpf_xxx files that have CONNTRACK defined in their own header file (e.g., ep_config.h). Signed-off-by: Paul Chaignon <paul@cilium.io>
The make target for the BPF programs takes a KERNEL environment variable. This variable is used to try and maximize the program size for each kernel, by enabling as many features as possible. This new environment variable is also used in the existing K8sVerifier test. Signed-off-by: Paul Chaignon <paul@cilium.io>
pchaigno
force-pushed
the
pr/pchaigno/bpf-max-options-newer-kernels
branch
from
38d46ee
to
6c17e32
Compare
In the datapath, we have two ways to check if a macro is defined:
the usual defined()/#ifdef and is_defined(). The later is often used in
C predicates or in tail call conditions. It expects the macro to be
defined with a value, typically #define ENABLE_FEATURE_X 1. Without this
non-zero value, is_defined(ENABLE_FEATURE_X) returns false.
The list of macros that are used in is_defined can be extracted with
the following command:
git grep -hoP "(?<=is_defined\()[_A-Z0-9]+" bpf/ | sort | uniq
Nevertheless, in this commit, to prevent mistakes in future addition,
I've added a value to all macros. This is automatically achieved by
replacing ':' by '=1 ' instead of just a space. It however requires that
all macros be followed by ':'.
Signed-off-by: Paul Chaignon <paul@cilium.io>
When compiling our datapath (base and endpoint's), cilium-agent selects mcpu=v1 or v2 depending on the kernel version. Up until now, the object files generated for test-verifier.sh had mcpu=probe. This commit changes it to match what cilium-agent does. Signed-off-by: Paul Chaignon <paul@cilium.io>
If ENABLE_HOST_SERVICES_FULL is undefined, additional code is compiled in our datapath, leading us to run into known complexity issue #14234. We only need to work around this issue on the latest kernels. Signed-off-by: Paul Chaignon <paul@cilium.io>
pchaigno
force-pushed
the
pr/pchaigno/bpf-max-options-newer-kernels
branch
from
6c17e32
to
1a59e53
Compare
|
test-me-please |
pchaigno
added
the
ready-to-merge
maintainer-s-little-helper
bot
removed
ready-to-merge
maintainer-s-little-helper
bot
moved this from Needs backport from master
to Backport done to v1.8
in 1.8.7
This was referenced Jan 29, 2021
christarazi
moved this from Needs backport from master
to Backport done to v1.9
in 1.9.4
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 goal of this pull request is to extend K8sVerifier's coverage specifically to test datapath configurations specific to newer 4.19 and net-next kernels (K8sVerifier today only tests 4.9 options). The following summarizes the six commits:
ENCAP_IFINDEX. Required to be able to load bpf_xdp without tunneling.MAX_*_OPTIONSmacros and enable more options on 4.9.MAX_*_OPTIONSto the given kernel to always try to maximize the program sizes.is_definedwhich requires a value of 1 to be detected as defined.Please see commits for details.