Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177741072
D61749.1795174714.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
3 KB
Referenced Files
None
Subscribers
None
D61749.1795174714.diff
View Options
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1853,6 +1853,7 @@
cc_ack_received(tp, th, nsegs, CC_ACK);
tp->snd_una = th->th_ack;
+ tcp_adapt_iss_check(tp);
/*
* Pull snd_wl2 up to prevent seq wrap relative
* to th_ack.
@@ -2424,7 +2425,6 @@
/*
* Ack processing.
*/
- tcp_adapt_iss_check(tp);
if (!V_tcp_insecure_ack) {
tcp_seq seq_min;
bool ghost_ack_check;
@@ -3021,6 +3021,7 @@
SEQ_LEQ(th->th_ack, tp->snd_recover))
tp->snd_recover = th->th_ack - 1;
tp->snd_una = th->th_ack;
+ tcp_adapt_iss_check(tp);
if (IN_RECOVERY(tp->t_flags) &&
SEQ_GEQ(th->th_ack, tp->snd_recover)) {
cc_post_recovery(tp, th);
diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c
--- a/sys/netinet/tcp_stacks/bbr.c
+++ b/sys/netinet/tcp_stacks/bbr.c
@@ -7681,7 +7681,6 @@
bbr = (struct tcp_bbr *)tp->t_fb_ptr;
lost = bbr->r_ctl.rc_lost;
nsegs = max(1, m->m_pkthdr.lro_nsegs);
- tcp_adapt_iss_check(tp);
if (!V_tcp_insecure_ack) {
tcp_seq seq_min;
bool ghost_ack_check;
@@ -7801,6 +7800,7 @@
bbr_collapse_rtt(tp, bbr, TCP_REXMTVAL(tp));
}
tp->snd_una = th->th_ack;
+ tcp_adapt_iss_check(tp);
bbr_ack_received(tp, bbr, th, acked, sack_changed, prev_acked, __LINE__, (bbr->r_ctl.rc_lost - lost));
if (IN_RECOVERY(tp->t_flags)) {
if (SEQ_LT(th->th_ack, tp->snd_recover) &&
@@ -8658,6 +8658,7 @@
if (SEQ_GT(th->th_ack, tp->snd_una))
bbr_collapse_rtt(tp, bbr, TCP_REXMTVAL(tp));
tp->snd_una = th->th_ack;
+ tcp_adapt_iss_check(tp);
if (tp->snd_wnd < ctf_outstanding(tp))
/* The peer collapsed its window on us */
bbr_collapsed_window(bbr);
diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -11701,7 +11701,6 @@
INP_WLOCK_ASSERT(tptoinpcb(tp));
rack = (struct tcp_rack *)tp->t_fb_ptr;
- tcp_adapt_iss_check(tp);
if (!V_tcp_insecure_ack) {
tcp_seq seq_min;
bool ghost_ack_check;
@@ -11919,6 +11918,7 @@
ourfinisacked = 1;
}
tp->snd_una = th->th_ack;
+ tcp_adapt_iss_check(tp);
/* wakeups? */
if (acked_amount && sbavail(&so->so_snd))
rack_adjust_sendmap_head(rack, &so->so_snd);
@@ -12678,6 +12678,7 @@
SOCK_SENDBUF_LOCK(so);
mfree = sbcut_locked(&so->so_snd, acked);
tp->snd_una = th->th_ack;
+ tcp_adapt_iss_check(tp);
/* Note we want to hold the sb lock through the sendmap adjust */
rack_adjust_sendmap_head(rack, &so->so_snd);
/* Wake up the socket if we have room to write more */
@@ -15963,6 +15964,7 @@
* should be).
*/
tp->snd_una = high_seq;
+ tcp_adapt_iss_check(tp);
}
/* Did we make a RTO error? */
if ((tp->t_flags & TF_PREVVALID) &&
@@ -15997,6 +15999,7 @@
SOCK_SENDBUF_LOCK(so);
mfree = sbcut_locked(&so->so_snd, acked_amount);
tp->snd_una = high_seq;
+ tcp_adapt_iss_check(tp);
/* Note we want to hold the sb lock through the sendmap adjust */
rack_adjust_sendmap_head(rack, &so->so_snd);
/* Wake up the socket if we have room to write more */
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Nov 20, 11:38 AM (22 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41866766
Default Alt Text
D61749.1795174714.diff (3 KB)
Attached To
Mode
D61749: tcp: improve ISS checking for ghost ACKs
Attached
Detach File
Event Timeline