aboutsummaryrefslogtreecommitdiff
path: root/sys/netinet/tcp_stacks/bbr.c
diff options
context:
space:
mode:
authorRandall Stewart <rrs@FreeBSD.org>2020-05-07 20:29:38 +0000
committerRandall Stewart <rrs@FreeBSD.org>2020-05-07 20:29:38 +0000
commitb1ddcbc62c6566c8759177c7c3d1ff0ad6b09449 (patch)
tree256f9282d3e6bae5b61dd2d306c3fa1efb6c9150 /sys/netinet/tcp_stacks/bbr.c
parente6f612dc1abbb7456cd03a5190349184cfdbef73 (diff)
downloadsrc-b1ddcbc62c6566c8759177c7c3d1ff0ad6b09449.tar.gz
src-b1ddcbc62c6566c8759177c7c3d1ff0ad6b09449.zip
When in the SYN-SENT state bbr and rack will not properly send an ACK but instead start the D-ACK timer. This
causes so_reuseport_lb_test to fail since it slows down how quickly the program runs until the timeout occurs and fails the test Sponsored by: Netflix inc. Differential Revision: https://reviews.freebsd.org/D24747
Notes
Notes: svn path=/head/; revision=360798
Diffstat (limited to 'sys/netinet/tcp_stacks/bbr.c')
-rw-r--r--sys/netinet/tcp_stacks/bbr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c
index 27fd4de158d7..1cf17590625f 100644
--- a/sys/netinet/tcp_stacks/bbr.c
+++ b/sys/netinet/tcp_stacks/bbr.c
@@ -4078,6 +4078,7 @@ bbr_cong_signal(struct tcpcb *tp, struct tcphdr *th, uint32_t type, struct bbr_s
*/
#define DELAY_ACK(tp, bbr, nsegs) \
(((tp->t_flags & TF_RXWIN0SENT) == 0) && \
+ ((tp->t_flags & TF_DELACK) == 0) && \
((bbr->bbr_segs_rcvd + nsegs) < tp->t_delayed_ack) && \
(tp->t_delayed_ack || (tp->t_flags & TF_NEEDSYN)))
@@ -8992,7 +8993,7 @@ bbr_do_syn_sent(struct mbuf *m, struct tcphdr *th, struct socket *so,
* If there's data, delay ACK; if there's also a FIN ACKNOW
* will be turned on later.
*/
- if (DELAY_ACK(tp, bbr, 1) && tlen != 0 && (tfo_partial == 0)) {
+ if (DELAY_ACK(tp, bbr, 1) && tlen != 0 && !tfo_partial) {
bbr->bbr_segs_rcvd += 1;
tp->t_flags |= TF_DELACK;
bbr_timer_cancel(bbr, __LINE__, bbr->r_ctl.rc_rcvtime);