From owner-svn-src-user@FreeBSD.ORG  Sat Mar  3 13:51:52 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 23254106567A;
	Sat,  3 Mar 2012 13:51:52 +0000 (UTC)
	(envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EA0D58FC18;
	Sat,  3 Mar 2012 13:51:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q23Dpp5C084658;
	Sat, 3 Mar 2012 13:51:51 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q23DpptA084656;
	Sat, 3 Mar 2012 13:51:51 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201203031351.q23DpptA084656@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Sat, 3 Mar 2012 13:51:51 +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: r232461 - user/andre/tcp_workqueue/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Mar 2012 13:51:52 -0000

Author: andre
Date: Sat Mar  3 13:51:51 2012
New Revision: 232461
URL: http://svn.freebsd.org/changeset/base/232461

Log:
  Add logging for socket attach failures in sonewconn() while accepting
  a new connection to make problems easier to track.

Modified:
  user/andre/tcp_workqueue/sys/kern/uipc_socket.c

Modified: user/andre/tcp_workqueue/sys/kern/uipc_socket.c
==============================================================================
--- user/andre/tcp_workqueue/sys/kern/uipc_socket.c	Sat Mar  3 13:31:20 2012	(r232460)
+++ user/andre/tcp_workqueue/sys/kern/uipc_socket.c	Sat Mar  3 13:51:51 2012	(r232461)
@@ -135,6 +135,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/uio.h>
 #include <sys/jail.h>
+#include <sys/syslog.h>
 
 #include <net/vnet.h>
 
@@ -447,16 +448,22 @@ sonewconn(struct socket *head, int conns
 	over = (head->so_qlen > 3 * head->so_qlimit / 2);
 	ACCEPT_UNLOCK();
 #ifdef REGRESSION
-	if (regression_sonewconn_earlytest && over)
+	if (regression_sonewconn_earlytest && over) {
 #else
-	if (over)
+	if (over) {
 #endif
+		log(LOG_DEBUG, "%s: Listen queue overflow: %i in queue",
+		    __func__, over);
 		return (NULL);
+	}
 	VNET_ASSERT(head->so_vnet != NULL, ("%s:%d so_vnet is NULL, head=%p",
 	    __func__, __LINE__, head));
 	so = soalloc(head->so_vnet);
-	if (so == NULL)
+	if (so == NULL) {
+		log(LOG_DEBUG, "%s: Socket allocation failure: "
+		    "limit reached or out of memory", __func__);
 		return (NULL);
+	}
 	if ((head->so_options & SO_ACCEPTFILTER) != 0)
 		connstatus = 0;
 	so->so_head = head;
@@ -476,6 +483,8 @@ sonewconn(struct socket *head, int conns
 	if (soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat) ||
 	    (*so->so_proto->pr_usrreqs->pru_attach)(so, 0, NULL)) {
 		sodealloc(so);
+		log(LOG_DEBUG, "%s: soreserve() or pru_attach() failed ",
+		    __func__);
 		return (NULL);
 	}
 	so->so_rcv.sb_lowat = head->so_rcv.sb_lowat;
@@ -3216,7 +3225,7 @@ filt_soread(struct knote *kn, long hint)
 	else if (kn->kn_sfflags & NOTE_LOWAT)
 		return (kn->kn_data >= kn->kn_sdata);
 	else
-		return (so->so_rcv.sb_cc >= so->so_rcv.sb_lowat);
+		return (soreadabledata(so));
 }
 
 static void