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.134.2.2 diff -u -p -r1.111.2.11 -r1.134.2.2 --- src/sys/kern/uipc_socket.c 2008/01/21 09:46:30 1.111.2.11 +++ src/sys/kern/uipc_socket.c 2007/04/10 13:26:42 1.134.2.2 @@ -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.134.2.2 2007/04/10 13:26:42 ad 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.134.2.2 2007/04/10 13:26:42 ad Exp $"); #include "opt_sock_counters.h" #include "opt_sosend_loan.h" @@ -79,7 +79,6 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket. #include #include #include -#include #include #include #include @@ -104,8 +103,6 @@ POOL_INIT(socket_pool, sizeof(struct soc MALLOC_DEFINE(M_SOOPTS, "soopts", "socket options"); MALLOC_DEFINE(M_SONAME, "soname", "socket name"); -extern const struct fileops socketops; - extern int somaxconn; /* patchable (XXX sysctl) */ int somaxconn = SOMAXCONN; @@ -251,23 +248,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 +300,7 @@ sodopendfreel() { struct mbuf *m, *next; size_t rv = 0; + int s; KASSERT(mutex_owned(&so_pendfree_lock)); @@ -306,14 +311,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 +331,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 +361,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 +391,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; @@ -425,32 +427,11 @@ sokva_reclaim_callback(struct callback_e return CALLBACK_CHAIN_CONTINUE; } -struct mbuf * -getsombuf(struct socket *so, int type) -{ - struct mbuf *m; - - m = m_get(M_WAIT, type); - MCLAIM(m, so->so_mowner); - return m; -} - -struct mbuf * -m_intopt(struct socket *so, int val) -{ - struct mbuf *m; - - m = getsombuf(so, MT_SOOPTS); - m->m_len = sizeof(int); - *mtod(m, int *) = val; - return m; -} - 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. */ @@ -480,29 +461,29 @@ socreate(int dom, struct socket **aso, i 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 != 0) - return error; + if (error) + return (error); if (proto) prp = pffindproto(dom, proto, type); else prp = pffindtype(dom, type); - if (prp == NULL) { + if (prp == 0) { /* no support for domain */ if (pffinddomain(dom) == 0) - return EAFNOSUPPORT; + return (EAFNOSUPPORT); /* no support for socket type */ if (proto == 0 && type != 0) - return EPROTOTYPE; - return EPROTONOSUPPORT; + return (EPROTOTYPE); + return (EPROTONOSUPPORT); } - if (prp->pr_usrreq == NULL) - return EPROTONOSUPPORT; + if (prp->pr_usrreq == 0) + return (EPROTONOSUPPORT); if (prp->pr_type != type) - return EPROTOTYPE; + return (EPROTOTYPE); s = splsoftnet(); so = pool_get(&socket_pool, PR_WAITOK); - memset(so, 0, sizeof(*so)); + memset((void *)so, 0, sizeof(*so)); TAILQ_INIT(&so->so_q0); TAILQ_INIT(&so->so_q); so->so_type = type; @@ -514,56 +495,19 @@ socreate(int dom, struct socket **aso, i so->so_snd.sb_mowner = &prp->pr_domain->dom_mowner; so->so_mowner = &prp->pr_domain->dom_mowner; #endif - selinit(&so->so_rcv.sb_sel); - selinit(&so->so_snd.sb_sel); uid = kauth_cred_geteuid(l->l_cred); so->so_uidinfo = uid_find(uid); - error = (*prp->pr_usrreq)(so, PRU_ATTACH, NULL, - (struct mbuf *)(long)proto, NULL, l); - if (error != 0) { + error = (*prp->pr_usrreq)(so, PRU_ATTACH, (struct mbuf *)0, + (struct mbuf *)(long)proto, (struct mbuf *)0, l); + if (error) { so->so_state |= SS_NOFDREF; sofree(so); splx(s); - return error; + return (error); } splx(s); *aso = so; - return 0; -} - -/* On success, write file descriptor to fdout and return zero. On - * failure, return non-zero; *fdout will be undefined. - */ -int -fsocreate(int domain, struct socket **sop, int type, int protocol, - struct lwp *l, int *fdout) -{ - struct filedesc *fdp; - struct socket *so; - struct file *fp; - int fd, error; - - fdp = l->l_proc->p_fd; - /* falloc() will use the desciptor for us */ - if ((error = falloc(l, &fp, &fd)) != 0) - return (error); - fp->f_flag = FREAD|FWRITE; - fp->f_type = DTYPE_SOCKET; - fp->f_ops = &socketops; - error = socreate(domain, &so, type, protocol, l); - if (error != 0) { - FILE_UNUSE(fp, l); - fdremove(fdp, fd); - ffree(fp); - } else { - if (sop != NULL) - *sop = so; - fp->f_data = so; - FILE_SET_MATURE(fp); - FILE_UNUSE(fp, l); - *fdout = fd; - } - return error; + return (0); } int @@ -572,22 +516,23 @@ sobind(struct socket *so, struct mbuf *n int s, error; s = splsoftnet(); - error = (*so->so_proto->pr_usrreq)(so, PRU_BIND, NULL, nam, NULL, l); + error = (*so->so_proto->pr_usrreq)(so, PRU_BIND, (struct mbuf *)0, + nam, (struct mbuf *)0, l); splx(s); - return error; + return (error); } 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); - if (error != 0) { + error = (*so->so_proto->pr_usrreq)(so, PRU_LISTEN, (struct mbuf *)0, + (struct mbuf *)0, (struct mbuf *)0, (struct lwp *)0); + if (error) { splx(s); - return error; + return (error); } if (TAILQ_EMPTY(&so->so_q)) so->so_options |= SO_ACCEPTCONN; @@ -595,7 +540,7 @@ solisten(struct socket *so, int backlog, backlog = 0; so->so_qlimit = min(backlog, somaxconn); splx(s); - return 0; + return (0); } void @@ -621,8 +566,6 @@ sofree(struct socket *so) RLIM_INFINITY); sbrelease(&so->so_snd, so); sorflush(so); - seldestroy(&so->so_rcv.sb_sel); - seldestroy(&so->so_snd.sb_sel); pool_put(&socket_pool, so); } @@ -673,7 +616,8 @@ soclose(struct socket *so) drop: if (so->so_pcb) { int error2 = (*so->so_proto->pr_usrreq)(so, PRU_DETACH, - NULL, NULL, NULL, NULL); + (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0, + (struct lwp *)0); if (error == 0) error = error2; } @@ -692,15 +636,9 @@ soclose(struct socket *so) int soabort(struct socket *so) { - int error; - KASSERT(so->so_head == NULL); - error = (*so->so_proto->pr_usrreq)(so, PRU_ABORT, NULL, - NULL, NULL, NULL); - if (error) { - sofree(so); - } - return error; + return (*so->so_proto->pr_usrreq)(so, PRU_ABORT, (struct mbuf *)0, + (struct mbuf *)0, (struct mbuf *)0, (struct lwp *)0); } int @@ -716,7 +654,7 @@ soaccept(struct socket *so, struct mbuf if ((so->so_state & SS_ISDISCONNECTED) == 0 || (so->so_proto->pr_flags & PR_ABRTACPTDIS) == 0) error = (*so->so_proto->pr_usrreq)(so, PRU_ACCEPT, - NULL, nam, NULL, NULL); + (struct mbuf *)0, nam, (struct mbuf *)0, (struct lwp *)0); else error = ECONNABORTED; @@ -744,7 +682,7 @@ soconnect(struct socket *so, struct mbuf error = EISCONN; else error = (*so->so_proto->pr_usrreq)(so, PRU_CONNECT, - NULL, nam, NULL, l); + (struct mbuf *)0, nam, (struct mbuf *)0, l); splx(s); return (error); } @@ -756,7 +694,8 @@ soconnect2(struct socket *so1, struct so s = splsoftnet(); error = (*so1->so_proto->pr_usrreq)(so1, PRU_CONNECT2, - NULL, (struct mbuf *)so2, NULL, NULL); + (struct mbuf *)0, (struct mbuf *)so2, (struct mbuf *)0, + (struct lwp *)0); splx(s); return (error); } @@ -776,7 +715,8 @@ sodisconnect(struct socket *so) goto bad; } error = (*so->so_proto->pr_usrreq)(so, PRU_DISCONNECT, - NULL, NULL, NULL, NULL); + (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0, + (struct lwp *)0); bad: splx(s); sodopendfree(); @@ -889,11 +829,11 @@ sosend(struct socket *so, struct mbuf *a if (flags & MSG_EOR) top->m_flags |= M_EOR; } else do { - if (top == NULL) { + if (top == 0) { m = m_gethdr(M_WAIT, MT_DATA); mlen = MHLEN; m->m_pkthdr.len = 0; - m->m_pkthdr.rcvif = NULL; + m->m_pkthdr.rcvif = (struct ifnet *)0; } else { m = m_get(M_WAIT, MT_DATA); mlen = MLEN; @@ -933,13 +873,14 @@ sosend(struct socket *so, struct mbuf *a if (atomic && top == 0 && len < mlen) MH_ALIGN(m, len); } - error = uiomove(mtod(m, void *), (int)len, uio); + error = uiomove(mtod(m, void *), (int)len, + uio); have_data: resid = uio->uio_resid; m->m_len = len; *mp = m; top->m_pkthdr.len += len; - if (error != 0) + if (error) goto release; mp = &m->m_next; if (resid <= 0) { @@ -968,10 +909,10 @@ sosend(struct socket *so, struct mbuf *a splx(s); clen = 0; - control = NULL; - top = NULL; + control = 0; + top = 0; mp = ⊤ - if (error != 0) + if (error) goto release; } while (resid && space > 0); } while (resid); @@ -1008,24 +949,21 @@ 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; - if (paddr != NULL) - *paddr = NULL; - if (controlp != NULL) - *controlp = NULL; - if (flagsp != NULL) + if (paddr) + *paddr = 0; + if (controlp) + *controlp = 0; + if (flagsp) flags = *flagsp &~ MSG_EOR; else flags = 0; @@ -1036,27 +974,29 @@ soreceive(struct socket *so, struct mbuf if (flags & MSG_OOB) { m = m_get(M_WAIT, MT_DATA); error = (*pr->pr_usrreq)(so, PRU_RCVOOB, m, - (struct mbuf *)(long)(flags & MSG_PEEK), NULL, l); + (struct mbuf *)(long)(flags & MSG_PEEK), + (struct mbuf *)0, l); if (error) goto bad; do { error = uiomove(mtod(m, void *), (int) min(uio->uio_resid, m->m_len), uio); m = m_free(m); - } while (uio->uio_resid > 0 && error == 0 && m); + } while (uio->uio_resid && error == 0 && m); bad: - if (m != NULL) + if (m) m_freem(m); - return error; + return (error); } - if (mp != NULL) - *mp = NULL; + if (mp) + *mp = (struct mbuf *)0; if (so->so_state & SS_ISCONFIRMING && uio->uio_resid) - (*pr->pr_usrreq)(so, PRU_RCVD, NULL, NULL, NULL, l); + (*pr->pr_usrreq)(so, PRU_RCVD, (struct mbuf *)0, + (struct mbuf *)0, (struct mbuf *)0, l); restart: if ((error = sblock(&so->so_rcv, SBLOCKWAIT(flags))) != 0) - return error; + return (error); s = splsoftnet(); m = so->so_rcv.sb_mb; @@ -1071,19 +1011,17 @@ soreceive(struct socket *so, struct mbuf * we have to do the receive in sections, and thus risk returning * a short count if a timeout or signal occurs after we start. */ - if (m == NULL || - ((flags & MSG_DONTWAIT) == 0 && - so->so_rcv.sb_cc < uio->uio_resid && - (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)) { + if (m == 0 || (((flags & MSG_DONTWAIT) == 0 && + so->so_rcv.sb_cc < uio->uio_resid) && + (so->so_rcv.sb_cc < so->so_rcv.sb_lowat || + ((flags & MSG_WAITALL) && uio->uio_resid <= so->so_rcv.sb_hiwat)) && + m->m_nextpkt == 0 && (pr->pr_flags & PR_ATOMIC) == 0)) { #ifdef DIAGNOSTIC - if (m == NULL && so->so_rcv.sb_cc) + if (m == 0 && so->so_rcv.sb_cc) panic("receive 1"); #endif if (so->so_error) { - if (m != NULL) + if (m) goto dontblock; error = so->so_error; if ((flags & MSG_PEEK) == 0) @@ -1091,12 +1029,12 @@ soreceive(struct socket *so, struct mbuf goto release; } if (so->so_state & SS_CANTRCVMORE) { - if (m != NULL) + if (m) goto dontblock; else goto release; } - for (; m != NULL; m = m->m_next) + for (; m; m = m->m_next) if (m->m_type == MT_OOBDATA || (m->m_flags & M_EOR)) { m = so->so_rcv.sb_mb; goto dontblock; @@ -1117,8 +1055,8 @@ soreceive(struct socket *so, struct mbuf sbunlock(&so->so_rcv); error = sbwait(&so->so_rcv); splx(s); - if (error != 0) - return error; + if (error) + return (error); goto restart; } dontblock: @@ -1127,7 +1065,7 @@ soreceive(struct socket *so, struct mbuf * While we process the initial mbufs containing address and control * info, we save a copy of m->m_nextpkt into nextrecord. */ - if (l != NULL) + if (l) l->l_proc->p_stats->p_ru.ru_msgrcv++; KASSERT(m == so->so_rcv.sb_mb); SBLASTRECORDCHK(&so->so_rcv, "soreceive 1"); @@ -1146,10 +1084,10 @@ soreceive(struct socket *so, struct mbuf } else { sbfree(&so->so_rcv, m); mbuf_removed = 1; - if (paddr != NULL) { + if (paddr) { *paddr = m; so->so_rcv.sb_mb = m->m_next; - m->m_next = NULL; + m->m_next = 0; m = so->so_rcv.sb_mb; } else { MFREE(m, so->so_rcv.sb_mb); @@ -1157,36 +1095,37 @@ soreceive(struct socket *so, struct mbuf } } } - while (m != NULL && m->m_type == MT_CONTROL && error == 0) { + while (m && m->m_type == MT_CONTROL && error == 0) { if (flags & MSG_PEEK) { - if (controlp != NULL) + if (controlp) *controlp = m_copy(m, 0, m->m_len); m = m->m_next; } else { sbfree(&so->so_rcv, m); mbuf_removed = 1; - if (controlp != NULL) { + if (controlp) { + struct domain *dom = pr->pr_domain; if (dom->dom_externalize && l && mtod(m, struct cmsghdr *)->cmsg_type == SCM_RIGHTS) error = (*dom->dom_externalize)(m, l); *controlp = m; so->so_rcv.sb_mb = m->m_next; - m->m_next = NULL; + m->m_next = 0; m = so->so_rcv.sb_mb; } else { /* * 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; } } - if (controlp != NULL) { + if (controlp) { orig_resid = 0; controlp = &(*controlp)->m_next; } @@ -1198,7 +1137,7 @@ soreceive(struct socket *so, struct mbuf * the last packet on the chain (nextrecord == NULL) and we * change m->m_nextpkt. */ - if (m != NULL) { + if (m) { if ((flags & MSG_PEEK) == 0) { m->m_nextpkt = nextrecord; /* @@ -1226,7 +1165,7 @@ soreceive(struct socket *so, struct mbuf moff = 0; offset = 0; - while (m != NULL && uio->uio_resid > 0 && error == 0) { + while (m && uio->uio_resid > 0 && error == 0) { if (m->m_type == MT_OOBDATA) { if (type != MT_OOBDATA) break; @@ -1250,13 +1189,13 @@ soreceive(struct socket *so, struct mbuf * we must note any additions to the sockbuf when we * block interrupts again. */ - if (mp == NULL) { + if (mp == 0) { SBLASTRECORDCHK(&so->so_rcv, "soreceive uiomove"); SBLASTMBUFCHK(&so->so_rcv, "soreceive uiomove"); splx(s); error = uiomove(mtod(m, char *) + moff, (int)len, uio); s = splsoftnet(); - if (error != 0) { + if (error) { /* * If any part of the record has been removed * (such as the MT_SONAME mbuf, which will @@ -1268,7 +1207,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; @@ -1288,7 +1228,7 @@ soreceive(struct socket *so, struct mbuf *mp = m; mp = &m->m_next; so->so_rcv.sb_mb = m = m->m_next; - *mp = NULL; + *mp = (struct mbuf *)0; } else { MFREE(m, so->so_rcv.sb_mb); m = so->so_rcv.sb_mb; @@ -1309,14 +1249,16 @@ soreceive(struct socket *so, struct mbuf SBLASTRECORDCHK(&so->so_rcv, "soreceive 3"); SBLASTMBUFCHK(&so->so_rcv, "soreceive 3"); } - } else if (flags & MSG_PEEK) - moff += len; - else { - if (mp != NULL) - *mp = m_copym(m, 0, len, M_WAIT); - m->m_data += len; - m->m_len -= len; - so->so_rcv.sb_cc -= len; + } else { + if (flags & MSG_PEEK) + moff += len; + else { + if (mp) + *mp = m_copym(m, 0, len, M_WAIT); + m->m_data += len; + m->m_len -= len; + so->so_rcv.sb_cc -= len; + } } if (so->so_oobmark) { if ((flags & MSG_PEEK) == 0) { @@ -1340,7 +1282,7 @@ soreceive(struct socket *so, struct mbuf * with a short count but without error. * Keep sockbuf locked against other readers. */ - while (flags & MSG_WAITALL && m == NULL && uio->uio_resid > 0 && + while (flags & MSG_WAITALL && m == 0 && uio->uio_resid > 0 && !sosendallatonce(so) && !nextrecord) { if (so->so_error || so->so_state & SS_CANTRCVMORE) break; @@ -1357,27 +1299,29 @@ soreceive(struct socket *so, struct mbuf */ if ((pr->pr_flags & PR_WANTRCVD) && so->so_pcb) (*pr->pr_usrreq)(so, PRU_RCVD, - NULL, (struct mbuf *)(long)flags, NULL, l); + (struct mbuf *)0, + (struct mbuf *)(long)flags, + (struct mbuf *)0, l); SBLASTRECORDCHK(&so->so_rcv, "soreceive sbwait 2"); SBLASTMBUFCHK(&so->so_rcv, "soreceive sbwait 2"); error = sbwait(&so->so_rcv); - if (error != 0) { + if (error) { sbunlock(&so->so_rcv); splx(s); - return 0; + return (0); } if ((m = so->so_rcv.sb_mb) != NULL) nextrecord = m->m_nextpkt; } } - if (m && atomic) { + if (m && pr->pr_flags & PR_ATOMIC) { flags |= MSG_TRUNC; if ((flags & MSG_PEEK) == 0) (void) sbdroprecord(&so->so_rcv); } if ((flags & MSG_PEEK) == 0) { - if (m == NULL) { + if (m == 0) { /* * First part is an inline SB_EMPTY_FIXUP(). Second * part makes sure sb_lastrecord is up-to-date if @@ -1393,8 +1337,8 @@ soreceive(struct socket *so, struct mbuf SBLASTRECORDCHK(&so->so_rcv, "soreceive 4"); SBLASTMBUFCHK(&so->so_rcv, "soreceive 4"); if (pr->pr_flags & PR_WANTRCVD && so->so_pcb) - (*pr->pr_usrreq)(so, PRU_RCVD, NULL, - (struct mbuf *)(long)flags, NULL, l); + (*pr->pr_usrreq)(so, PRU_RCVD, (struct mbuf *)0, + (struct mbuf *)(long)flags, (struct mbuf *)0, l); } if (orig_resid == uio->uio_resid && orig_resid && (flags & MSG_EOR) == 0 && (so->so_state & SS_CANTRCVMORE) == 0) { @@ -1403,12 +1347,12 @@ soreceive(struct socket *so, struct mbuf goto restart; } - if (flagsp != NULL) + if (flagsp) *flagsp |= flags; release: sbunlock(&so->so_rcv); splx(s); - return error; + return (error); } int @@ -1423,9 +1367,9 @@ soshutdown(struct socket *so, int how) if (how == SHUT_RD || how == SHUT_RDWR) sorflush(so); if (how == SHUT_WR || how == SHUT_RDWR) - return (*pr->pr_usrreq)(so, PRU_SHUTDOWN, NULL, - NULL, NULL, NULL); - return 0; + return (*pr->pr_usrreq)(so, PRU_SHUTDOWN, (struct mbuf *)0, + (struct mbuf *)0, (struct mbuf *)0, (struct lwp *)0); + return (0); } void @@ -1455,140 +1399,157 @@ sorflush(struct socket *so) sbrelease(&asb, so); } -static int -sosetopt1(struct socket *so, int level, int optname, struct mbuf *m) +int +sosetopt(struct socket *so, int level, int optname, struct mbuf *m0) { - int optval, val; + int error; + struct mbuf *m; struct linger *l; - struct sockbuf *sb; - struct timeval *tv; - - switch (optname) { - - case SO_LINGER: - if (m == NULL || m->m_len != sizeof(struct linger)) - return EINVAL; - l = mtod(m, struct linger *); - if (l->l_linger < 0 || l->l_linger > USHRT_MAX || - l->l_linger > (INT_MAX / hz)) - return EDOM; - so->so_linger = l->l_linger; - if (l->l_onoff) - so->so_options |= SO_LINGER; - else - so->so_options &= ~SO_LINGER; - break; - - case SO_DEBUG: - case SO_KEEPALIVE: - case SO_DONTROUTE: - case SO_USELOOPBACK: - case SO_BROADCAST: - case SO_REUSEADDR: - case SO_REUSEPORT: - case SO_OOBINLINE: - case SO_TIMESTAMP: - if (m == NULL || m->m_len < sizeof(int)) - return EINVAL; - if (*mtod(m, int *)) - so->so_options |= optname; - else - so->so_options &= ~optname; - break; - case SO_SNDBUF: - case SO_RCVBUF: - case SO_SNDLOWAT: - case SO_RCVLOWAT: - if (m == NULL || m->m_len < sizeof(int)) - return EINVAL; + error = 0; + m = m0; + if (level != SOL_SOCKET) { + if (so->so_proto && so->so_proto->pr_ctloutput) + return ((*so->so_proto->pr_ctloutput) + (PRCO_SETOPT, so, level, optname, &m0)); + error = ENOPROTOOPT; + } else { + switch (optname) { - /* - * Values < 1 make no sense for any of these - * options, so disallow them. - */ - optval = *mtod(m, int *); - if (optval < 1) - return EINVAL; + case SO_LINGER: + if (m == NULL || m->m_len != sizeof(struct linger)) { + 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)) { + 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; - switch (optname) { + case SO_DEBUG: + case SO_KEEPALIVE: + case SO_DONTROUTE: + case SO_USELOOPBACK: + case SO_BROADCAST: + case SO_REUSEADDR: + case SO_REUSEPORT: + case SO_OOBINLINE: + case SO_TIMESTAMP: + if (m == NULL || m->m_len < sizeof(int)) { + error = EINVAL; + goto bad; + } + if (*mtod(m, int *)) + so->so_options |= optname; + else + so->so_options &= ~optname; + break; case SO_SNDBUF: case SO_RCVBUF: - sb = (optname == SO_SNDBUF) ? - &so->so_snd : &so->so_rcv; - if (sbreserve(sb, (u_long)optval, so) == 0) - return ENOBUFS; - sb->sb_flags &= ~SB_AUTOSIZE; - break; - - /* - * Make sure the low-water is never greater than - * the high-water. - */ case SO_SNDLOWAT: - so->so_snd.sb_lowat = - (optval > so->so_snd.sb_hiwat) ? - so->so_snd.sb_hiwat : optval; - break; case SO_RCVLOWAT: - so->so_rcv.sb_lowat = - (optval > so->so_rcv.sb_hiwat) ? - so->so_rcv.sb_hiwat : optval; - break; - } - break; + { + int optval; - case SO_SNDTIMEO: - case SO_RCVTIMEO: - if (m == NULL || m->m_len < sizeof(*tv)) - return EINVAL; - tv = mtod(m, struct timeval *); - if (tv->tv_sec > (INT_MAX - tv->tv_usec / tick) / hz) - return EDOM; - val = tv->tv_sec * hz + tv->tv_usec / tick; - if (val == 0 && tv->tv_usec != 0) - val = 1; + if (m == NULL || m->m_len < sizeof(int)) { + error = EINVAL; + goto bad; + } - switch (optname) { + /* + * Values < 1 make no sense for any of these + * options, so disallow them. + */ + optval = *mtod(m, int *); + if (optval < 1) { + error = EINVAL; + goto bad; + } - case SO_SNDTIMEO: - so->so_snd.sb_timeo = val; + switch (optname) { + + case SO_SNDBUF: + case SO_RCVBUF: + if (sbreserve(optname == SO_SNDBUF ? + &so->so_snd : &so->so_rcv, + (u_long) optval, so) == 0) { + error = ENOBUFS; + goto bad; + } + break; + + /* + * Make sure the low-water is never greater than + * the high-water. + */ + case SO_SNDLOWAT: + so->so_snd.sb_lowat = + (optval > so->so_snd.sb_hiwat) ? + so->so_snd.sb_hiwat : optval; + break; + case SO_RCVLOWAT: + so->so_rcv.sb_lowat = + (optval > so->so_rcv.sb_hiwat) ? + so->so_rcv.sb_hiwat : optval; + break; + } break; + } + + case SO_SNDTIMEO: case SO_RCVTIMEO: - so->so_rcv.sb_timeo = val; - break; - } - break; + { + struct timeval *tv; + int val; - default: - return ENOPROTOOPT; - } - return 0; -} + if (m == NULL || m->m_len < sizeof(*tv)) { + error = EINVAL; + goto bad; + } + tv = mtod(m, struct timeval *); + if (tv->tv_sec > (INT_MAX - tv->tv_usec / tick) / hz) { + error = EDOM; + goto bad; + } + val = tv->tv_sec * hz + tv->tv_usec / tick; + if (val == 0 && tv->tv_usec != 0) + val = 1; -int -sosetopt(struct socket *so, int level, int optname, struct mbuf *m) -{ - int error, prerr; + switch (optname) { - if (level == SOL_SOCKET) - error = sosetopt1(so, level, optname, m); - else - error = ENOPROTOOPT; + case SO_SNDTIMEO: + so->so_snd.sb_timeo = val; + break; + case SO_RCVTIMEO: + so->so_rcv.sb_timeo = val; + break; + } + break; + } - if ((error == 0 || error == ENOPROTOOPT) && - so->so_proto != NULL && so->so_proto->pr_ctloutput != NULL) { - /* give the protocol stack a shot */ - prerr = (*so->so_proto->pr_ctloutput)(PRCO_SETOPT, so, level, - optname, &m); - if (prerr == 0) - error = 0; - else if (prerr != ENOPROTOOPT) - error = prerr; - } else if (m != NULL) - (void)m_free(m); - return error; + default: + error = ENOPROTOOPT; + break; + } + if (error == 0 && so->so_proto && so->so_proto->pr_ctloutput) { + (void) ((*so->so_proto->pr_ctloutput) + (PRCO_SETOPT, so, level, optname, &m0)); + m = NULL; /* freed by protocol */ + } + } + bad: + if (m) + (void) m_free(m); + return (error); } int @@ -1793,7 +1754,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;