Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762905AbYFNAV1 (ORCPT ); Fri, 13 Jun 2008 20:21:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761780AbYFNAOT (ORCPT ); Fri, 13 Jun 2008 20:14:19 -0400 Received: from mail.suse.de ([195.135.220.2]:34448 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761735AbYFNAOR (ORCPT ); Fri, 13 Jun 2008 20:14:17 -0400 Date: Fri, 13 Jun 2008 17:11:34 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, John Heffner , "David S. Miller" , Chris Wright Subject: [patch 27/47] tcp: Limit cwnd growth when deferring for GSO Message-ID: <20080614001134.GA24698@suse.de> References: <20080613234753.235721454@mini.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="tcp-limit-cwnd-growth-when-deferring-for-gso.patch" In-Reply-To: <20080614000840.GA24659@suse.de> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1263 Lines: 38 -stable review patch. If anyone has any objections, please let us know. ------------------ From: John Heffner [ upstream commit: 246eb2af060fc32650f07203c02bdc0456ad76c7 ] This fixes inappropriately large cwnd growth on sender-limited flows when GSO is enabled, limiting cwnd growth to 64k. [ Backport to 2.6.25 by replacing sk->sk_gso_max_size with 65536 -DaveM ] Signed-off-by: John Heffner Signed-off-by: David S. Miller Signed-off-by: Chris Wright --- net/ipv4/tcp_cong.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/ipv4/tcp_cong.c +++ b/net/ipv4/tcp_cong.c @@ -287,7 +287,8 @@ int tcp_is_cwnd_limited(const struct soc left = tp->snd_cwnd - in_flight; if (sk_can_gso(sk) && - left * sysctl_tcp_tso_win_divisor < tp->snd_cwnd) + left * sysctl_tcp_tso_win_divisor < tp->snd_cwnd && + left * tp->mss_cache < 65536) return 1; return left <= tcp_max_burst(tp); } -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/