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.111.2.6
retrieving revision 1.122
diff -u -p -r1.111.2.6 -r1.122
--- src/sys/kern/uipc_socket.c	2007/02/26 09:11:20	1.111.2.6
+++ src/sys/kern/uipc_socket.c	2006/07/23 22:06:11	1.122
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.111.2.6 2007/02/26 09:11:20 yamt Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.122 2006/07/23 22:06:11 ad 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.111.2.6 2007/02/26 09:11:20 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.122 2006/07/23 22:06:11 ad Exp $");
 
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
@@ -255,23 +255,30 @@ sokvafree(vaddr_t sva, vsize_t len)
 }
 
 static void
-sodoloanfree(struct vm_page **pgs, caddr_t buf, size_t size, bool mapped)
+sodoloanfree(struct vm_page **pgs, caddr_t buf, size_t size)
 {
-	vaddr_t sva, eva;
+	vaddr_t va, sva, eva;
 	vsize_t len;
-	int npgs;
-
-	KASSERT(pgs != NULL);
+	paddr_t pa;
+	int i, npgs;
 
 	eva = round_page((vaddr_t) buf + size);
 	sva = trunc_page((vaddr_t) buf);
 	len = eva - sva;
 	npgs = len >> PAGE_SHIFT;
 
-	if (mapped) {
-		pmap_kremove(sva, len);
-		pmap_update(pmap_kernel());
+	if (__predict_false(pgs == NULL)) {
+		pgs = alloca(npgs * sizeof(*pgs));
+
+		for (i = 0, va = sva; va < eva; i++, va += PAGE_SIZE) {
+			if (pmap_extract(pmap_kernel(), va, &pa) == FALSE)
+				panic("sodoloanfree: va 0x%lx not mapped", va);
+			pgs[i] = PHYS_TO_VM_PAGE(pa);
+		}
 	}
+
+	pmap_kremove(sva, len);
+	pmap_update(pmap_kernel());
 	uvm_unloan(pgs, npgs, UVM_LOAN_TOPAGE);
 	sokvafree(sva, len);
 }
@@ -319,13 +326,11 @@ sodopendfreel()
 
 		for (; m != NULL; m = next) {
 			next = m->m_next;
-			KASSERT((~m->m_flags & (M_EXT|M_EXT_PAGES)) == 0);
-			KASSERT(m->m_ext.ext_refcnt == 0);
 
 			rv += m->m_ext.ext_size;
-			sodoloanfree(m->m_ext.ext_pgs, m->m_ext.ext_buf,
-			    m->m_ext.ext_size,
-			    (m->m_ext.ext_flags & M_EXT_LAZY) == 0);
+			sodoloanfree((m->m_flags & M_EXT_PAGES) ?
+			    m->m_ext.ext_pgs : NULL, m->m_ext.ext_buf,
+			    m->m_ext.ext_size);
 			pool_cache_put(&mbpool_cache, m);
 		}
 
@@ -341,7 +346,15 @@ soloanfree(struct mbuf *m, caddr_t buf, 
 {
 	int s;
 
-	KASSERT(m != NULL);
+	if (m == NULL) {
+
+		/*
+		 * called from MEXTREMOVE.
+		 */
+
+		sodoloanfree(NULL, buf, size);
+		return;
+	}
 
 	/*
 	 * postpone freeing mbuf.
@@ -366,12 +379,8 @@ sosend_loan(struct socket *so, struct ui
 	struct iovec *iov = uio->uio_iov;
 	vaddr_t sva, eva;
 	vsize_t len;
-	vaddr_t lva;
-	int npgs, error;
-#if !defined(__HAVE_LAZY_MBUF)
-	vaddr_t va;
-	int i;
-#endif /* !defined(__HAVE_LAZY_MBUF) */
+	vaddr_t lva, va;
+	int npgs, i, error;
 
 	if (VMSPACE_IS_KERNEL_P(uio->uio_vmspace))
 		return (0);
@@ -400,23 +409,16 @@ sosend_loan(struct socket *so, struct ui
 		return (0);
 	}
 
-#if !defined(__HAVE_LAZY_MBUF)
 	for (i = 0, va = lva; i < npgs; i++, va += PAGE_SIZE)
 		pmap_kenter_pa(va, VM_PAGE_TO_PHYS(m->m_ext.ext_pgs[i]),
 		    VM_PROT_READ);
 	pmap_update(pmap_kernel());
-#endif /* !defined(__HAVE_LAZY_MBUF) */
 
 	lva += (vaddr_t) iov->iov_base & PAGE_MASK;
 
 	MEXTADD(m, (caddr_t) lva, space, M_MBUF, soloanfree, so);
 	m->m_flags |= M_EXT_PAGES | M_EXT_ROMAP;
 
-#if defined(__HAVE_LAZY_MBUF)
-	m->m_flags |= M_EXT_LAZY;
-	m->m_ext.ext_flags |= M_EXT_LAZY;
-#endif /* defined(__HAVE_LAZY_MBUF) */
-
 	uio->uio_resid -= space;
 	/* uio_offset not updated, not set/used for write(2) */
 	uio->uio_iov->iov_base = (caddr_t) uio->uio_iov->iov_base + space;
@@ -471,12 +473,6 @@ socreate(int dom, struct socket **aso, i
 	uid_t		uid;
 	int		error, s;
 
-	error = kauth_authorize_network(l->l_cred, KAUTH_NETWORK_SOCKET,
-	    KAUTH_REQ_NETWORK_SOCKET_OPEN, KAUTH_ARG(dom), KAUTH_ARG(type),
-	    KAUTH_ARG(proto));
-	if (error)
-		return (error);
-
 	if (proto)
 		prp = pffindproto(dom, proto, type);
 	else
@@ -1421,7 +1417,6 @@ sosetopt(struct socket *so, int level, i
 {
 	int		error;
 	struct mbuf	*m;
-	struct linger	*l;
 
 	error = 0;
 	m = m0;
@@ -1438,18 +1433,13 @@ sosetopt(struct socket *so, int level, i
 				error = EINVAL;
 				goto bad;
 			}
-			l = mtod(m, struct linger *);
-			if (l->l_linger < 0 || l->l_linger > USHRT_MAX ||
-			    l->l_linger > (INT_MAX / hz)) {
+			if (mtod(m, struct linger *)->l_linger < 0 ||
+			    mtod(m, struct linger *)->l_linger > (INT_MAX / hz)) {
 				error = EDOM;
 				goto bad;
 			}
-			so->so_linger = l->l_linger;
-			if (l->l_onoff)
-				so->so_options |= SO_LINGER;
-			else
-				so->so_options &= ~SO_LINGER;
-			break;
+			so->so_linger = mtod(m, struct linger *)->l_linger;
+			/* fall thru... */
 
 		case SO_DEBUG:
 		case SO_KEEPALIVE:
@@ -1589,7 +1579,7 @@ sogetopt(struct socket *so, int level, i
 		case SO_LINGER:
 			m->m_len = sizeof(struct linger);
 			mtod(m, struct linger *)->l_onoff =
-			    (so->so_options & SO_LINGER) ? 1 : 0;
+				so->so_options & SO_LINGER;
 			mtod(m, struct linger *)->l_linger = so->so_linger;
 			break;
 
@@ -1602,7 +1592,7 @@ sogetopt(struct socket *so, int level, i
 		case SO_BROADCAST:
 		case SO_OOBINLINE:
 		case SO_TIMESTAMP:
-			*mtod(m, int *) = (so->so_options & optname) ? 1 : 0;
+			*mtod(m, int *) = so->so_options & optname;
 			break;
 
 		case SO_TYPE: