svn commit: r247498 - stable/9/sys/netinet

[John Baldwin]

Author: jhb
Date: Thu Feb 28 21:24:10 2013
New Revision: 247498
URL: http://svnweb.freebsd.org/changeset/base/247498

Log:
  MFC 245238:
  Add an option to not drop options from the third retransmitted SYN.  If the
  SYNs (or SYN/ACK replies) are dropped due to network congestion, then the
  remote end of the connection may act as if options such as window scaling
  are enabled but the local end will think they are not.  This can result in
  very slow data transfers in the case of window scaling disagreements.
  
  Note that the unlike HEAD the existing behavior is preserved by default,
  but it can be disabled by setting the
  net.inet.tcp.rexmit_drop_options sysctl to zero.

Modified:
  stable/9/sys/netinet/tcp_timer.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/tcp_timer.c
==============================================================================
--- stable/9/sys/netinet/tcp_timer.c	Thu Feb 28 19:51:30 2013	(r247497)
+++ stable/9/sys/netinet/tcp_timer.c	Thu Feb 28 21:24:10 2013	(r247498)
@@ -118,6 +118,11 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, keep
 	/* max idle probes */
 int	tcp_maxpersistidle;
 
+static int	tcp_rexmit_drop_options = 1;
+SYSCTL_INT(_net_inet_tcp, OID_AUTO, rexmit_drop_options, CTLFLAG_RW,
+    &tcp_rexmit_drop_options, 0,
+    "Drop TCP options from 3rd and later retransmitted SYN");
+
 static int	per_cpu_timers = 0;
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, per_cpu_timers, CTLFLAG_RW,
     &per_cpu_timers , 0, "run tcp timers on all cpus");
@@ -578,7 +583,8 @@ tcp_timer_rexmt(void * xtp)
 	 * header compression code which trashes TCP segments containing
 	 * unknown-to-them TCP options.
 	 */
-	if ((tp->t_state == TCPS_SYN_SENT) && (tp->t_rxtshift == 3))
+	if (tcp_rexmit_drop_options && (tp->t_state == TCPS_SYN_SENT) &&
+	    (tp->t_rxtshift == 3))
 		tp->t_flags &= ~(TF_REQ_SCALE|TF_REQ_TSTMP);
 	/*
 	 * If we backed off this far, our srtt estimate is probably bogus.