v1.14 Backports 2023-08-25 #27701
Merged
v1.14 Backports 2023-08-25 #27701
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 02a1045 ] The complexity testsuite currently loads configuration from a single file for each BPF object and kernel version. In the file each line is a distinct configuration for that BPF object. For example: -DFOO=1 -DBAR=1 would compile twice. Once with FOO defined, once with BAR. In practice we have about 30 to 40 defines per each line, which makes editing, diffing, etc. a nightmare. Switch the format from one line per configuration to one file per configuration. This makes it easier to diff and also to resolve merge conflicts. The existing configurations were converted to invidiual files using the following script: #!/bin/bash set -euo pipefail for dir in bpf/complexity-tests/*; do test -d "$dir" || continue pushd "$dir" || exit 2 for f in *.txt; do i=0 while read -r line; do test -z "$line" && continue i=$((i + 1)) target="$(basename "$f" .txt)" mkdir -p "$target" echo "${line// /$'\n'}" > "$target/$i.txt" done < "$f" done popd || exit 2 done Signed-off-by: Lorenz Bauer <lmb@isovalent.com> Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit a83c043 ] Reflect that 5.2+ kernels have torvalds/linux@c04c0d2 This allows us to run the complexity tests with programs that more closely resemble what Cilium actually uses. For instance lib/conntrack.h and lib/snat.h will now pull in additional code. Signed-off-by: Julian Wiedmann <jwi@isovalent.com> Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 2fe8930 ] EGRESS_POLICY_MAP is only defined if the egress gateway is enabled. Allow including egressgw.h even if that is not the case, so that the helpers can be reused. Signed-off-by: Lorenz Bauer <lmb@isovalent.com> Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 826a1c6 ] When an egressgw BPF unit test fails it helpfully dumps any cilium debug messages with the test. The messages often contain port numbers which can be used to infer which subtest generated them. Make it easier to go from port number to subtest by accounting for endiannness in client_port(). Signed-off-by: Lorenz Bauer <lmb@isovalent.com> Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit c428fec ] Use the correct test enum in tc_egressgw_skip_excluded_cidr_redirect to avoid tests interfering with each other. Signed-off-by: Lorenz Bauer <lmb@isovalent.com> Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit b0a668c ] Always clear the exclude CIDR rule, regardless of whether the test succeeds or not. Otherwise subsequent tests will fail due to the presence of the exclude rule. Signed-off-by: Lorenz Bauer <lmb@isovalent.com> Signed-off-by: Gilberto Bertin <jibi@cilium.io>
jibi
added
kind/backports
|
/test-backport-1.14 |
julianwiedmann
approved these changes
Aug 25, 2023
joestringer
approved these changes
Aug 25, 2023
|
Merging this PR before #27629 lead to a merge conflict there between: and the backport for #26641, see #27629 (comment). |
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:
or with