-
Notifications
You must be signed in to change notification settings - Fork 2.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
v1.8 backports 2021-01-29 #14797
Merged
Merged
v1.8 backports 2021-01-29 #14797
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 626a23f ] The well-known 'interrupted system call' errors started popping up in the test VMs as well. These are caused by newer Go versions being more strigent with slow system calls through the rsync shared directory. Using NFS proved to be a good way to avoid these errors in the dev. VMs. This commit fixes the NFS setup in test VMs to allow for the same workaround. Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit acb2daa ] The new K8sVerifier test compiles some Cilium binaries inside the VM, which can lead to 'interrupted system call' errors. Using NFS should fix it by speeding up the filesystem accesses. This commit switches the test VMs to use NFS by default, thereby enabling NFS in our CI. NFS remains disabled in the CI's Runtime tests because it leads to permission errors [1]. 1 - https://jenkins.cilium.io/job/Cilium-PR-Runtime-4.9/2739/consoleFull Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit 30e90ab ] Commit 6ae59f1 fixed verifier-test.sh, used in K8sVerifier, for bpf-next kernels. We can therefore enable K8sVerifier on our net-next pipeline. To enable K8sVerifier on our 4.19 pipeline, we also need to remove global data sections from the object files loaded with bpftool. Otherwise, since bpftool relies on libbpf, it complains with: libbpf: kernel doesn't support global data This is achieved by using llvm-objcopy, now included in the cilium-builder image. Signed-off-by: Paul Chaignon <paul@cilium.io>
pchaigno
added
backport/1.8
kind/backports
This PR provides functionality previously merged into master.
labels
Jan 29, 2021
pchaigno
requested review from
a team and
christarazi
and removed request for
a team
January 29, 2021 15:16
christarazi
approved these changes
Jan 29, 2021
CI failures seem to be legitimate--pointing to verifier issues |
This was referenced Feb 2, 2021
[ upstream commit 68772ba ] Because we don't define CALLS_MAP for several programs, the binaries end up with 'CALLS_MAP' as the actual map name: $ for f in $(ls bpf/*.o); do ( readelf -s $f | grep -q CALLS_MAP ) && echo $f; done bpf/bpf_alignchecker.o bpf/bpf_network.o bpf/bpf_overlay.o bpf/bpf_xdp.o That can lead to warnings when trying to load the programs with test/bpf/verifier-test.sh. This commit fixes it. $ for f in $(ls bpf/*.o); do ( readelf -s $f | grep -q CALLS_MAP ) && echo $f; done bpf/bpf_alignchecker.o Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit 94aafd4 ] Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit 188b16d ] Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit a629120 ] The llvm-objcopy binary is retrieved from the cilium-llvm image which now compiles it. This binary is required to remove sections from object files loaded with bpftool in the K8sVerifier test. Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit a15a50d ] Signed-off-by: Paul Chaignon <paul@cilium.io>
pchaigno
force-pushed
the
pr/v1.8-backport-2021-01-29
branch
from
February 3, 2021 09:31
1674723
to
d1ed055
Compare
test-backport-1.8 |
Lots of timeouts in Cilium-PR-Ginkgo-Tests-K8s :-/ test-missed-k8s |
tklauser
approved these changes
Feb 3, 2021
Cilium-Ginkgo-Test-k8s has the usual timeout issues on k8s-all. Other builds are green. I think this is ready to merge. |
pchaigno
added
the
ready-to-merge
This PR has passed all tests and received consensus from code owners to merge.
label
Feb 3, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
kind/backports
This PR provides functionality previously merged into master.
ready-to-merge
This PR has passed all tests and received consensus from code owners to merge.
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: