From owner-svn-src-stable-7@FreeBSD.ORG Sat Nov 27 03:12:39 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6FC38106564A; Sat, 27 Nov 2010 03:12:39 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5C7718FC08; Sat, 27 Nov 2010 03:12:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAR3CdsQ008968; Sat, 27 Nov 2010 03:12:39 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAR3CdGH008966; Sat, 27 Nov 2010 03:12:39 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201011270312.oAR3CdGH008966@svn.freebsd.org> From: Lawrence Stewart Date: Sat, 27 Nov 2010 03:12:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215926 - stable/7/sys/netinet X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Nov 2010 03:12:39 -0000 Author: lstewart Date: Sat Nov 27 03:12:39 2010 New Revision: 215926 URL: http://svn.freebsd.org/changeset/base/215926 Log: Partially MFC r215166: Disable priming the congestion window from the host cache. The current method interacts poorly with delayed ack amongst other things, resulting in undesired delay during a connection's opening slow start. Even if we did fix the issues, the current method is still dubious at best and needs to be thought through thoroughly. Due to a mistake on my behalf, the change described above was committed to head as part of a larger patch in revision 215166. Instead of waiting for the MFC of 215166, I'm merging just this small portion for the upcoming release without bringing the mergeinfo for r215166 along. The mergeinfo will sort itself out when r215166 is eventually merged. This is an intentional direct commit to the 7-STABLE branch. Reported by: Maxim Dounin and others Submitted by: andre Modified: stable/7/sys/netinet/tcp_input.c Modified: stable/7/sys/netinet/tcp_input.c ============================================================================== --- stable/7/sys/netinet/tcp_input.c Sat Nov 27 02:18:55 2010 (r215925) +++ stable/7/sys/netinet/tcp_input.c Sat Nov 27 03:12:39 2010 (r215926) @@ -2987,10 +2987,14 @@ tcp_mss(struct tcpcb *tp, int offer) * hostcache when cwnd collapses so next connection doesn't * overloads the path again. * + * XXXAO: Initializing the CWND from the hostcache is broken + * and in its current form not RFC conformant. It is disabled + * until fixed or removed entirely. + * * RFC3390 says only do this if SYN or SYN/ACK didn't got lost. * We currently check only in syncache_socket for that. */ -#define TCP_METRICS_CWND +/* #define TCP_METRICS_CWND */ #ifdef TCP_METRICS_CWND if (metrics.rmx_cwnd) tp->snd_cwnd = max(mss,