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.83.2.11 retrieving revision 1.85 diff -u -p -r1.83.2.11 -r1.85 --- src/sys/kern/uipc_socket.c 2005/12/11 10:29:12 1.83.2.11 +++ src/sys/kern/uipc_socket.c 2003/08/07 16:31:59 1.85 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.83.2.11 2005/12/11 10:29:12 christos Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.85 2003/08/07 16:31:59 agc Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.83.2.11 2005/12/11 10:29:12 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.85 2003/08/07 16:31:59 agc Exp $"); #include "opt_sock_counters.h" #include "opt_sosend_loan.h" @@ -90,11 +90,10 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket. #include #include #include -#include #include -POOL_INIT(socket_pool, sizeof(struct socket), 0, 0, 0, "sockpl", NULL); +struct pool socket_pool; MALLOC_DEFINE(M_SOOPTS, "soopts", "socket options"); MALLOC_DEFINE(M_SONAME, "soname", "socket name"); @@ -105,21 +104,17 @@ int somaxconn = SOMAXCONN; #ifdef SOSEND_COUNTERS #include -static struct evcnt sosend_loan_big = EVCNT_INITIALIZER(EVCNT_TYPE_MISC, +struct evcnt sosend_loan_big = EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "sosend", "loan big"); -static struct evcnt sosend_copy_big = EVCNT_INITIALIZER(EVCNT_TYPE_MISC, +struct evcnt sosend_copy_big = EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "sosend", "copy big"); -static struct evcnt sosend_copy_small = EVCNT_INITIALIZER(EVCNT_TYPE_MISC, +struct evcnt sosend_copy_small = EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "sosend", "copy small"); -static struct evcnt sosend_kvalimit = EVCNT_INITIALIZER(EVCNT_TYPE_MISC, +struct evcnt sosend_kvalimit = EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "sosend", "kva limit"); #define SOSEND_COUNTER_INCR(ev) (ev)->ev_count++ -EVCNT_ATTACH_STATIC(sosend_loan_big); -EVCNT_ATTACH_STATIC(sosend_copy_big); -EVCNT_ATTACH_STATIC(sosend_copy_small); -EVCNT_ATTACH_STATIC(sosend_kvalimit); #else #define SOSEND_COUNTER_INCR(ev) /* nothing */ @@ -130,10 +125,15 @@ void soinit(void) { - /* Set the initial adjusted socket buffer size. */ - if (sb_max_set(sb_max)) - panic("bad initial sb_max value: %lu", sb_max); + pool_init(&socket_pool, sizeof(struct socket), 0, 0, 0, + "sockpl", NULL); +#ifdef SOSEND_COUNTERS + evcnt_attach_static(&sosend_loan_big); + evcnt_attach_static(&sosend_copy_big); + evcnt_attach_static(&sosend_copy_small); + evcnt_attach_static(&sosend_kvalimit); +#endif /* SOSEND_COUNTERS */ } #ifdef SOSEND_NO_LOAN @@ -142,124 +142,53 @@ int use_sosend_loan = 0; int use_sosend_loan = 1; #endif -static struct simplelock so_pendfree_slock = SIMPLELOCK_INITIALIZER; -static struct mbuf *so_pendfree; +struct mbuf *so_pendfree; #ifndef SOMAXKVA #define SOMAXKVA (16 * 1024 * 1024) #endif int somaxkva = SOMAXKVA; -static int socurkva; -static int sokvawaiters; +int socurkva; +int sokvawaiters; #define SOCK_LOAN_THRESH 4096 #define SOCK_LOAN_CHUNK 65536 static size_t sodopendfree(struct socket *); -static size_t sodopendfreel(struct socket *); -static vsize_t -sokvareserve(struct socket *so, vsize_t len) +vaddr_t +sokvaalloc(vsize_t len, struct socket *so) { + vaddr_t lva; int s; - int error; - s = splvm(); - simple_lock(&so_pendfree_slock); while (socurkva + len > somaxkva) { - size_t freed; - - /* - * try to do pendfree. - */ - - freed = sodopendfreel(so); - - /* - * if some kva was freed, try again. - */ - - if (freed) + if (sodopendfree(so)) continue; - SOSEND_COUNTER_INCR(&sosend_kvalimit); + s = splvm(); sokvawaiters++; - error = ltsleep(&socurkva, PVM | PCATCH, "sokva", 0, - &so_pendfree_slock); + (void) tsleep(&socurkva, PVM, "sokva", 0); sokvawaiters--; - if (error) { - len = 0; - break; - } + splx(s); } - socurkva += len; - simple_unlock(&so_pendfree_slock); - splx(s); - return len; -} - -static 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. - */ - - if (sokvareserve(so, len) == 0) - return 0; - - /* - * allocate kva. - */ - - lva = uvm_km_alloc(kernel_map, len, 0, UVM_KMF_VAONLY | UVM_KMF_WAITVA); - if (lva == 0) { - sokvaunreserve(len); + lva = uvm_km_valloc_wait(kernel_map, len); + if (lva == 0) return (0); - } + socurkva += len; return lva; } -/* - * sokvafree: free kva for loan. - */ - void sokvafree(vaddr_t sva, vsize_t len) { - /* - * free kva. - */ - - uvm_km_free(kernel_map, sva, len, UVM_KMF_VAONLY); - - /* - * unreserve kva. - */ - - sokvaunreserve(len); + uvm_km_free(kernel_map, sva, len); + socurkva -= len; + if (sokvawaiters) + wakeup(&socurkva); } static void @@ -294,91 +223,63 @@ sodoloanfree(struct vm_page **pgs, caddr static size_t sodopendfree(struct socket *so) { + struct mbuf *m; + size_t rv = 0; int s; - size_t rv; s = splvm(); - simple_lock(&so_pendfree_slock); - rv = sodopendfreel(so); - simple_unlock(&so_pendfree_slock); - splx(s); - return rv; -} - -/* - * sodopendfreel: free mbufs on "pendfree" list. - * unlock and relock so_pendfree_slock when freeing mbufs. - * - * => called with so_pendfree_slock held. - * => called at splvm. - */ - -static size_t -sodopendfreel(struct socket *so) -{ - size_t rv = 0; + for (;;) { + m = so_pendfree; + if (m == NULL) + break; + so_pendfree = m->m_next; + splx(s); - LOCK_ASSERT(simple_lock_held(&so_pendfree_slock)); + rv += m->m_ext.ext_size; + 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); + } for (;;) { - struct mbuf *m; - struct mbuf *next; - - m = so_pendfree; + m = so->so_pendfree; if (m == NULL) break; - so_pendfree = NULL; - simple_unlock(&so_pendfree_slock); - /* XXX splx */ - - for (; m != NULL; m = next) { - next = m->m_next; - - rv += m->m_ext.ext_size; - 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); - } + so->so_pendfree = m->m_next; + splx(s); - /* XXX splvm */ - simple_lock(&so_pendfree_slock); + rv += m->m_ext.ext_size; + 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); return (rv); } void soloanfree(struct mbuf *m, caddr_t buf, size_t size, void *arg) { + struct socket *so = arg; int s; if (m == NULL) { - - /* - * called from MEXTREMOVE. - */ - sodoloanfree(NULL, buf, size); return; } - /* - * postpone freeing mbuf. - * - * we can't do it in interrupt context - * because we need to put kva back to kernel_map. - */ - s = splvm(); - simple_lock(&so_pendfree_slock); - m->m_next = so_pendfree; - so_pendfree = m; + m->m_next = so->so_pendfree; + so->so_pendfree = m; + splx(s); if (sokvawaiters) wakeup(&socurkva); - simple_unlock(&so_pendfree_slock); - splx(s); } static long @@ -405,13 +306,12 @@ sosend_loan(struct socket *so, struct ui /* XXX KDASSERT */ KASSERT(npgs <= M_EXT_MAXPAGES); - KASSERT(uio->uio_lwp != NULL); lva = sokvaalloc(len, so); if (lva == 0) return 0; - error = uvm_loan(&uio->uio_lwp->l_proc->p_vmspace->vm_map, sva, len, + error = uvm_loan(&uio->uio_procp->p_vmspace->vm_map, sva, len, m->m_ext.ext_pgs, UVM_LOAN_TOPAGE); if (error) { sokvafree(lva, len); @@ -449,14 +349,14 @@ sosend_loan(struct socket *so, struct ui */ /*ARGSUSED*/ int -socreate(int dom, struct socket **aso, int type, int proto, struct lwp *l) +socreate(int dom, struct socket **aso, int type, int proto) { - const struct protosw *prp; - struct socket *so; struct proc *p; + struct protosw *prp; + struct socket *so; int error, s; - p = l->l_proc; + p = curproc; /* XXX */ if (proto) prp = pffindproto(dom, proto, type); else @@ -480,11 +380,9 @@ socreate(int dom, struct socket **aso, i so->so_mowner = &prp->pr_domain->dom_mowner; #endif if (p != 0) - so->so_uidinfo = uid_find(p->p_ucred->cr_uid); - else - so->so_uidinfo = uid_find(0); + so->so_uid = p->p_ucred->cr_uid; error = (*prp->pr_usrreq)(so, PRU_ATTACH, (struct mbuf *)0, - (struct mbuf *)(long)proto, (struct mbuf *)0, l); + (struct mbuf *)(long)proto, (struct mbuf *)0, p); if (error) { so->so_state |= SS_NOFDREF; sofree(so); @@ -497,13 +395,13 @@ socreate(int dom, struct socket **aso, i } int -sobind(struct socket *so, struct mbuf *nam, struct lwp *l) +sobind(struct socket *so, struct mbuf *nam, struct proc *p) { int s, error; s = splsoftnet(); error = (*so->so_proto->pr_usrreq)(so, PRU_BIND, (struct mbuf *)0, - nam, (struct mbuf *)0, l); + nam, (struct mbuf *)0, p); splx(s); return (error); } @@ -515,7 +413,7 @@ solisten(struct socket *so, int backlog) s = splsoftnet(); error = (*so->so_proto->pr_usrreq)(so, PRU_LISTEN, (struct mbuf *)0, - (struct mbuf *)0, (struct mbuf *)0, (struct lwp *)0); + (struct mbuf *)0, (struct mbuf *)0, (struct proc *)0); if (error) { splx(s); return (error); @@ -532,6 +430,7 @@ solisten(struct socket *so, int backlog) void sofree(struct socket *so) { + struct mbuf *m; if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0) return; @@ -544,14 +443,13 @@ sofree(struct socket *so) if (!soqremque(so, 0)) return; } - if (so->so_rcv.sb_hiwat) - (void)chgsbsize(so->so_uidinfo, &so->so_rcv.sb_hiwat, 0, - RLIM_INFINITY); - if (so->so_snd.sb_hiwat) - (void)chgsbsize(so->so_uidinfo, &so->so_snd.sb_hiwat, 0, - RLIM_INFINITY); - sbrelease(&so->so_snd, so); + sbrelease(&so->so_snd); sorflush(so); + while ((m = so->so_pendfree) != NULL) { + so->so_pendfree = m->m_next; + m->m_next = so_pendfree; + so_pendfree = m; + } pool_put(&socket_pool, so); } @@ -603,7 +501,7 @@ soclose(struct socket *so) if (so->so_pcb) { int error2 = (*so->so_proto->pr_usrreq)(so, PRU_DETACH, (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0, - (struct lwp *)0); + (struct proc *)0); if (error == 0) error = error2; } @@ -624,7 +522,7 @@ soabort(struct socket *so) { return (*so->so_proto->pr_usrreq)(so, PRU_ABORT, (struct mbuf *)0, - (struct mbuf *)0, (struct mbuf *)0, (struct lwp *)0); + (struct mbuf *)0, (struct mbuf *)0, (struct proc *)0); } int @@ -640,7 +538,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, - (struct mbuf *)0, nam, (struct mbuf *)0, (struct lwp *)0); + (struct mbuf *)0, nam, (struct mbuf *)0, (struct proc *)0); else error = ECONNABORTED; @@ -649,10 +547,12 @@ soaccept(struct socket *so, struct mbuf } int -soconnect(struct socket *so, struct mbuf *nam, struct lwp *l) +soconnect(struct socket *so, struct mbuf *nam) { + struct proc *p; int s, error; + p = curproc; /* XXX */ if (so->so_options & SO_ACCEPTCONN) return (EOPNOTSUPP); s = splsoftnet(); @@ -668,7 +568,7 @@ soconnect(struct socket *so, struct mbuf error = EISCONN; else error = (*so->so_proto->pr_usrreq)(so, PRU_CONNECT, - (struct mbuf *)0, nam, (struct mbuf *)0, l); + (struct mbuf *)0, nam, (struct mbuf *)0, p); splx(s); return (error); } @@ -681,7 +581,7 @@ soconnect2(struct socket *so1, struct so s = splsoftnet(); error = (*so1->so_proto->pr_usrreq)(so1, PRU_CONNECT2, (struct mbuf *)0, (struct mbuf *)so2, (struct mbuf *)0, - (struct lwp *)0); + (struct proc *)0); splx(s); return (error); } @@ -702,7 +602,7 @@ sodisconnect(struct socket *so) } error = (*so->so_proto->pr_usrreq)(so, PRU_DISCONNECT, (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0, - (struct lwp *)0); + (struct proc *)0); bad: splx(s); sodopendfree(so); @@ -729,16 +629,16 @@ sodisconnect(struct socket *so) */ int sosend(struct socket *so, struct mbuf *addr, struct uio *uio, struct mbuf *top, - struct mbuf *control, int flags, struct lwp *l) + struct mbuf *control, int flags) { - struct mbuf **mp, *m; struct proc *p; + struct mbuf **mp, *m; long space, len, resid, clen, mlen; int error, s, dontroute, atomic; - p = l->l_proc; sodopendfree(so); + p = curproc; /* XXX */ clen = 0; atomic = sosendallatonce(so) || top; if (uio) @@ -759,8 +659,7 @@ sosend(struct socket *so, struct mbuf *a dontroute = (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0 && (so->so_proto->pr_flags & PR_ATOMIC); - if (p) - p->p_stats->p_ru.ru_msgsnd++; + p->p_stats->p_ru.ru_msgsnd++; if (control) clen = control->m_len; #define snderr(errno) { error = errno; splx(s); goto release; } @@ -792,7 +691,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 && + if (space < resid + clen && uio && (atomic || space < so->so_snd.sb_lowat || space < clen)) { if (so->so_state & SS_NBIO) snderr(EWOULDBLOCK); @@ -875,7 +774,7 @@ sosend(struct socket *so, struct mbuf *a break; } } while (space > 0 && atomic); - + s = splsoftnet(); if (so->so_state & SS_CANTSENDMORE) @@ -887,7 +786,7 @@ sosend(struct socket *so, struct mbuf *a so->so_state |= SS_MORETOCOME; error = (*so->so_proto->pr_usrreq)(so, (flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND, - top, addr, control, curlwp); /* XXX */ + top, addr, control, p); if (dontroute) so->so_options &= ~SO_DONTROUTE; if (resid > 0) @@ -933,10 +832,9 @@ int soreceive(struct socket *so, struct mbuf **paddr, struct uio *uio, struct mbuf **mp0, struct mbuf **controlp, int *flagsp) { - struct lwp *l; struct mbuf *m, **mp; int flags, len, error, s, offset, moff, type, orig_resid; - const struct protosw *pr; + struct protosw *pr; struct mbuf *nextrecord; int mbuf_removed = 0; @@ -944,8 +842,6 @@ soreceive(struct socket *so, struct mbuf mp = mp0; type = 0; orig_resid = uio->uio_resid; - l = uio->uio_lwp; - if (paddr) *paddr = 0; if (controlp) @@ -961,8 +857,8 @@ 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), - (struct mbuf *)0, l); + (struct mbuf *)(long)(flags & MSG_PEEK), (struct mbuf *)0, + (struct proc *)0); if (error) goto bad; do { @@ -979,7 +875,7 @@ soreceive(struct socket *so, struct mbuf *mp = (struct mbuf *)0; if (so->so_state & SS_ISCONFIRMING && uio->uio_resid) (*pr->pr_usrreq)(so, PRU_RCVD, (struct mbuf *)0, - (struct mbuf *)0, (struct mbuf *)0, l); + (struct mbuf *)0, (struct mbuf *)0, (struct proc *)0); restart: if ((error = sblock(&so->so_rcv, SBLOCKWAIT(flags))) != 0) @@ -1052,8 +948,10 @@ 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) - l->l_proc->p_stats->p_ru.ru_msgrcv++; +#ifdef notyet /* XXXX */ + if (uio->uio_procp) + uio->uio_procp->p_stats->p_ru.ru_msgrcv++; +#endif KASSERT(m == so->so_rcv.sb_mb); SBLASTRECORDCHK(&so->so_rcv, "soreceive 1"); SBLASTMBUFCHK(&so->so_rcv, "soreceive 1"); @@ -1091,23 +989,15 @@ soreceive(struct socket *so, struct mbuf sbfree(&so->so_rcv, m); mbuf_removed = 1; if (controlp) { - struct domain *dom = pr->pr_domain; - if (dom->dom_externalize && l && + if (pr->pr_domain->dom_externalize && mtod(m, struct cmsghdr *)->cmsg_type == SCM_RIGHTS) - error = (*dom->dom_externalize)(m, l); + error = (*pr->pr_domain->dom_externalize)(m); *controlp = m; so->so_rcv.sb_mb = m->m_next; 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 (pr->pr_domain->dom_dispose && - mtod(m, struct cmsghdr *)->cmsg_type == SCM_RIGHTS) - (*pr->pr_domain->dom_dispose)(m); MFREE(m, so->so_rcv.sb_mb); m = so->so_rcv.sb_mb; } @@ -1288,7 +1178,8 @@ soreceive(struct socket *so, struct mbuf (*pr->pr_usrreq)(so, PRU_RCVD, (struct mbuf *)0, (struct mbuf *)(long)flags, - (struct mbuf *)0, l); + (struct mbuf *)0, + (struct proc *)0); SBLASTRECORDCHK(&so->so_rcv, "soreceive sbwait 2"); SBLASTMBUFCHK(&so->so_rcv, "soreceive sbwait 2"); error = sbwait(&so->so_rcv); @@ -1325,7 +1216,8 @@ soreceive(struct socket *so, struct mbuf SBLASTMBUFCHK(&so->so_rcv, "soreceive 4"); if (pr->pr_flags & PR_WANTRCVD && so->so_pcb) (*pr->pr_usrreq)(so, PRU_RCVD, (struct mbuf *)0, - (struct mbuf *)(long)flags, (struct mbuf *)0, l); + (struct mbuf *)(long)flags, (struct mbuf *)0, + (struct proc *)0); } if (orig_resid == uio->uio_resid && orig_resid && (flags & MSG_EOR) == 0 && (so->so_state & SS_CANTRCVMORE) == 0) { @@ -1333,7 +1225,7 @@ soreceive(struct socket *so, struct mbuf splx(s); goto restart; } - + if (flagsp) *flagsp |= flags; release: @@ -1345,7 +1237,7 @@ soreceive(struct socket *so, struct mbuf int soshutdown(struct socket *so, int how) { - const struct protosw *pr; + struct protosw *pr; pr = so->so_proto; if (!(how == SHUT_RD || how == SHUT_WR || how == SHUT_RDWR)) @@ -1355,7 +1247,7 @@ soshutdown(struct socket *so, int how) sorflush(so); if (how == SHUT_WR || how == SHUT_RDWR) return (*pr->pr_usrreq)(so, PRU_SHUTDOWN, (struct mbuf *)0, - (struct mbuf *)0, (struct mbuf *)0, (struct lwp *)0); + (struct mbuf *)0, (struct mbuf *)0, (struct proc *)0); return (0); } @@ -1363,7 +1255,7 @@ void sorflush(struct socket *so) { struct sockbuf *sb, asb; - const struct protosw *pr; + struct protosw *pr; int s; sb = &so->so_rcv; @@ -1374,16 +1266,11 @@ sorflush(struct socket *so) socantrcvmore(so); sbunlock(sb); asb = *sb; - /* - * Clear most of the sockbuf structure, but leave some of the - * fields valid. - */ - memset(&sb->sb_startzero, 0, - sizeof(*sb) - offsetof(struct sockbuf, sb_startzero)); + memset((caddr_t)sb, 0, sizeof(*sb)); splx(s); if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose) (*pr->pr_domain->dom_dispose)(asb.sb_mb); - sbrelease(&asb, so); + sbrelease(&asb); } int @@ -1407,11 +1294,6 @@ sosetopt(struct socket *so, int level, i error = EINVAL; goto bad; } - if (mtod(m, struct linger *)->l_linger < 0 || - mtod(m, struct linger *)->l_linger > (INT_MAX / hz)) { - error = EDOM; - goto bad; - } so->so_linger = mtod(m, struct linger *)->l_linger; /* fall thru... */ @@ -1462,7 +1344,7 @@ sosetopt(struct socket *so, int level, i case SO_RCVBUF: if (sbreserve(optname == SO_SNDBUF ? &so->so_snd : &so->so_rcv, - (u_long) optval, so) == 0) { + (u_long) optval) == 0) { error = ENOBUFS; goto bad; } @@ -1490,14 +1372,14 @@ sosetopt(struct socket *so, int level, i case SO_RCVTIMEO: { struct timeval *tv; - int val; + short val; 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) { + if (tv->tv_sec > (SHRT_MAX - tv->tv_usec / tick) / hz) { error = EDOM; goto bad; } @@ -1607,10 +1489,6 @@ sogetopt(struct socket *so, int level, i break; } - case SO_OVERFLOWED: - *mtod(m, int *) = so->so_rcv.sb_overflowed; - break; - default: (void)m_free(m); return (ENOPROTOOPT); @@ -1623,7 +1501,12 @@ sogetopt(struct socket *so, int level, i void sohasoutofband(struct socket *so) { - fownsignal(so->so_pgid, SIGURG, POLL_PRI, POLLPRI|POLLRDBAND, so); + struct proc *p; + + if (so->so_pgid < 0) + gsignal(-so->so_pgid, SIGURG); + else if (so->so_pgid > 0 && (p = pfind(so->so_pgid)) != 0) + psignal(p, SIGURG); selwakeup(&so->so_rcv.sb_sel); } @@ -1647,7 +1530,7 @@ filt_soread(struct knote *kn, long hint) so = (struct socket *)kn->kn_fp->f_data; kn->kn_data = so->so_rcv.sb_cc; if (so->so_state & SS_CANTRCVMORE) { - kn->kn_flags |= EV_EOF; + kn->kn_flags |= EV_EOF; kn->kn_fflags = so->so_error; return (1); } @@ -1678,7 +1561,7 @@ filt_sowrite(struct knote *kn, long hint so = (struct socket *)kn->kn_fp->f_data; kn->kn_data = sbspace(&so->so_snd); if (so->so_state & SS_CANTSENDMORE) { - kn->kn_flags |= EV_EOF; + kn->kn_flags |= EV_EOF; kn->kn_fflags = so->so_error; return (1); } @@ -1703,7 +1586,7 @@ filt_solisten(struct knote *kn, long hin /* * Set kn_data to number of incoming connections, not * counting partial (incomplete) connections. - */ + */ kn->kn_data = so->so_qlen; return (kn->kn_data > 0); } @@ -1742,56 +1625,3 @@ soo_kqfilter(struct file *fp, struct kno return (0); } -#include - -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); -}