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

v1.9 backports 2022-01-10 #18419

Merged
merged 2 commits into from
Jan 11, 2022
Merged

Conversation

pchaigno
Copy link
Member

Once this PR is merged, you can update the PR labels via:

$ for pr in 18342 18388; do contrib/backporting/set-labels.py $pr done 1.9; done

necatican and others added 2 commits January 10, 2022 11:42
[ upstream commit d8577ff ]

Previously, the Kubespray documentation recommended changing the role variables.
However, changing the role files in an Ansible playbook could lead to problems.
So, with this commit, the documentation recommends using the extra variables or editing the group_vars files.

Co-authored-by: Yasin Taha Erol <yasintahaerol@gmail.com>
Signed-off-by: necatican <necaticanyildirim@gmail.com>
Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit ecdff12 ]

Fix TX queue selection problem on the phys device as reported by Laurent.
At high throughput, they noticed a significant amount of TCP retransmissions
that they tracked back to qdic drops (fq_codel was used).

Suspicion is that kernel commit edbea9220251 ("veth: Store queue_mapping
independently of XDP prog presence") caused this due to its unconditional
skb_record_rx_queue() which sets queue mapping to 1, and thus this gets
propagated all the way to the physical device hitting only single queue
in a mq device.

Lets have bpf_lxc reset it as a workaround until we have a kernel fix.
Doing this unconditionally is good anyway in order to avoid Pods messing
with TX queue selection.

Kernel will catch up with fix in 710ad98c363a ("veth: Do not record rx queue
hint in veth_xmit").

Fixes: cilium#18311
Reported-by: Laurent Bernaille <laurent.bernaille@datadoghq.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Tested-by: Laurent Bernaille <laurent.bernaille@datadoghq.com>
Link (Bug): https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=edbea922025169c0e5cdca5ebf7bf5374cc5566c
Link (Fix): https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=710ad98c363a66a0cd8526465426c5c5f8377ee0
Signed-off-by: Paul Chaignon <paul@cilium.io>
@pchaigno pchaigno requested a review from a team as a code owner January 10, 2022 10:45
@pchaigno pchaigno added backport/1.9 kind/backports This PR provides functionality previously merged into master. labels Jan 10, 2022
@pchaigno
Copy link
Member Author

pchaigno commented Jan 10, 2022

test-backport-1.9

@pchaigno
Copy link
Member Author

The only failing CI job is GKE, but it's known to be broken and was triggered by error. Merging.

@pchaigno pchaigno added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jan 11, 2022
@pchaigno pchaigno merged commit e527987 into cilium:v1.9 Jan 11, 2022
@pchaigno pchaigno deleted the pr/v1.9-backport-2022-01-10 branch January 11, 2022 17:53
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants