svn commit: r232461 - user/andre/tcp_workqueue/sys/kern

[Andre Oppermann]

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