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.

Sign up for GitHub

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

Jump to bottom

bwm: queue mapping & cong fixes #15964

Merged
merged 2 commits into from
Apr 30, 2021
Merged

bwm: queue mapping & cong fixes #15964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9457e8
bpf: only mark v4/v6 traffic wrt EDT with LXC_ID
borkmann Apr 30, 2021
2156134
bwm: temporarily disable setting bbr until we have a pacing fix
borkmann Apr 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion bpf/bpf_lxc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,6 @@ int handle_xgress(struct __ctx_buff *ctx)
int ret;

bpf_clear_meta(ctx);
edt_set_aggregate(ctx, LXC_ID);

send_trace_notify(ctx, TRACE_FROM_LXC, SECLABEL, 0, 0, 0, 0,
TRACE_PAYLOAD_LEN);
Expand All @@ -978,13 +977,15 @@ int handle_xgress(struct __ctx_buff *ctx)
switch (proto) {
#ifdef ENABLE_IPV6
case bpf_htons(ETH_P_IPV6):
edt_set_aggregate(ctx, LXC_ID);
invoke_tailcall_if(__or(__and(is_defined(ENABLE_IPV4), is_defined(ENABLE_IPV6)),
is_defined(DEBUG)),
CILIUM_CALL_IPV6_FROM_LXC, tail_handle_ipv6);
break;
#endif /* ENABLE_IPV6 */
#ifdef ENABLE_IPV4
case bpf_htons(ETH_P_IP):
edt_set_aggregate(ctx, LXC_ID);
invoke_tailcall_if(__or(__and(is_defined(ENABLE_IPV4), is_defined(ENABLE_IPV6)),
is_defined(DEBUG)),
CILIUM_CALL_IPV4_FROM_LXC, tail_handle_ipv4);
Expand Down
5 changes: 4 additions & 1 deletion pkg/bandwidth/bandwidth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,11 @@ func InitBandwidthManager() {
{"net.core.netdev_max_backlog", "1000"},
{"net.core.somaxconn", "4096"},
{"net.core.default_qdisc", "fq"},
{"net.ipv4.tcp_congestion_control", "bbr"},
{"net.ipv4.tcp_max_syn_backlog", "4096"},
// Temporary disable setting bbr for now until we have a
// kernel fix for pacing out of Pods as described in #15324.
// Then, kernels with the fix can use bbr, and others cubic.
{"net.ipv4.tcp_congestion_control", "cubic"},
}
for _, s := range baseSettings {
log.WithFields(logrus.Fields{
Expand Down