Skip to content
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

daemon: Fix multi-dev XDP check #18305

Merged
merged 1 commit into from
Dec 21, 2021
Merged

daemon: Fix multi-dev XDP check #18305

merged 1 commit into from
Dec 21, 2021

Conversation

brb
Copy link
Member

@brb brb commented Dec 20, 2021

The 0ffa7c6 commit didn't remove all guards which previously were
used to check that XDP is enabled only with |--devices| == 1.

The last guard was not visible on v1.11 due to
#18304, while on v1.10 it failed on
the multi-dev XDP setups.

Fixes: 0ffa7c6 ("datapath,daemon: Enable multi-dev XDP")
Reported-by: Tobias Klauser tobias@cilium.io
Reported-by: Paul Chaignon paul@cilium.io
Signed-off-by: Martynas Pumputis m@lambda.lt

Fix #18211

@brb brb added kind/bug This is a bug in the Cilium logic. area/daemon Impacts operation of the Cilium daemon. release-note/bug This PR fixes an issue in a previous release of Cilium. needs-backport/1.10 labels Dec 20, 2021
@brb brb requested review from a team and joamaki December 20, 2021 10:19
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.10.7 Dec 20, 2021
@brb
Copy link
Member Author

brb commented Dec 20, 2021

ci-l4lb

The 0ffa7c6 commit didn't remove all guards which previously were
used to check that XDP is enabled only with |--devices| == 1.

The last guard was not visible on v1.11 due to
#18304, while on v1.10 it failed on
the multi-dev XDP setups.

Fixes: 0ffa7c6 ("datapath,daemon: Enable multi-dev XDP")
Reported-by: Tobias Klauser <tobias@cilium.io>
Reported-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Martynas Pumputis <m@lambda.lt>
@brb
Copy link
Member Author

brb commented Dec 20, 2021

ci-l4lb

@brb
Copy link
Member Author

brb commented Dec 20, 2021

/ci-l4lb

@brb
Copy link
Member Author

brb commented Dec 20, 2021

ci-l4lb has passed. No need to run the whole suite.

Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@brb brb added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 20, 2021
@tklauser tklauser merged commit 227424a into master Dec 21, 2021
@tklauser tklauser deleted the pr/brb/fix-multidev-xdp branch December 21, 2021 11:18
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.10 in 1.10.7 Jan 3, 2022
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.10 to Backport done to v1.10 in 1.10.7 Jan 10, 2022
@qmonnet qmonnet added backport-done/1.11 The backport for Cilium 1.11.x for this PR is done. and removed backport-pending/1.11 labels Mar 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/daemon Impacts operation of the Cilium daemon. backport-done/1.11 The backport for Cilium 1.11.x for this PR is done. kind/bug This is a bug in the Cilium logic. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
No open projects
1.10.7
Backport done to v1.10
Development

Successfully merging this pull request may close these issues.

CI: v1.10: Cilium L4LB XDP (ci-l4lb-1.10): error: timed out waiting for the condition on pods/cilium-fxnz4
6 participants