Page MenuHomeFreeBSD
Files F105827712

D18892.id52992.diff
No OneTemporary
Actions

D18892.id52992.diff
View Options

Index: sys/netinet/tcp_input.c
===================================================================
--- sys/netinet/tcp_input.c
+++ sys/netinet/tcp_input.c
@@ -150,6 +150,18 @@
&VNET_NAME(drop_synfin), 0,
"Drop TCP packets with SYN+FIN set");
+VNET_DEFINE(int, tcp_do_prr_conservative) = 0;
+#define V_tcp_do_prr_conservative VNET(tcp_do_prr_conservative)
+SYSCTL_INT(_net_inet_tcp, OID_AUTO, do_prr_conservative, CTLFLAG_VNET | CTLFLAG_RW,
+ &VNET_NAME(tcp_do_prr_conservative), 0,
+ "Do conservative Proportional Rate Reduction");
+
+VNET_DEFINE(int, tcp_do_prr) = 1;
+#define V_tcp_do_prr VNET(tcp_do_prr)
+SYSCTL_INT(_net_inet_tcp, OID_AUTO, do_prr, CTLFLAG_VNET | CTLFLAG_RW,
+ &VNET_NAME(tcp_do_prr), 1,
+ "Enable Proportional Rate Reduction per RFC 6937");
+
VNET_DEFINE(int, tcp_do_rfc6675_pipe) = 0;
SYSCTL_INT(_net_inet_tcp, OID_AUTO, rfc6675_pipe, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(tcp_do_rfc6675_pipe), 0,
@@ -2548,13 +2560,58 @@
IN_FASTRECOVERY(tp->t_flags)) {
cc_ack_received(tp, th, nsegs,
CC_DUPACK);
- if ((tp->t_flags & TF_SACK_PERMIT) &&
+ if (V_tcp_do_prr &&
+ IN_FASTRECOVERY(tp->t_flags) &&
+ (tp->t_flags & TF_SACK_PERMIT)) {
+ long snd_cnt = 0, limit = 0;
+ long del_data = 0, pipe = 0;
+ /*
+ * In a duplicate ACK del_data is only the
+ * diff_in_sack. If no SACK is used del_data
+ * will be 0. Pipe is the amount of data we
+ * estimate to be in the network.
+ */
+ del_data = tp->sackhint.delivered_data;
+ pipe = (tp->snd_nxt - tp->snd_fack) +
+ tp->sackhint.sack_bytes_rexmit;
+ tp->sackhint.prr_delivered += del_data;
+ if (pipe > tp->snd_ssthresh) {
+ snd_cnt = (tp->sackhint.prr_delivered *
+ tp->snd_ssthresh / tp->sackhint.recover_fs) +
+ 1 - tp->sackhint.sack_bytes_rexmit;
+ }
+ else {
+ if (V_tcp_do_prr_conservative)
+ limit = tp->sackhint.prr_delivered - tp->sackhint.sack_bytes_rexmit;
+ else
+ if ((tp->sackhint.prr_delivered - tp->sackhint.sack_bytes_rexmit) > del_data)
+ limit = tp->sackhint.prr_delivered - tp->sackhint.sack_bytes_rexmit +
+ tp->t_maxseg;
+ else
+ limit = del_data + tp->t_maxseg;
+ if ((tp->snd_ssthresh - pipe) < limit)
+ snd_cnt = tp->snd_ssthresh - pipe;
+ else
+ snd_cnt = limit;
+ }
+ snd_cnt = max((snd_cnt / tp->t_maxseg), 0);
+ /*
+ * Send snd_cnt new data into the network in
+ * response to this ACK. If there is a going
+ * to be a SACK retransmission, adjust snd_cwnd
+ * accordingly.
+ */
+ tp->snd_cwnd = tp->snd_nxt - tp->snd_recover +
+ tp->sackhint.sack_bytes_rexmit +
+ (snd_cnt * tp->t_maxseg);
+ }
+ else if ((tp->t_flags & TF_SACK_PERMIT) &&
IN_FASTRECOVERY(tp->t_flags)) {
int awnd;
/*
* Compute the amount of data in flight first.
- * We can inject new data into the pipe iff
+ * We can inject new data into the pipe iff
* we have less than 1/2 the original window's
* worth of data in flight.
*/
@@ -2577,12 +2634,18 @@
tcp_seq onxt = tp->snd_nxt;
/*
- * If we're doing sack, check to
- * see if we're already in sack
+ * If we're doing sack, or prr, check
+ * to see if we're already in sack
* recovery. If we're not doing sack,
* check to see if we're in newreno
* recovery.
*/
+ if (V_tcp_do_prr) {
+ if (IN_FASTRECOVERY(tp->t_flags)) {
+ tp->t_dupacks = 0;
+ break;
+ }
+ }
if (tp->t_flags & TF_SACK_PERMIT) {
if (IN_FASTRECOVERY(tp->t_flags)) {
tp->t_dupacks = 0;
@@ -2601,6 +2664,16 @@
CC_DUPACK);
tcp_timer_activate(tp, TT_REXMT, 0);
tp->t_rtttime = 0;
+ if (V_tcp_do_prr) {
+ /*
+ * snd_ssthresh is already updated by
+ * cc_cong_signal.
+ */
+ tp->sackhint.prr_delivered = 0;
+ tp->sackhint.sack_bytes_rexmit = 0;
+ if (!(tp->sackhint.recover_fs = tp->snd_nxt - tp->snd_una))
+ tp->sackhint.recover_fs = 1;
+ }
if (tp->t_flags & TF_SACK_PERMIT) {
TCPSTAT_INC(
tcps_sack_recovery_episode);
@@ -2700,7 +2773,10 @@
if (IN_FASTRECOVERY(tp->t_flags)) {
if (SEQ_LT(th->th_ack, tp->snd_recover)) {
if (tp->t_flags & TF_SACK_PERMIT)
- tcp_sack_partialack(tp, th);
+ if (V_tcp_do_prr)
+ tcp_prr_partialack(tp, th);
+ else
+ tcp_sack_partialack(tp, th);
else
tcp_newreno_partial_ack(tp, th);
} else
@@ -3771,6 +3847,52 @@
return (mss);
}
+void
+tcp_prr_partialack(struct tcpcb *tp, struct tcphdr *th)
+{
+ long snd_cnt = 0, limit = 0, del_data = 0, pipe = 0;
+
+ INP_WLOCK_ASSERT(tp->t_inpcb);
+
+ tcp_timer_activate(tp, TT_REXMT, 0);
+ tp->t_rtttime = 0;
+ /*
+ * Compute the amount of data that this ACK is indicating
+ * (del_data) and an estimate of how many bytes are in the
+ * network.
+ */
+ if (SEQ_GEQ(th->th_ack, tp->snd_una))
+ del_data = BYTES_THIS_ACK(tp, th);
+ del_data += tp->sackhint.delivered_data;
+ pipe = (tp->snd_nxt - tp->snd_fack) + tp->sackhint.sack_bytes_rexmit;
+ tp->sackhint.prr_delivered += del_data;
+ /*
+ * Proportional Rate Reduction
+ */
+ if (pipe > tp->snd_ssthresh)
+ snd_cnt = (tp->sackhint.prr_delivered * tp->snd_ssthresh / tp->sackhint.recover_fs) -
+ tp->sackhint.sack_bytes_rexmit;
+ else {
+ if (V_tcp_do_prr_conservative)
+ limit = tp->sackhint.prr_delivered - tp->sackhint.sack_bytes_rexmit;
+ else
+ if ((tp->sackhint.prr_delivered - tp->sackhint.sack_bytes_rexmit) > del_data)
+ limit = tp->sackhint.prr_delivered - tp->sackhint.sack_bytes_rexmit + tp->t_maxseg;
+ else
+ limit = del_data + tp->t_maxseg;
+ snd_cnt = min((tp->snd_ssthresh - pipe), limit);
+ }
+ snd_cnt = max((snd_cnt / tp->t_maxseg), 0);
+ /*
+ * Send snd_cnt new data into the network in response to this ack.
+ * If there is going to be a SACK retransmission, adjust snd_cwnd
+ * accordingly.
+ */
+ tp->snd_cwnd = tp->snd_nxt - tp->snd_recover +
+ tp->sackhint.sack_bytes_rexmit + (snd_cnt * tp->t_maxseg);
+ tp->t_flags |= TF_ACKNOW;
+ (void) tcp_output(tp);
+}
/*
* On a partial ack arrives, force the retransmission of the
Index: sys/netinet/tcp_var.h
===================================================================
--- sys/netinet/tcp_var.h
+++ sys/netinet/tcp_var.h
@@ -78,8 +78,9 @@
int32_t sacked_bytes; /* Total sacked bytes reported by the
* receiver via sack option
*/
- uint32_t _pad1[1]; /* TBD */
- uint64_t _pad[1]; /* TBD */
+ uint32_t recover_fs; /* Flight Size at the start of Loss recovery */
+ uint32_t prr_delivered; /* Total bytes delivered using PRR */
+ uint32_t _pad[1]; /* TBD */
};
#define SEGQ_EMPTY(tp) TAILQ_EMPTY(&(tp)->t_segq)
@@ -851,6 +852,7 @@
struct tcphdr *, struct mbuf *, int);
void tcp_xmit_timer(struct tcpcb *, int);
void tcp_newreno_partial_ack(struct tcpcb *, struct tcphdr *);
+void tcp_prr_partialack(struct tcpcb *, struct tcphdr *);
void cc_ack_received(struct tcpcb *tp, struct tcphdr *th,
uint16_t nsegs, uint16_t type);
void cc_conn_init(struct tcpcb *tp);
@@ -936,6 +938,7 @@
void tcp_clean_sackreport(struct tcpcb *tp);
void tcp_sack_adjust(struct tcpcb *tp);
struct sackhole *tcp_sack_output(struct tcpcb *tp, int *sack_bytes_rexmt);
+void tcp_prr_partialack(struct tcpcb *, struct tcphdr *);
void tcp_sack_partialack(struct tcpcb *, struct tcphdr *);
void tcp_free_sackholes(struct tcpcb *tp);
int tcp_newreno(struct tcpcb *, struct tcphdr *);

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 22, 8:05 AM (21 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15551596
Default Alt Text
D18892.id52992.diff (7 KB)

Event Timeline