From owner-svn-src-projects@FreeBSD.ORG  Mon Jan 27 07:59:04 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 929F48D9;
 Mon, 27 Jan 2014 07:59:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7F1431AF0;
 Mon, 27 Jan 2014 07:59:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0R7x4CM088117;
 Mon, 27 Jan 2014 07:59:04 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0R7x4kf088116;
 Mon, 27 Jan 2014 07:59:04 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201401270759.s0R7x4kf088116@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 27 Jan 2014 07:59:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r261206 - 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.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jan 2014 07:59:04 -0000

Author: glebius
Date: Mon Jan 27 07:59:04 2014
New Revision: 261206
URL: http://svnweb.freebsd.org/changeset/base/261206

Log:
  Fixes to socket buffer readiness routines:
  
  - Assert buffer lock in sb_shift_nrdy().
  - Handle race with socket shutdown in sbready().
  - Fix sb->sb_acc counting logic error in sbready().
  
  Sponsored by:	Netflix
  Sponsored by:	Nginx, Inc.

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

Modified: projects/sendfile/sys/kern/uipc_sockbuf.c
==============================================================================
--- projects/sendfile/sys/kern/uipc_sockbuf.c	Mon Jan 27 07:53:10 2014	(r261205)
+++ projects/sendfile/sys/kern/uipc_sockbuf.c	Mon Jan 27 07:59:04 2014	(r261206)
@@ -72,6 +72,7 @@ static void
 sb_shift_nrdy(struct sockbuf *sb, struct mbuf *m)
 {
 
+	SOCKBUF_LOCK_ASSERT(sb);
 	KASSERT(m->m_flags & M_NOTREADY, ("%s: m %p !M_NOTREADY", __func__, m));
 
 	m = m->m_next;
@@ -91,6 +92,11 @@ sbready(struct sockbuf *sb, struct mbuf 
 
 	SOCKBUF_LOCK(sb);
 
+	if (sb->sb_state & SBS_CANTSENDMORE) {
+		SOCKBUF_UNLOCK(sb);
+		return (ENOTCONN);
+	}
+
 	KASSERT(sb->sb_fnrdy != NULL, ("%s: sb %p NULL fnrdy", __func__, sb));
 
 	blocker = (sb->sb_fnrdy == m) ? M_BLOCKED : 0;
@@ -99,7 +105,8 @@ sbready(struct sockbuf *sb, struct mbuf 
 		KASSERT(m->m_flags & M_NOTREADY,
 		    ("%s: m %p !M_NOTREADY", __func__, m));
 		m->m_flags &= ~(M_NOTREADY | blocker);
-		sb->sb_acc += m->m_len;
+		if (blocker)
+			sb->sb_acc += m->m_len;
 	}
 
 	if (!blocker) {