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.151.6.4 retrieving revision 1.163 diff -u -p -r1.151.6.4 -r1.163 --- src/sys/kern/uipc_socket.c 2008/09/28 10:40:54 1.151.6.4 +++ src/sys/kern/uipc_socket.c 2008/04/29 17:35:31 1.163 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.151.6.4 2008/09/28 10:40:54 mjf Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.163 2008/04/29 17:35:31 ad Exp $ */ /*- * Copyright (c) 2002, 2007, 2008 The NetBSD Foundation, Inc. @@ -63,14 +63,12 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.151.6.4 2008/09/28 10:40:54 mjf Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.163 2008/04/29 17:35:31 ad Exp $"); -#include "opt_inet.h" #include "opt_sock_counters.h" #include "opt_sosend_loan.h" #include "opt_mbuftrace.h" #include "opt_somaxkva.h" -#include "opt_multiprocessor.h" /* XXX */ #include #include @@ -129,7 +127,7 @@ EVCNT_ATTACH_STATIC(sosend_kvalimit); static struct callback_entry sokva_reclaimerentry; -#if defined(SOSEND_NO_LOAN) || defined(MULTIPROCESSOR) +#ifdef SOSEND_NO_LOAN int sock_loan_thresh = -1; #else int sock_loan_thresh = 4096; @@ -419,6 +417,17 @@ getsombuf(struct socket *so, int type) 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) { @@ -426,7 +435,6 @@ soinit(void) mutex_init(&so_pendfree_lock, MUTEX_DEFAULT, IPL_VM); softnet_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE); cv_init(&socurkva_cv, "sokva"); - soinit2(); /* Set the initial adjusted socket buffer size. */ if (sb_max_set(sb_max)) @@ -490,8 +498,6 @@ socreate(int dom, struct socket **aso, i #endif uid = kauth_cred_geteuid(l->l_cred); so->so_uidinfo = uid_find(uid); - so->so_egid = kauth_cred_getegid(l->l_cred); - so->so_cpid = l->l_proc->p_pid; if (lockso != NULL) { /* Caller wants us to share a lock. */ lock = lockso->so_lock; @@ -614,11 +620,6 @@ sofree(struct socket *so) KASSERT(!cv_has_waiters(&so->so_snd.sb_cv)); sorflush(so); refs = so->so_aborting; /* XXX */ -#ifdef INET - /* remove acccept filter if one is present. */ - if (so->so_accf != NULL) - do_setopt_accept_filter(so, NULL); -#endif sounlock(so); if (refs == 0) /* XXX */ soput(so); @@ -640,21 +641,23 @@ soclose(struct socket *so) solock(so); if (so->so_options & SO_ACCEPTCONN) { do { - while ((so2 = TAILQ_FIRST(&so->so_q0)) != 0) { + if ((so2 = TAILQ_FIRST(&so->so_q0)) != 0) { KASSERT(solocked2(so, so2)); (void) soqremque(so2, 0); /* soabort drops the lock. */ (void) soabort(so2); solock(so); + continue; } - while ((so2 = TAILQ_FIRST(&so->so_q)) != 0) { + if ((so2 = TAILQ_FIRST(&so->so_q)) != 0) { KASSERT(solocked2(so, so2)); (void) soqremque(so2, 1); /* soabort drops the lock. */ (void) soabort(so2); solock(so); + continue; } - } while (!TAILQ_EMPTY(&so->so_q0)); + } while (0); } if (so->so_pcb == 0) goto discard; @@ -705,10 +708,12 @@ soabort(struct socket *so) error = (*so->so_proto->pr_usrreq)(so, PRU_ABORT, NULL, NULL, NULL, NULL); refs = --so->so_aborting; /* XXX */ - if (error || (refs == 0)) { + if (error) { sofree(so); } else { sounlock(so); + if (refs == 0) + sofree(so); } return error; } @@ -847,7 +852,8 @@ sosend(struct socket *so, struct mbuf *a dontroute = (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0 && (so->so_proto->pr_flags & PR_ATOMIC); - l->l_ru.ru_msgsnd++; + if (l) + l->l_ru.ru_msgsnd++; if (control) clen = control->m_len; restart: @@ -1564,41 +1570,29 @@ sorflush(struct socket *so) sbrelease(&asb, so); } -/* - * internal set SOL_SOCKET options - */ static int -sosetopt1(struct socket *so, const struct sockopt *sopt) +sosetopt1(struct socket *so, int level, int optname, struct mbuf *m) { - int error, optval; - struct linger l; - struct timeval tv; + int optval, val; + struct linger *l; + struct sockbuf *sb; + struct timeval *tv; - switch (sopt->sopt_name) { + switch (optname) { -#ifdef INET - case SO_ACCEPTFILTER: - error = do_setopt_accept_filter(so, sopt); - if (error) - return error; - break; -#endif - - case SO_LINGER: - error = sockopt_get(sopt, &l, sizeof(l)); - if (error) - return (error); - - if (l.l_linger < 0 || l.l_linger > USHRT_MAX || - l.l_linger > (INT_MAX / hz)) + 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; + 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: @@ -1609,44 +1603,38 @@ sosetopt1(struct socket *so, const struc case SO_REUSEPORT: case SO_OOBINLINE: case SO_TIMESTAMP: - error = sockopt_getint(sopt, &optval); - if (error) - return (error); - - if (optval) - so->so_options |= sopt->sopt_name; + if (m == NULL || m->m_len < sizeof(int)) + return EINVAL; + if (*mtod(m, int *)) + so->so_options |= optname; else - so->so_options &= ~sopt->sopt_name; + so->so_options &= ~optname; break; case SO_SNDBUF: case SO_RCVBUF: case SO_SNDLOWAT: case SO_RCVLOWAT: - error = sockopt_getint(sopt, &optval); - if (error) - return (error); + if (m == NULL || m->m_len < sizeof(int)) + return EINVAL; /* * Values < 1 make no sense for any of these * options, so disallow them. */ + optval = *mtod(m, int *); if (optval < 1) return EINVAL; - switch (sopt->sopt_name) { - case SO_SNDBUF: - if (sbreserve(&so->so_snd, (u_long)optval, so) == 0) - return ENOBUFS; - - so->so_snd.sb_flags &= ~SB_AUTOSIZE; - break; + switch (optname) { + case SO_SNDBUF: case SO_RCVBUF: - if (sbreserve(&so->so_rcv, (u_long)optval, so) == 0) + sb = (optname == SO_SNDBUF) ? + &so->so_snd : &so->so_rcv; + if (sbreserve(sb, (u_long)optval, so) == 0) return ENOBUFS; - - so->so_rcv.sb_flags &= ~SB_AUTOSIZE; + sb->sb_flags &= ~SB_AUTOSIZE; break; /* @@ -1654,40 +1642,36 @@ sosetopt1(struct socket *so, const struc * the high-water. */ case SO_SNDLOWAT: - if (optval > so->so_snd.sb_hiwat) - optval = so->so_snd.sb_hiwat; - - so->so_snd.sb_lowat = optval; + so->so_snd.sb_lowat = + (optval > so->so_snd.sb_hiwat) ? + so->so_snd.sb_hiwat : optval; break; - case SO_RCVLOWAT: - if (optval > so->so_rcv.sb_hiwat) - optval = so->so_rcv.sb_hiwat; - - so->so_rcv.sb_lowat = optval; + 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: - error = sockopt_get(sopt, &tv, sizeof(tv)); - if (error) - return (error); - - if (tv.tv_sec > (INT_MAX - tv.tv_usec / tick) / hz) + 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; - optval = tv.tv_sec * hz + tv.tv_usec / tick; - if (optval == 0 && tv.tv_usec != 0) - optval = 1; + switch (optname) { - switch (sopt->sopt_name) { case SO_SNDTIMEO: - so->so_snd.sb_timeo = optval; + so->so_snd.sb_timeo = val; break; case SO_RCVTIMEO: - so->so_rcv.sb_timeo = optval; + so->so_rcv.sb_timeo = val; break; } break; @@ -1699,299 +1683,122 @@ sosetopt1(struct socket *so, const struc } int -sosetopt(struct socket *so, struct sockopt *sopt) +sosetopt(struct socket *so, int level, int optname, struct mbuf *m) { int error, prerr; solock(so); - if (sopt->sopt_level == SOL_SOCKET) - error = sosetopt1(so, sopt); + if (level == SOL_SOCKET) + error = sosetopt1(so, level, optname, m); else error = ENOPROTOOPT; 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, sopt); + 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); sounlock(so); return error; } -/* - * so_setsockopt() is a wrapper providing a sockopt structure for sosetopt() - */ -int -so_setsockopt(struct lwp *l, struct socket *so, int level, int name, - const void *val, size_t valsize) -{ - struct sockopt sopt; - int error; - - KASSERT(valsize == 0 || val != NULL); - - sockopt_init(&sopt, level, name, valsize); - sockopt_set(&sopt, val, valsize); - - error = sosetopt(so, &sopt); - - sockopt_destroy(&sopt); - - return error; -} - -/* - * internal get SOL_SOCKET options - */ -static int -sogetopt1(struct socket *so, struct sockopt *sopt) -{ - int error, optval; - struct linger l; - struct timeval tv; - - switch (sopt->sopt_name) { - -#ifdef INET - case SO_ACCEPTFILTER: - error = do_getopt_accept_filter(so, sopt); - break; -#endif - - case SO_LINGER: - l.l_onoff = (so->so_options & SO_LINGER) ? 1 : 0; - l.l_linger = so->so_linger; - - error = sockopt_set(sopt, &l, sizeof(l)); - break; - - case SO_USELOOPBACK: - case SO_DONTROUTE: - case SO_DEBUG: - case SO_KEEPALIVE: - case SO_REUSEADDR: - case SO_REUSEPORT: - case SO_BROADCAST: - case SO_OOBINLINE: - case SO_TIMESTAMP: - error = sockopt_setint(sopt, - (so->so_options & sopt->sopt_name) ? 1 : 0); - break; - - case SO_TYPE: - error = sockopt_setint(sopt, so->so_type); - break; - - case SO_ERROR: - error = sockopt_setint(sopt, so->so_error); - so->so_error = 0; - break; - - case SO_SNDBUF: - error = sockopt_setint(sopt, so->so_snd.sb_hiwat); - break; - - case SO_RCVBUF: - error = sockopt_setint(sopt, so->so_rcv.sb_hiwat); - break; - - case SO_SNDLOWAT: - error = sockopt_setint(sopt, so->so_snd.sb_lowat); - break; - - case SO_RCVLOWAT: - error = sockopt_setint(sopt, so->so_rcv.sb_lowat); - break; - - case SO_SNDTIMEO: - case SO_RCVTIMEO: - optval = (sopt->sopt_name == SO_SNDTIMEO ? - so->so_snd.sb_timeo : so->so_rcv.sb_timeo); - - tv.tv_sec = optval / hz; - tv.tv_usec = (optval % hz) * tick; - - error = sockopt_set(sopt, &tv, sizeof(tv)); - break; - - case SO_OVERFLOWED: - error = sockopt_setint(sopt, so->so_rcv.sb_overflowed); - break; - - default: - error = ENOPROTOOPT; - break; - } - - return (error); -} - int -sogetopt(struct socket *so, struct sockopt *sopt) +sogetopt(struct socket *so, int level, int optname, struct mbuf **mp) { + struct mbuf *m; int error; solock(so); - if (sopt->sopt_level != SOL_SOCKET) { + if (level != SOL_SOCKET) { if (so->so_proto && so->so_proto->pr_ctloutput) { error = ((*so->so_proto->pr_ctloutput) - (PRCO_GETOPT, so, sopt)); + (PRCO_GETOPT, so, level, optname, mp)); } else error = (ENOPROTOOPT); } else { - error = sogetopt1(so, sopt); - } - sounlock(so); - return (error); -} - -/* - * alloc sockopt data buffer buffer - * - will be released at destroy - */ -static void -sockopt_alloc(struct sockopt *sopt, size_t len) -{ - - KASSERT(sopt->sopt_size == 0); - - if (len > sizeof(sopt->sopt_buf)) - sopt->sopt_data = malloc(len, M_SOOPTS, M_WAITOK | M_ZERO); - else - sopt->sopt_data = sopt->sopt_buf; - - sopt->sopt_size = len; -} - -/* - * initialise sockopt storage - */ -void -sockopt_init(struct sockopt *sopt, int level, int name, size_t size) -{ + m = m_get(M_WAIT, MT_SOOPTS); + m->m_len = sizeof(int); - memset(sopt, 0, sizeof(*sopt)); - - sopt->sopt_level = level; - sopt->sopt_name = name; - sockopt_alloc(sopt, size); -} + switch (optname) { -/* - * destroy sockopt storage - * - will release any held memory references - */ -void -sockopt_destroy(struct sockopt *sopt) -{ - - if (sopt->sopt_data != sopt->sopt_buf) - free(sopt->sopt_data, M_SOOPTS); - - memset(sopt, 0, sizeof(*sopt)); -} - -/* - * set sockopt value - * - value is copied into sockopt - * - memory is allocated when necessary - */ -int -sockopt_set(struct sockopt *sopt, const void *buf, size_t len) -{ - - if (sopt->sopt_size == 0) - sockopt_alloc(sopt, len); - - KASSERT(sopt->sopt_size == len); - memcpy(sopt->sopt_data, buf, len); - return 0; -} - -/* - * common case of set sockopt integer value - */ -int -sockopt_setint(struct sockopt *sopt, int val) -{ - - return sockopt_set(sopt, &val, sizeof(int)); -} - -/* - * get sockopt value - * - correct size must be given - */ -int -sockopt_get(const struct sockopt *sopt, void *buf, size_t len) -{ - - if (sopt->sopt_size != len) - return EINVAL; + case SO_LINGER: + m->m_len = sizeof(struct linger); + mtod(m, struct linger *)->l_onoff = + (so->so_options & SO_LINGER) ? 1 : 0; + mtod(m, struct linger *)->l_linger = so->so_linger; + break; - memcpy(buf, sopt->sopt_data, len); - return 0; -} + case SO_USELOOPBACK: + case SO_DONTROUTE: + case SO_DEBUG: + case SO_KEEPALIVE: + case SO_REUSEADDR: + case SO_REUSEPORT: + case SO_BROADCAST: + case SO_OOBINLINE: + case SO_TIMESTAMP: + *mtod(m, int *) = (so->so_options & optname) ? 1 : 0; + break; -/* - * common case of get sockopt integer value - */ -int -sockopt_getint(const struct sockopt *sopt, int *valp) -{ + case SO_TYPE: + *mtod(m, int *) = so->so_type; + break; - return sockopt_get(sopt, valp, sizeof(int)); -} + case SO_ERROR: + *mtod(m, int *) = so->so_error; + so->so_error = 0; + break; -/* - * set sockopt value from mbuf - * - ONLY for legacy code - * - mbuf is released by sockopt - */ -int -sockopt_setmbuf(struct sockopt *sopt, struct mbuf *m) -{ - size_t len; + case SO_SNDBUF: + *mtod(m, int *) = so->so_snd.sb_hiwat; + break; - len = m_length(m); + case SO_RCVBUF: + *mtod(m, int *) = so->so_rcv.sb_hiwat; + break; - if (sopt->sopt_size == 0) - sockopt_alloc(sopt, len); + case SO_SNDLOWAT: + *mtod(m, int *) = so->so_snd.sb_lowat; + break; - KASSERT(sopt->sopt_size == len); - m_copydata(m, 0, len, sopt->sopt_data); - m_freem(m); + case SO_RCVLOWAT: + *mtod(m, int *) = so->so_rcv.sb_lowat; + break; - return 0; -} + case SO_SNDTIMEO: + case SO_RCVTIMEO: + { + int val = (optname == SO_SNDTIMEO ? + so->so_snd.sb_timeo : so->so_rcv.sb_timeo); + + m->m_len = sizeof(struct timeval); + mtod(m, struct timeval *)->tv_sec = val / hz; + mtod(m, struct timeval *)->tv_usec = + (val % hz) * tick; + break; + } -/* - * get sockopt value into mbuf - * - ONLY for legacy code - * - mbuf to be released by the caller - */ -struct mbuf * -sockopt_getmbuf(const struct sockopt *sopt) -{ - struct mbuf *m; + case SO_OVERFLOWED: + *mtod(m, int *) = so->so_rcv.sb_overflowed; + break; - m = m_get(M_WAIT, MT_SOOPTS); - if (m == NULL) - return NULL; - - m->m_len = MLEN; - m_copyback(m, 0, sopt->sopt_size, sopt->sopt_data); - if (m_length(m) != max(sopt->sopt_size, MLEN)) { - m_freem(m); - return NULL; + default: + sounlock(so); + (void)m_free(m); + return (ENOPROTOOPT); + } + *mp = m; + error = 0; } - m->m_len = min(sopt->sopt_size, MLEN); - return m; + sounlock(so); + return (error); } void