From owner-svn-src-user@FreeBSD.ORG Wed Nov 12 07:32:07 2008 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76958106564A; Wed, 12 Nov 2008 07:32:07 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 69B988FC18; Wed, 12 Nov 2008 07:32:07 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAC7W7eP023155; Wed, 12 Nov 2008 07:32:07 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAC7W7Sr023153; Wed, 12 Nov 2008 07:32:07 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200811120732.mAC7W7Sr023153@svn.freebsd.org> From: Kip Macy Date: Wed, 12 Nov 2008 07:32:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184864 - user/kmacy/HEAD_fast_multi_xmit/sys/netinet X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Nov 2008 07:32:07 -0000 Author: kmacy Date: Wed Nov 12 07:32:07 2008 New Revision: 184864 URL: http://svn.freebsd.org/changeset/base/184864 Log: Work around possible infinite recursion in tcp_mtudisc, allowing tcp_output to be called even if maxopd is smaller than mss Modified: user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_subr.c user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_var.h Modified: user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_subr.c ============================================================================== --- user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_subr.c Wed Nov 12 07:16:23 2008 (r184863) +++ user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_subr.c Wed Nov 12 07:32:07 2008 (r184864) @@ -1579,9 +1579,13 @@ tcp_mtudisc(struct inpcb *inp, int errno tp->snd_recover = tp->snd_max; if (tp->t_flags & TF_SACK_PERMIT) EXIT_FASTRECOVERY(tp); - if (tp->t_maxopd <= mss) - return (inp); - tcp_output_send(tp); + + if ((tp->t_flags & TF_RECURSE) == 0) { + tp->t_flags |= TF_RECURSE; + tcp_output_send(tp); + tp->t_flags &= ~TF_RECURSE; + } + return (inp); } Modified: user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_var.h ============================================================================== --- user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_var.h Wed Nov 12 07:16:23 2008 (r184863) +++ user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_var.h Wed Nov 12 07:32:07 2008 (r184864) @@ -127,7 +127,8 @@ struct tcpcb { #define TF_ECN_PERMIT 0x4000000 /* connection ECN-ready */ #define TF_ECN_SND_CWR 0x8000000 /* ECN CWR in queue */ #define TF_ECN_SND_ECE 0x10000000 /* ECN ECE in queue */ - +#define TF_RECURSE 0x20000000 /* potentially recursing in tcp_output */ + tcp_seq snd_una; /* send unacknowledged */ tcp_seq snd_max; /* highest sequence number sent; * used to recognize retransmits