From owner-svn-src-projects@freebsd.org  Wed Sep 16 16:11:46 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 3B7389CDF3E
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 16 Sep 2015 16:11:46 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2C65E1231;
 Wed, 16 Sep 2015 16:11:46 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8GGBkO9072870;
 Wed, 16 Sep 2015 16:11:46 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8GGBkxB072869;
 Wed, 16 Sep 2015 16:11:46 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201509161611.t8GGBkxB072869@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 16 Sep 2015 16:11:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r287863 - projects/sendfile/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Sep 2015 16:11:46 -0000

Author: glebius
Date: Wed Sep 16 16:11:45 2015
New Revision: 287863
URL: https://svnweb.freebsd.org/changeset/base/287863

Log:
  When I/O fails run full protocol abort routine, instead of flushing
  socket only. The previous behavior lead to inconsistency between
  TCP state and socket state.
  
  Together with:	rrs
  Sponsored by:	Netflix
  Sponsored by:	Nginx, Inc.

Modified:
  projects/sendfile/sys/kern/uipc_syscalls.c

Modified: projects/sendfile/sys/kern/uipc_syscalls.c
==============================================================================
--- projects/sendfile/sys/kern/uipc_syscalls.c	Wed Sep 16 15:40:08 2015	(r287862)
+++ projects/sendfile/sys/kern/uipc_syscalls.c	Wed Sep 16 16:11:45 2015	(r287863)
@@ -2114,8 +2114,8 @@ sf_iodone(void *arg, vm_page_t *pg, int 
 		 * for read, so that application receives EIO on next
 		 * syscall and eventually closes the socket.
 		 */
+		so->so_proto->pr_usrreqs->pru_abort(so);
 		so->so_error = EIO;
-		soisdisconnected(so);
 
 		m = sfio->m;
 		for (int i = 0; i < sfio->npages; i++)