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.11 retrieving revision 1.140.6.3 diff -u -p -r1.111.2.11 -r1.140.6.3 --- src/sys/kern/uipc_socket.c 2008/01/21 09:46:30 1.111.2.11 +++ src/sys/kern/uipc_socket.c 2007/10/07 13:25:08 1.140.6.3 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.111.2.11 2008/01/21 09:46:30 yamt Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.140.6.3 2007/10/07 13:25:08 joerg Exp $ */ /*- * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.111.2.11 2008/01/21 09:46:30 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.140.6.3 2007/10/07 13:25:08 joerg Exp $"); #include "opt_sock_counters.h" #include "opt_sosend_loan.h" @@ -251,23 +251,30 @@ sokvafree(vaddr_t sva, vsize_t len) } static void -sodoloanfree(struct vm_page **pgs, void *buf, size_t size, bool mapped) +sodoloanfree(struct vm_page **pgs, void *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); } @@ -296,6 +303,7 @@ sodopendfreel() { struct mbuf *m, *next; size_t rv = 0; + int s; KASSERT(mutex_owned(&so_pendfree_lock)); @@ -306,14 +314,14 @@ 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); - pool_cache_put(mb_cache, m); + sodoloanfree((m->m_flags & M_EXT_PAGES) ? + m->m_ext.ext_pgs : NULL, m->m_ext.ext_buf, + m->m_ext.ext_size); + s = splvm(); + pool_cache_put(&mbpool_cache, m); + splx(s); } mutex_enter(&so_pendfree_lock); @@ -326,7 +334,15 @@ void soloanfree(struct mbuf *m, void *buf, size_t size, void *arg) { - KASSERT(m != NULL); + if (m == NULL) { + + /* + * called from MEXTREMOVE. + */ + + sodoloanfree(NULL, buf, size); + return; + } /* * postpone freeing mbuf. @@ -348,12 +364,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); @@ -382,23 +394,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, (void *) 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 = (char *)uio->uio_iov->iov_base + space; @@ -426,11 +431,11 @@ sokva_reclaim_callback(struct callback_e } struct mbuf * -getsombuf(struct socket *so, int type) +getsombuf(struct socket *so) { struct mbuf *m; - m = m_get(M_WAIT, type); + m = m_get(M_WAIT, MT_SONAME); MCLAIM(m, so->so_mowner); return m; } @@ -440,7 +445,7 @@ m_intopt(struct socket *so, int val) { struct mbuf *m; - m = getsombuf(so, MT_SOOPTS); + m = getsombuf(so); m->m_len = sizeof(int); *mtod(m, int *) = val; return m; @@ -450,7 +455,7 @@ void soinit(void) { - mutex_init(&so_pendfree_lock, MUTEX_DEFAULT, IPL_VM); + mutex_init(&so_pendfree_lock, MUTEX_DRIVER, IPL_VM); cv_init(&socurkva_cv, "sokva"); /* Set the initial adjusted socket buffer size. */ @@ -578,13 +583,13 @@ sobind(struct socket *so, struct mbuf *n } int -solisten(struct socket *so, int backlog, struct lwp *l) +solisten(struct socket *so, int backlog) { int s, error; s = splsoftnet(); error = (*so->so_proto->pr_usrreq)(so, PRU_LISTEN, NULL, - NULL, NULL, l); + NULL, NULL, NULL); if (error != 0) { splx(s); return error; @@ -1008,15 +1013,12 @@ soreceive(struct socket *so, struct mbuf { struct lwp *l = curlwp; struct mbuf *m, **mp; - int atomic, flags, len, error, s, offset, moff, type, orig_resid; + int flags, len, error, s, offset, moff, type, orig_resid; const struct protosw *pr; struct mbuf *nextrecord; int mbuf_removed = 0; - const struct domain *dom; pr = so->so_proto; - atomic = pr->pr_flags & PR_ATOMIC; - dom = pr->pr_domain; mp = mp0; type = 0; orig_resid = uio->uio_resid; @@ -1077,7 +1079,8 @@ soreceive(struct socket *so, struct mbuf (so->so_rcv.sb_cc < so->so_rcv.sb_lowat || ((flags & MSG_WAITALL) && uio->uio_resid <= so->so_rcv.sb_hiwat)) && - m->m_nextpkt == NULL && !atomic)) { + m->m_nextpkt == NULL && + (pr->pr_flags & PR_ATOMIC) == 0)) { #ifdef DIAGNOSTIC if (m == NULL && so->so_rcv.sb_cc) panic("receive 1"); @@ -1166,6 +1169,7 @@ soreceive(struct socket *so, struct mbuf sbfree(&so->so_rcv, m); mbuf_removed = 1; if (controlp != NULL) { + struct domain *dom = pr->pr_domain; if (dom->dom_externalize && l && mtod(m, struct cmsghdr *)->cmsg_type == SCM_RIGHTS) @@ -1179,9 +1183,9 @@ soreceive(struct socket *so, struct mbuf * Dispose of any SCM_RIGHTS message that went * through the read path rather than recv. */ - if (dom->dom_dispose && + if (pr->pr_domain->dom_dispose && mtod(m, struct cmsghdr *)->cmsg_type == SCM_RIGHTS) - (*dom->dom_dispose)(m); + (*pr->pr_domain->dom_dispose)(m); MFREE(m, so->so_rcv.sb_mb); m = so->so_rcv.sb_mb; } @@ -1268,7 +1272,8 @@ soreceive(struct socket *so, struct mbuf * This avoids a later panic("receive 1a") * when compiled with DIAGNOSTIC. */ - if (m && mbuf_removed && atomic) + if (m && mbuf_removed + && (pr->pr_flags & PR_ATOMIC)) (void) sbdroprecord(&so->so_rcv); goto release; @@ -1371,7 +1376,7 @@ soreceive(struct socket *so, struct mbuf } } - if (m && atomic) { + if (m && pr->pr_flags & PR_ATOMIC) { flags |= MSG_TRUNC; if ((flags & MSG_PEEK) == 0) (void) sbdroprecord(&so->so_rcv); @@ -1793,7 +1798,7 @@ soo_kqfilter(struct file *fp, struct kno sb = &so->so_snd; break; default: - return (EINVAL); + return (1); } SLIST_INSERT_HEAD(&sb->sb_sel.sel_klist, kn, kn_selnext); sb->sb_flags |= SB_KNOTE;