cmd/cleanup: Fix cleanup of generic XDP programs #25117
Merged
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
The 'cilium cleanup' command wasn't actually removing XDP programs attached to the generic hook point. This was causing issues when an XDP test in ginkgo was immediatly followed by the upgrade test. The upgrade test would run 'cilium cleanup' and remove everything except for the XDP programs. That would isolate the Cilium-managed nodes from the outside network (both SSH and intra-cluster connectivity). Obviously, this works when we change the Cilium configuration to disable XDP. There we have some logic to remove any leftover XDP programs on agent startup. Comparing that logic with the 'cilium cleanup' logic, we can see that the difference is that the agent removes XDP programs explicitely for each hook point (generic and driver). Let's do the same. This fix was tested manually on a setup with Cilium's generic XDP programs installed. Fixes: 6ed1fe5 ("cilium: Remove attached bpf_xdp upon "cilium cleanup"") Signed-off-by: Paul Chaignon <paul@cilium.io>
pchaigno
added
kind/bug
|
/test Job 'Cilium-PR-K8s-1.27-kernel-net-next' failed: Click to show.Test NameFailure OutputJenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.27-kernel-net-next/132/ If it is a flake and a GitHub issue doesn't already exist to track it, comment Then please upload the Jenkins artifacts to that issue. |
|
For my own edification, the code in the xdp loader that cleans these up is here. |
squeed
approved these changes
Apr 26, 2023
sayboras
added
backport-pending/1.13
maintainer-s-little-helper
bot
moved this from Needs backport from main
to Backport pending to v1.13
in 1.13.3
julianwiedmann
added
backport-done/1.13
maintainer-s-little-helper
bot
moved this from Backport pending to v1.13
to Backport done to v1.13
in 1.13.3
maintainer-s-little-helper
bot
moved this from Backport pending to v1.13
to Backport done to v1.13
in 1.13.3
pchaigno
removed
affects/v1.11
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
cilium cleanupcommand wasn't actually removing XDP programs attached to the generic hook point. This was causing issues when an XDP test in ginkgo was immediately followed by the upgrade test. The upgrade test would runcilium cleanupand remove everything except for the XDP programs. That would isolate the Cilium-managed nodes from the outside network (both SSH and intra-cluster connectivity).Obviously, this works when we change the Cilium configuration to disable XDP. There we have some logic to remove any leftover XDP programs on agent startup. Comparing that logic with the
cilium cleanuplogic, we can see that the difference is that the agent removes XDP programs explicitly for each hook point (generic and driver). Let's do the same.This fix was tested manually on a setup with Cilium's generic XDP programs installed.
Fixes: #19735.
Fixes: #24687.