From owner-freebsd-net@freebsd.org Wed Apr 27 02:04:51 2016 Return-Path: Delivered-To: freebsd-net@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DFB96B1DC03 for ; Wed, 27 Apr 2016 02:04:51 +0000 (UTC) (envelope-from daemon-user@freebsd.org) Received: from reviews.nyi.freebsd.org (reviews.nyi.freebsd.org [IPv6:2610:1c1:1:607c::16:b]) by mx1.freebsd.org (Postfix) with ESMTP id A487912DA for ; Wed, 27 Apr 2016 02:04:51 +0000 (UTC) (envelope-from daemon-user@freebsd.org) Received: by reviews.nyi.freebsd.org (Postfix, from userid 1346) id E9124D73C; Wed, 27 Apr 2016 02:04:50 +0000 (UTC) Date: Wed, 27 Apr 2016 02:04:50 +0000 To: freebsd-net@freebsd.org From: "sepherosa_gmail.com (Sepherosa Ziehau)" Reply-to: D5872+325+9dea0574509cdbb3@reviews.freebsd.org Subject: [Differential] D5872: tcp: Don't prematurely drop receiving-only connections Message-ID: X-Priority: 3 X-Phabricator-Sent-This-Message: Yes X-Mail-Transport-Agent: MetaMTA X-Auto-Response-Suppress: All X-Phabricator-Mail-Tags: , , Thread-Topic: D5872: tcp: Don't prematurely drop receiving-only connections X-Herald-Rules: <64> X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-To: X-Phabricator-Cc: X-Phabricator-Cc: X-Phabricator-Cc: Precedence: bulk In-Reply-To: References: Thread-Index: MmVmNzYzNzljOGQxMmM4MWI4MmNjYzcxMzczIFcgHkI= MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_af705a28c77926c0763ef92b314b0ba6" X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.21 List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2016 02:04:52 -0000 --b1_af705a28c77926c0763ef92b314b0ba6 Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: 8bit sepherosa_gmail.com updated the summary for this revision. sepherosa_gmail.com updated this revision to Diff 15642. CHANGES SINCE LAST UPDATE https://reviews.freebsd.org/D5872?vs=14968&id=15642 REVISION DETAIL https://reviews.freebsd.org/D5872 AFFECTED FILES sys/netinet/tcp_output.c CHANGE DETAILS diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1545,9 +1545,10 @@ tp->t_softerror = error; return (error); case ENOBUFS: - if (!tcp_timer_active(tp, TT_REXMT) && + if ((len > 0 || (flags & (TH_SYN | TH_FIN))) && + !tcp_timer_active(tp, TT_REXMT) && !tcp_timer_active(tp, TT_PERSIST)) - tcp_timer_activate(tp, TT_REXMT, tp->t_rxtcur); + panic("neither rexmt nor persist timer is set"); tp->snd_cwnd = tp->t_maxseg; return (0); case EMSGSIZE: EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: sepherosa_gmail.com, network, glebius, adrian, delphij, decui_microsoft.com, honzhan_microsoft.com, howard0su_gmail.com, freebsd-net-list, lstewart, hiren, jtl, transport Cc: gnn, mike-karels.net, jtl --b1_af705a28c77926c0763ef92b314b0ba6 Content-Type: text/x-patch; charset=utf-8; name="D5872.15642.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D5872.15642.patch" ZGlmZiAtLWdpdCBhL3N5cy9uZXRpbmV0L3RjcF9vdXRwdXQuYyBiL3N5cy9uZXRpbmV0L3RjcF9v dXRwdXQuYwotLS0gYS9zeXMvbmV0aW5ldC90Y3Bfb3V0cHV0LmMKKysrIGIvc3lzL25ldGluZXQv dGNwX291dHB1dC5jCkBAIC0xNTQ1LDkgKzE1NDUsMTAgQEAKIAkJCXRwLT50X3NvZnRlcnJvciA9 IGVycm9yOwogCQkJcmV0dXJuIChlcnJvcik7CiAJCWNhc2UgRU5PQlVGUzoKLQkgICAgICAgICAg ICAgICAgaWYgKCF0Y3BfdGltZXJfYWN0aXZlKHRwLCBUVF9SRVhNVCkgJiYKKwkJCWlmICgobGVu ID4gMCB8fCAoZmxhZ3MgJiAoVEhfU1lOIHwgVEhfRklOKSkpICYmCisJCQkgICAgIXRjcF90aW1l cl9hY3RpdmUodHAsIFRUX1JFWE1UKSAmJgogCQkJICAgICF0Y3BfdGltZXJfYWN0aXZlKHRwLCBU VF9QRVJTSVNUKSkKLQkgICAgICAgICAgICAgICAgICAgICAgICB0Y3BfdGltZXJfYWN0aXZhdGUo dHAsIFRUX1JFWE1ULCB0cC0+dF9yeHRjdXIpOworCQkJCXBhbmljKCJuZWl0aGVyIHJleG10IG5v ciBwZXJzaXN0IHRpbWVyIGlzIHNldCIpOwogCQkJdHAtPnNuZF9jd25kID0gdHAtPnRfbWF4c2Vn OwogCQkJcmV0dXJuICgwKTsKIAkJY2FzZSBFTVNHU0laRToKCg== --b1_af705a28c77926c0763ef92b314b0ba6--