Page MenuHomeFreeBSD
Files F157023353

D30451.diff
No OneTemporary
Actions

D30451.diff
View Options

Index: sys/netinet/tcp_input.c
===================================================================
--- sys/netinet/tcp_input.c
+++ sys/netinet/tcp_input.c
@@ -3191,8 +3191,10 @@
* when trimming from the head.
*/
tcp_seq temp = save_start;
- thflags = tcp_reass(tp, th, &temp, &tlen, m);
- tp->t_flags |= TF_ACKNOW;
+ if (tlen) {
+ thflags = tcp_reass(tp, th, &temp, &tlen, m);
+ tp->t_flags |= TF_ACKNOW;
+ }
}
if ((tp->t_flags & TF_SACK_PERMIT) &&
(save_tlen > 0) &&
Index: sys/netinet/tcp_stacks/bbr.c
===================================================================
--- sys/netinet/tcp_stacks/bbr.c
+++ sys/netinet/tcp_stacks/bbr.c
@@ -8320,8 +8320,10 @@
* trimming from the head.
*/
tcp_seq temp = save_start;
- thflags = tcp_reass(tp, th, &temp, &tlen, m);
- tp->t_flags |= TF_ACKNOW;
+ if (tlen) {
+ thflags = tcp_reass(tp, th, &temp, &tlen, m);
+ tp->t_flags |= TF_ACKNOW;
+ }
}
if ((tp->t_flags & TF_SACK_PERMIT) &&
(save_tlen > 0) &&
Index: sys/netinet/tcp_stacks/rack.c
===================================================================
--- sys/netinet/tcp_stacks/rack.c
+++ sys/netinet/tcp_stacks/rack.c
@@ -6017,7 +6017,7 @@
struct mbuf *m;
uint32_t soff;
- if (src_rsm->orig_m_len != src_rsm->m->m_len) {
+ if (src_rsm->m && (src_rsm->orig_m_len != src_rsm->m->m_len)) {
/* Fix up the orig_m_len and possibly the mbuf offset */
rack_adjust_orig_mlen(src_rsm);
}
@@ -8818,21 +8818,23 @@
rack->r_ctl.rc_gp_cumack_ts = rsm->r_tim_lastsent[(rsm->r_rtr_cnt-1)];
rack_log_map_chg(tp, rack, NULL, rsm, NULL, MAP_TRIM_HEAD, th_ack, __LINE__);
/* Now we need to move our offset forward too */
- if (rsm->orig_m_len != rsm->m->m_len) {
+ if (rsm->m && (rsm->orig_m_len != rsm->m->m_len)) {
/* Fix up the orig_m_len and possibly the mbuf offset */
rack_adjust_orig_mlen(rsm);
}
rsm->soff += (th_ack - rsm->r_start);
rsm->r_start = th_ack;
/* Now do we need to move the mbuf fwd too? */
- while (rsm->soff >= rsm->m->m_len) {
- rsm->soff -= rsm->m->m_len;
- rsm->m = rsm->m->m_next;
- KASSERT((rsm->m != NULL),
- (" nrsm:%p hit at soff:%u null m",
- rsm, rsm->soff));
- }
- rsm->orig_m_len = rsm->m->m_len;
+ if (rsm->m) {
+ while (rsm->soff >= rsm->m->m_len) {
+ rsm->soff -= rsm->m->m_len;
+ rsm->m = rsm->m->m_next;
+ KASSERT((rsm->m != NULL),
+ (" nrsm:%p hit at soff:%u null m",
+ rsm, rsm->soff));
+ }
+ rsm->orig_m_len = rsm->m->m_len;
+ }
if (rack->app_limited_needs_set)
rack_need_set_test(tp, rack, rsm, tp->snd_una, __LINE__, RACK_USE_BEG);
}
@@ -9655,7 +9657,7 @@
/* Nothing outstanding */
return;
}
- while (rsm->m == m) {
+ while (rsm->m && (rsm->m == m)) {
/* one to adjust */
#ifdef INVARIANTS
struct mbuf *tm;
@@ -9676,10 +9678,16 @@
}
rsm->m = tm;
rsm->soff = soff;
- rsm->orig_m_len = rsm->m->m_len;
+ if (tm)
+ rsm->orig_m_len = rsm->m->m_len;
+ else
+ rsm->orig_m_len = 0;
#else
rsm->m = sbsndmbuf(sb, (rsm->r_start - snd_una), &rsm->soff);
- rsm->orig_m_len = rsm->m->m_len;
+ if (rsm->m)
+ rsm->orig_m_len = rsm->m->m_len;
+ else
+ rsm->orig_m_len = 0;
#endif
rsm = RB_NEXT(rack_rb_tree_head, &rack->r_ctl.rc_mtree,
rsm);
@@ -10058,6 +10066,7 @@
}
}
+
/*
* Return value of 1, the TCB is unlocked and most
* likely gone, return value of 0, the TCP is still
@@ -10226,9 +10235,10 @@
* trimming from the head.
*/
tcp_seq temp = save_start;
-
- thflags = tcp_reass(tp, th, &temp, &tlen, m);
- tp->t_flags |= TF_ACKNOW;
+ if (tlen) {
+ thflags = tcp_reass(tp, th, &temp, &tlen, m);
+ tp->t_flags |= TF_ACKNOW;
+ }
}
if ((tp->t_flags & TF_SACK_PERMIT) &&
(save_tlen > 0) &&
@@ -12190,7 +12200,10 @@
rsm->r_dupack = 0;
if (rack->rc_inp->inp_socket->so_snd.sb_mb != NULL) {
rsm->m = sbsndmbuf(&rack->rc_inp->inp_socket->so_snd, 0, &rsm->soff);
- rsm->orig_m_len = rsm->m->m_len;
+ if (rsm->m)
+ rsm->orig_m_len = rsm->m->m_len;
+ else
+ rsm->orig_m_len = 0;
} else {
/*
* This can happen if we have a stand-alone FIN or
@@ -15074,6 +15087,7 @@
uint32_t us_cts;
uint32_t if_hw_tsomaxsegcount = 0, startseq;
uint32_t if_hw_tsomaxsegsize;
+
#ifdef INET6
struct ip6_hdr *ip6 = NULL;
@@ -15183,7 +15197,15 @@
}
th->th_seq = htonl(rsm->r_start);
th->th_ack = htonl(tp->rcv_nxt);
- if(rsm->r_flags & RACK_HAD_PUSH)
+ /*
+ * The PUSH bit should only be applied
+ * if the full retransmission is made. If
+ * we are sending less than this is the
+ * left hand edge and should not have
+ * the PUSH bit.
+ */
+ if ((rsm->r_flags & RACK_HAD_PUSH) &&
+ (len == (rsm->r_end - rsm->r_start)))
flags |= TH_PUSH;
th->th_flags = flags;
th->th_win = htons((u_short)(rack->r_ctl.fsb.recwin >> tp->rcv_scale));
Index: sys/netinet/tcp_usrreq.c
===================================================================
--- sys/netinet/tcp_usrreq.c
+++ sys/netinet/tcp_usrreq.c
@@ -2637,6 +2637,22 @@
tcp_state_change(tp, TCPS_LAST_ACK);
break;
}
+ if ((tp->t_state == TCPS_LAST_ACK) &&
+ (tp->t_flags & TF_SENTFIN)) {
+ /*
+ * If we have reached LAST_ACK, and
+ * we sent a FIN (e.g. via MSG_EOR), then
+ * we really should move to either FIN_WAIT_1
+ * or FIN_WAIT_2 depending on snd_max/snd_una.
+ */
+ if (tp->snd_una == tp->snd_max) {
+ /* The FIN is acked */
+ tcp_state_change(tp, TCPS_FIN_WAIT_2);
+ } else {
+ /* The FIN is still outstanding */
+ tcp_state_change(tp, TCPS_FIN_WAIT_1);
+ }
+ }
if (tp->t_state >= TCPS_FIN_WAIT_2) {
soisdisconnected(tp->t_inpcb->inp_socket);
/* Prevent the connection hanging in FIN_WAIT_2 forever. */

File Metadata

Mime Type
text/plain
Expires
Tue, May 19, 12:19 AM (8 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33279269
Default Alt Text
D30451.diff (5 KB)

Event Timeline