Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.93
retrieving revision 1.97.2.1.2.2
diff -u -p -r1.93 -r1.97.2.1.2.2
--- src/sys/kern/uipc_socket.c	2004/03/17 10:03:26	1.93
+++ src/sys/kern/uipc_socket.c	2005/09/13 23:23:56	1.97.2.1.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.93 2004/03/17 10:03:26 yamt Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.97.2.1.2.2 2005/09/13 23:23:56 riz Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.93 2004/03/17 10:03:26 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.97.2.1.2.2 2005/09/13 23:23:56 riz Exp $");
 
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
@@ -162,21 +162,14 @@ int sokvawaiters;
 
 static size_t sodopendfree(struct socket *);
 static size_t sodopendfreel(struct socket *);
+static __inline void sokvareserve(struct socket *, vsize_t);
+static __inline void sokvaunreserve(vsize_t);
 
-/*
- * sokvaalloc: allocate kva for loan.
- */
-
-vaddr_t
-sokvaalloc(vsize_t len, struct socket *so)
+static __inline void
+sokvareserve(struct socket *so, vsize_t len)
 {
-	vaddr_t lva;
 	int s;
 
-	/*
-	 * reserve kva.
-	 */
-
 	s = splvm();
 	simple_lock(&so_pendfree_slock);
 	while (socurkva + len > somaxkva) {
@@ -203,14 +196,46 @@ sokvaalloc(vsize_t len, struct socket *s
 	socurkva += len;
 	simple_unlock(&so_pendfree_slock);
 	splx(s);
+}
+
+static __inline void
+sokvaunreserve(vsize_t len)
+{
+	int s;
+
+	s = splvm();
+	simple_lock(&so_pendfree_slock);
+	socurkva -= len;
+	if (sokvawaiters)
+		wakeup(&socurkva);
+	simple_unlock(&so_pendfree_slock);
+	splx(s);
+}
+
+/*
+ * sokvaalloc: allocate kva for loan.
+ */
+
+vaddr_t
+sokvaalloc(vsize_t len, struct socket *so)
+{
+	vaddr_t lva;
+
+	/*
+	 * reserve kva.
+	 */
+
+	sokvareserve(so, len);
 
 	/*
 	 * allocate kva.
 	 */
 
 	lva = uvm_km_valloc_wait(kernel_map, len);
-	if (lva == 0)
+	if (lva == 0) {
+		sokvaunreserve(len);
 		return (0);
+	}
 
 	return lva;
 }
@@ -222,7 +247,6 @@ sokvaalloc(vsize_t len, struct socket *s
 void
 sokvafree(vaddr_t sva, vsize_t len)
 {
-	int s;
 
 	/*
 	 * free kva.
@@ -234,13 +258,7 @@ sokvafree(vaddr_t sva, vsize_t len)
 	 * unreserve kva.
 	 */
 
-	s = splvm();
-	simple_lock(&so_pendfree_slock);
-	socurkva -= len;
-	if (sokvawaiters)
-		wakeup(&socurkva);
-	simple_unlock(&so_pendfree_slock);
-	splx(s);
+	sokvaunreserve(len);
 }
 
 static void
@@ -765,7 +783,7 @@ sosend(struct socket *so, struct mbuf *a
 		if ((atomic && resid > so->so_snd.sb_hiwat) ||
 		    clen > so->so_snd.sb_hiwat)
 			snderr(EMSGSIZE);
-		if (space < resid + clen && uio &&
+		if (space < resid + clen &&
 		    (atomic || space < so->so_snd.sb_lowat || space < clen)) {
 			if (so->so_state & SS_NBIO)
 				snderr(EWOULDBLOCK);
@@ -1699,3 +1717,56 @@ soo_kqfilter(struct file *fp, struct kno
 	return (0);
 }
 
+#include <sys/sysctl.h>
+
+static int sysctl_kern_somaxkva(SYSCTLFN_PROTO);
+
+/*
+ * sysctl helper routine for kern.somaxkva.  ensures that the given
+ * value is not too small.
+ * (XXX should we maybe make sure it's not too large as well?)
+ */
+static int
+sysctl_kern_somaxkva(SYSCTLFN_ARGS)
+{
+	int error, new_somaxkva;
+	struct sysctlnode node;
+	int s;
+
+	new_somaxkva = somaxkva;
+	node = *rnode;
+	node.sysctl_data = &new_somaxkva;
+	error = sysctl_lookup(SYSCTLFN_CALL(&node));
+	if (error || newp == NULL)
+		return (error);
+
+	if (new_somaxkva < (16 * 1024 * 1024)) /* sanity */
+		return (EINVAL);
+
+	s = splvm();
+	simple_lock(&so_pendfree_slock);
+	somaxkva = new_somaxkva;
+	wakeup(&socurkva);
+	simple_unlock(&so_pendfree_slock);
+	splx(s);
+
+	return (error);
+}
+
+SYSCTL_SETUP(sysctl_kern_somaxkva_setup, "sysctl kern.somaxkva setup")
+{
+
+	sysctl_createv(clog, 0, NULL, NULL,
+		       CTLFLAG_PERMANENT,
+		       CTLTYPE_NODE, "kern", NULL,
+		       NULL, 0, NULL, 0,
+		       CTL_KERN, CTL_EOL);
+
+	sysctl_createv(clog, 0, NULL, NULL,
+		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
+		       CTLTYPE_INT, "somaxkva",
+		       SYSCTL_DESCR("Maximum amount of kernel memory to be "
+				    "used for socket buffers"),
+		       sysctl_kern_somaxkva, 0, NULL, 0,
+		       CTL_KERN, KERN_SOMAXKVA, CTL_EOL);
+}