From owner-cvs-src@FreeBSD.ORG Tue Dec 18 11:49:40 2007 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC71716A417; Tue, 18 Dec 2007 11:49:40 +0000 (UTC) (envelope-from rermilov@team.vega.ru) Received: from mail.vega.ru (infra.dev.vega.ru [90.156.167.14]) by mx1.freebsd.org (Postfix) with ESMTP id 60F3613C45A; Tue, 18 Dec 2007 11:49:40 +0000 (UTC) (envelope-from rermilov@team.vega.ru) Received: from [87.242.97.68] (port=57234 helo=edoofus.dev.vega.ru) by mail.vega.ru with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68 (FreeBSD)) (envelope-from ) id 1J4ax9-000OvG-Ky; Tue, 18 Dec 2007 11:49:39 +0000 Received: from edoofus.dev.vega.ru (localhost [127.0.0.1]) by edoofus.dev.vega.ru (8.14.2/8.14.2) with ESMTP id lBIBnSX2002502; Tue, 18 Dec 2007 14:49:28 +0300 (MSK) (envelope-from rermilov@team.vega.ru) Received: (from ru@localhost) by edoofus.dev.vega.ru (8.14.2/8.14.2/Submit) id lBIBnSO7002501; Tue, 18 Dec 2007 14:49:28 +0300 (MSK) (envelope-from rermilov@team.vega.ru) X-Authentication-Warning: edoofus.dev.vega.ru: ru set sender to rermilov@team.vega.ru using -f Date: Tue, 18 Dec 2007 14:49:28 +0300 From: Ruslan Ermilov To: Peter Wemm Message-ID: <20071218114928.GC1316@team.vega.ru> References: <200712180339.lBI3dHlU018368@repoman.freebsd.org> <20071218033921.56E7D16A5B9@hub.freebsd.org> <200712180339.lBI3dHlU018368@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20071218033921.56E7D16A5B9@hub.freebsd.org> <200712180339.lBI3dHlU018368@repoman.freebsd.org> User-Agent: Mutt/1.5.16 (2007-06-09) Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/netinet tcp_subr.c tcp_timer.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Dec 2007 11:49:40 -0000 Hi, On Tue, Dec 18, 2007 at 03:39:17AM +0000, Peter Wemm wrote: > peter 2007-12-18 03:39:17 UTC > > FreeBSD src repository > > Modified files: (Branch: RELENG_6) > sys/netinet tcp_subr.c tcp_timer.h > Log: > MFC: scale TCPTV_MIN with hz, not a fixed number of ticks. Otherwise > machines with hz=1000 drop connections in a matter of a few seconds on a > fast link (eg: ethernet). With this change, it drops them in the same > time as a machine with hz=100 would. > > Revision Changes Path > 1.228.2.16 +2 -0 src/sys/netinet/tcp_subr.c > 1.27.2.4 +1 -1 src/sys/netinet/tcp_timer.h That explains why I couldn't find a matching code for the following comment in HEAD this morning (just above the changed code): * Minimum retransmit timer is 3 ticks, for algorithmic stability. Please fix. Also, the last sentence in this comment block now looks rotted: * The prior minimum of 1*hz (1 second) badly breaks throughput on any * networks faster then a modem that has minor (e.g. 1%) packet loss. > Index: src/sys/netinet/tcp_timer.h > diff -u src/sys/netinet/tcp_timer.h:1.27.2.3 src/sys/netinet/tcp_timer.h:1.27.2.4 > --- src/sys/netinet/tcp_timer.h:1.27.2.3 Fri Sep 15 09:51:05 2006 > +++ src/sys/netinet/tcp_timer.h Tue Dec 18 03:39:17 2007 > @@ -109,7 +109,7 @@ > * The prior minimum of 1*hz (1 second) badly breaks throughput on any > * networks faster then a modem that has minor (e.g. 1%) packet loss. > */ > -#define TCPTV_MIN ( 3 ) /* minimum allowable value */ > +#define TCPTV_MIN ( hz/33 ) /* minimum allowable value */ > #define TCPTV_CPU_VAR ( hz/5 ) /* cpu variance allowed (200ms) */ > #define TCPTV_REXMTMAX ( 64*hz) /* max allowable REXMT value */ Cheers, -- Ruslan Ermilov ru@FreeBSD.org FreeBSD committer