* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
+ * must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
#include <netinet/ip.h>
#include <netinet/in_pcb.h>
#include <netinet/ip_var.h>
-#if INET6
#include <netinet6/in6_pcb.h>
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
-#endif
#include <netinet/tcp.h>
-//#define TCPOUTFLAGS
#include <netinet/tcp_fsm.h>
#include <netinet/tcp_seq.h>
#include <netinet/tcp_timer.h>
&tcp_sack_globalholes, 0,
"Global number of TCP SACK holes currently allocated");
-static int tcp_detect_reordering = 1;
-static int tcp_dsack_ignore_hw_duplicates = 0;
-
-#if (DEVELOPMENT || DEBUG)
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, detect_reordering,
- CTLFLAG_RW | CTLFLAG_LOCKED,
- &tcp_detect_reordering, 0, "");
-
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, ignore_hw_duplicates,
- CTLFLAG_RW | CTLFLAG_LOCKED,
- &tcp_dsack_ignore_hw_duplicates, 0, "");
-#endif /* (DEVELOPMENT || DEBUG) */
-
extern struct zone *sack_hole_zone;
#define TCP_VALIDATE_SACK_SEQ_NUMBERS(_tp_, _sb_, _ack_) \
/*
* Copy the saved SACK blocks back.
*/
- bcopy(saved_blks, &tp->sackblks[num_head],
- sizeof(struct sackblk) * num_saved);
+ bcopy(saved_blks, &tp->sackblks[num_head], sizeof(struct sackblk) * num_saved);
}
/* Save the number of SACK blocks. */
if ((tp->t_flags & TF_STRETCHACK) != 0 && tp->rcv_numsacks > 0) {
tcp_reset_stretch_ack(tp);
}
+ if (tp->rcv_numsacks > 0) {
+ tp->t_forced_acks = TCP_FORCED_ACKS_COUNT;
+ }
#if TRAFFIC_MGT
if (tp->acc_iaj > 0 && tp->rcv_numsacks > 0) {
/*
* Detect reordering from SACK information by checking
* if recently sacked data was never retransmitted from this hole.
+ *
+ * First, we look for the byte in the list of retransmitted segments. This one
+ * will contain even the segments that are retransmitted thanks to RTO/TLP.
+ *
+ * Then, we check the sackhole which indicates whether or not the sackhole
+ * was subject to retransmission.
*/
- if (SEQ_LT(s->rxmit, sacked_seq)) {
+ if (SEQ_LT(s->rxmit, sacked_seq) &&
+ (!tcp_do_better_lr || tcp_rxtseg_find(tp, sacked_seq - 1, sacked_seq - 1) == NULL)) {
reordered = 1;
tcpstat.tcps_avoid_rxmt++;
}
if (reordered) {
- if (tcp_detect_reordering == 1 &&
- !(tp->t_flagsext & TF_PKTS_REORDERED)) {
+ if (!(tp->t_flagsext & TF_PKTS_REORDERED)) {
tp->t_flagsext |= TF_PKTS_REORDERED;
tcpstat.tcps_detect_reordering++;
}
}
}
+static void
+tcp_sack_update_byte_counter(struct tcpcb *tp, uint32_t start, uint32_t end,
+ uint32_t *newbytes_acked, uint32_t *towards_fr_acked)
+{
+ *newbytes_acked += (end - start);
+ if (SEQ_GEQ(start, tp->send_highest_sack)) {
+ *towards_fr_acked += (end - start);
+ }
+}
+
/*
* Process cumulative ACK and the TCP SACK option to update the scoreboard.
* tp->snd_holes is an ordered list of holes (oldest to newest, in terms of
*/
void
tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, struct tcphdr *th,
- u_int32_t *newbytes_acked)
+ u_int32_t *newbytes_acked, uint32_t *after_rexmit_acked)
{
struct sackhole *cur, *temp;
struct sackblk sack, sack_blocks[TCP_MAX_SACK + 1], *sblkp;
* the logic that adds holes to the tail of the scoreboard).
*/
tp->snd_fack = SEQ_MAX(tp->snd_una, th_ack);
- *newbytes_acked += (tp->snd_fack - tp->snd_una);
}
old_snd_fack = tp->snd_fack;
temp = tcp_sackhole_insert(tp, tp->snd_fack, sblkp->start, NULL);
if (temp != NULL) {
tp->snd_fack = sblkp->end;
- *newbytes_acked += (sblkp->end - sblkp->start);
+ tcp_sack_update_byte_counter(tp, sblkp->start, sblkp->end, newbytes_acked, after_rexmit_acked);
/* Go to the previous sack block. */
sblkp--;
}
if (sblkp >= sack_blocks &&
SEQ_LT(tp->snd_fack, sblkp->end)) {
- *newbytes_acked += (sblkp->end - tp->snd_fack);
+ tcp_sack_update_byte_counter(tp, tp->snd_fack, sblkp->end, newbytes_acked, after_rexmit_acked);
tp->snd_fack = sblkp->end;
}
}
} else if (SEQ_LT(tp->snd_fack, sblkp->end)) {
/* fack is advanced. */
- *newbytes_acked += (sblkp->end - tp->snd_fack);
+ tcp_sack_update_byte_counter(tp, tp->snd_fack, sblkp->end, newbytes_acked, after_rexmit_acked);
tp->snd_fack = sblkp->end;
}
/* We must have at least one SACK hole in scoreboard */
continue;
}
tp->sackhint.sack_bytes_rexmit -= (cur->rxmit - cur->start);
+ if (tp->sackhint.sack_bytes_rexmit < 0) {
+ tp->sackhint.sack_bytes_rexmit = 0;
+ }
+
if (SEQ_LEQ(sblkp->start, cur->start)) {
/* Data acks at least the beginning of hole */
if (SEQ_GEQ(sblkp->end, cur->end)) {
/* Acks entire hole, so delete hole */
- *newbytes_acked += (cur->end - cur->start);
+ tcp_sack_update_byte_counter(tp, cur->start, cur->end, newbytes_acked, after_rexmit_acked);
tcp_sack_detect_reordering(tp, cur,
cur->end, old_snd_fack);
continue;
} else {
/* Move start of hole forward */
- *newbytes_acked += (sblkp->end - cur->start);
+ tcp_sack_update_byte_counter(tp, cur->start, sblkp->end, newbytes_acked, after_rexmit_acked);
tcp_sack_detect_reordering(tp, cur,
sblkp->end, old_snd_fack);
cur->start = sblkp->end;
/* Data acks at least the end of hole */
if (SEQ_GEQ(sblkp->end, cur->end)) {
/* Move end of hole backward */
- *newbytes_acked += (cur->end - sblkp->start);
+ tcp_sack_update_byte_counter(tp, sblkp->start, cur->end, newbytes_acked, after_rexmit_acked);
tcp_sack_detect_reordering(tp, cur,
cur->end, old_snd_fack);
cur->end = sblkp->start;
* ACKs some data in the middle of a hole;
* need to split current hole
*/
- *newbytes_acked += (sblkp->end - sblkp->start);
tcp_sack_detect_reordering(tp, cur,
sblkp->end, old_snd_fack);
temp = tcp_sackhole_insert(tp, sblkp->end,
cur->end, cur);
if (temp != NULL) {
+ tcp_sack_update_byte_counter(tp, sblkp->start, sblkp->end, newbytes_acked, after_rexmit_acked);
if (SEQ_GT(cur->rxmit, temp->rxmit)) {
temp->rxmit = cur->rxmit;
tp->sackhint.sack_bytes_rexmit
tcp_sackhole_remove(tp, q);
}
tp->sackhint.sack_bytes_rexmit = 0;
+ tp->sackhint.sack_bytes_acked = 0;
+ tp->t_new_dupacks = 0;
tp->sackhint.nexthole = NULL;
tp->sack_newdata = 0;
}
if (((BYTES_ACKED(th, tp)) / tp->t_maxseg) > 2) {
num_segs = 2;
}
- tp->snd_cwnd = (tp->sackhint.sack_bytes_rexmit +
- (tp->snd_nxt - tp->sack_newdata) +
- num_segs * tp->t_maxseg);
+ if (tcp_do_better_lr) {
+ tp->snd_cwnd = tcp_flight_size(tp) + num_segs * tp->t_maxseg;
+ } else {
+ tp->snd_cwnd = (tp->sackhint.sack_bytes_rexmit +
+ (tp->snd_nxt - tp->sack_newdata) +
+ num_segs * tp->t_maxseg);
+ }
if (tp->snd_cwnd > tp->snd_ssthresh) {
tp->snd_cwnd = tp->snd_ssthresh;
}
return hole;
}
+void
+tcp_sack_lost_rexmit(struct tcpcb *tp)
+{
+ struct sackhole *hole = TAILQ_FIRST(&tp->snd_holes);
+
+ while (hole) {
+ hole->rxmit = hole->start;
+ hole->rxmit_start = tcp_now;
+
+ hole = TAILQ_NEXT(hole, scblink);
+ }
+
+ tp->sackhint.nexthole = TAILQ_FIRST(&tp->snd_holes);
+ tp->sackhint.sack_bytes_rexmit = 0;
+ tp->sack_newdata = tp->snd_nxt;
+}
+
/*
* After a timeout, the SACK list may be rebuilt. This SACK information
* should be used to avoid retransmitting SACKed data. This function
tcpstat.tcps_dsack_recvd++;
tp->t_dsack_recvd++;
- /* ignore DSACK option, if DSACK is disabled */
- if (tp->t_flagsext & TF_DISABLE_DSACK) {
- return TRUE;
- }
-
/* If the DSACK is for TLP mark it as such */
if ((tp->t_flagsext & TF_SENT_TLPROBE) &&
first_sack.end == tp->t_tlphighrxt) {
tcpstat.tcps_dsack_ackloss++;
return TRUE;
- } else if ((rxseg = tcp_rxtseg_find(tp, first_sack.start,
- (first_sack.end - 1))) == NULL) {
- /*
- * Duplicate notification was not triggered by a
- * retransmission. This might be due to network duplication,
- * disable further DSACK processing.
- */
- if (!tcp_dsack_ignore_hw_duplicates) {
- tp->t_flagsext |= TF_DISABLE_DSACK;
- tcpstat.tcps_dsack_disable++;
- }
} else {
- /*
- * If the segment was retransmitted only once, mark it as
- * spurious. Otherwise ignore the duplicate notification.
- */
- if (rxseg->rx_count == 1) {
- rxseg->rx_flags |= TCP_RXT_SPURIOUS;
- } else {
- rxseg->rx_flags &= ~TCP_RXT_SPURIOUS;
- }
+ tcp_rxtseg_set_spurious(tp, first_sack.start, (first_sack.end - 1));
}
return TRUE;
}
projects / apple / xnu.git / blobdiff