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.132 retrieving revision 1.136.2.1 diff -u -p -r1.132 -r1.136.2.1 --- src/sys/kern/uipc_socket.c 2007/01/17 12:21:34 1.132 +++ src/sys/kern/uipc_socket.c 2007/03/18 00:06:45 1.136.2.1 @@ -1,7 +1,7 @@ -/* $NetBSD: uipc_socket.c,v 1.132 2007/01/17 12:21:34 elad Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.136.2.1 2007/03/18 00:06:45 reinoud Exp $ */ /*- - * Copyright (c) 2002 The NetBSD Foundation, Inc. + * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.132 2007/01/17 12:21:34 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.136.2.1 2007/03/18 00:06:45 reinoud Exp $"); #include "opt_sock_counters.h" #include "opt_sosend_loan.h" @@ -92,10 +92,13 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket. #include #include #include +#include +#include #include -POOL_INIT(socket_pool, sizeof(struct socket), 0, 0, 0, "sockpl", NULL); +POOL_INIT(socket_pool, sizeof(struct socket), 0, 0, 0, "sockpl", NULL, + IPL_SOFTNET); MALLOC_DEFINE(M_SOOPTS, "soopts", "socket options"); MALLOC_DEFINE(M_SONAME, "soname", "socket name"); @@ -135,7 +138,7 @@ int sock_loan_thresh = -1; int sock_loan_thresh = 4096; #endif -static struct simplelock so_pendfree_slock = SIMPLELOCK_INITIALIZER; +static kmutex_t so_pendfree_lock; static struct mbuf *so_pendfree; #ifndef SOMAXKVA @@ -143,7 +146,7 @@ static struct mbuf *so_pendfree; #endif int somaxkva = SOMAXKVA; static int socurkva; -static int sokvawaiters; +static kcondvar_t socurkva_cv; #define SOCK_LOAN_CHUNK 65536 @@ -153,11 +156,9 @@ static size_t sodopendfreel(void); static vsize_t sokvareserve(struct socket *so, vsize_t len) { - int s; int error; - s = splvm(); - simple_lock(&so_pendfree_slock); + mutex_enter(&so_pendfree_lock); while (socurkva + len > somaxkva) { size_t freed; @@ -175,33 +176,25 @@ sokvareserve(struct socket *so, vsize_t continue; SOSEND_COUNTER_INCR(&sosend_kvalimit); - sokvawaiters++; - error = ltsleep(&socurkva, PVM | PCATCH, "sokva", 0, - &so_pendfree_slock); - sokvawaiters--; + error = cv_wait_sig(&socurkva_cv, &so_pendfree_lock); if (error) { len = 0; break; } } socurkva += len; - simple_unlock(&so_pendfree_slock); - splx(s); + mutex_exit(&so_pendfree_lock); return len; } static void sokvaunreserve(vsize_t len) { - int s; - s = splvm(); - simple_lock(&so_pendfree_slock); + mutex_enter(&so_pendfree_lock); socurkva -= len; - if (sokvawaiters) - wakeup(&socurkva); - simple_unlock(&so_pendfree_slock); - splx(s); + cv_broadcast(&socurkva_cv); + mutex_exit(&so_pendfree_lock); } /* @@ -255,7 +248,7 @@ sokvafree(vaddr_t sva, vsize_t len) } static void -sodoloanfree(struct vm_page **pgs, caddr_t buf, size_t size) +sodoloanfree(struct vm_page **pgs, void *buf, size_t size) { vaddr_t va, sva, eva; vsize_t len; @@ -271,7 +264,7 @@ sodoloanfree(struct vm_page **pgs, caddr pgs = alloca(npgs * sizeof(*pgs)); for (i = 0, va = sva; va < eva; i++, va += PAGE_SIZE) { - if (pmap_extract(pmap_kernel(), va, &pa) == FALSE) + if (pmap_extract(pmap_kernel(), va, &pa) == false) panic("sodoloanfree: va 0x%lx not mapped", va); pgs[i] = PHYS_TO_VM_PAGE(pa); } @@ -286,43 +279,35 @@ sodoloanfree(struct vm_page **pgs, caddr static size_t sodopendfree() { - int s; size_t rv; - s = splvm(); - simple_lock(&so_pendfree_slock); + mutex_enter(&so_pendfree_lock); rv = sodopendfreel(); - simple_unlock(&so_pendfree_slock); - splx(s); + mutex_exit(&so_pendfree_lock); return rv; } /* * sodopendfreel: free mbufs on "pendfree" list. - * unlock and relock so_pendfree_slock when freeing mbufs. + * unlock and relock so_pendfree_lock when freeing mbufs. * - * => called with so_pendfree_slock held. - * => called at splvm. + * => called with so_pendfree_lock held. */ static size_t sodopendfreel() { + struct mbuf *m, *next; size_t rv = 0; + int s; - LOCK_ASSERT(simple_lock_held(&so_pendfree_slock)); - - for (;;) { - struct mbuf *m; - struct mbuf *next; + KASSERT(mutex_owned(&so_pendfree_lock)); + while (so_pendfree != NULL) { m = so_pendfree; - if (m == NULL) - break; so_pendfree = NULL; - simple_unlock(&so_pendfree_slock); - /* XXX splx */ + mutex_exit(&so_pendfree_lock); for (; m != NULL; m = next) { next = m->m_next; @@ -331,20 +316,20 @@ sodopendfreel() 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); } - /* XXX splvm */ - simple_lock(&so_pendfree_slock); + mutex_enter(&so_pendfree_lock); } return (rv); } void -soloanfree(struct mbuf *m, caddr_t buf, size_t size, void *arg) +soloanfree(struct mbuf *m, void *buf, size_t size, void *arg) { - int s; if (m == NULL) { @@ -363,14 +348,11 @@ soloanfree(struct mbuf *m, caddr_t buf, * because we need to put kva back to kernel_map. */ - s = splvm(); - simple_lock(&so_pendfree_slock); + mutex_enter(&so_pendfree_lock); m->m_next = so_pendfree; so_pendfree = m; - if (sokvawaiters) - wakeup(&socurkva); - simple_unlock(&so_pendfree_slock); - splx(s); + cv_broadcast(&socurkva_cv); + mutex_exit(&so_pendfree_lock); } static long @@ -416,12 +398,12 @@ sosend_loan(struct socket *so, struct ui lva += (vaddr_t) iov->iov_base & PAGE_MASK; - MEXTADD(m, (caddr_t) lva, space, M_MBUF, soloanfree, so); + MEXTADD(m, (void *) lva, space, M_MBUF, soloanfree, so); m->m_flags |= M_EXT_PAGES | M_EXT_ROMAP; 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; + uio->uio_iov->iov_base = (char *)uio->uio_iov->iov_base + space; uio->uio_iov->iov_len -= space; if (uio->uio_iov->iov_len == 0) { uio->uio_iov++; @@ -449,6 +431,9 @@ void soinit(void) { + mutex_init(&so_pendfree_lock, MUTEX_DRIVER, IPL_VM); + cv_init(&socurkva_cv, "sokva"); + /* Set the initial adjusted socket buffer size. */ if (sb_max_set(sb_max)) panic("bad initial sb_max value: %lu", sb_max); @@ -498,7 +483,7 @@ socreate(int dom, struct socket **aso, i return (EPROTOTYPE); s = splsoftnet(); so = pool_get(&socket_pool, PR_WAITOK); - memset((caddr_t)so, 0, sizeof(*so)); + memset((void *)so, 0, sizeof(*so)); TAILQ_INIT(&so->so_q0); TAILQ_INIT(&so->so_q); so->so_type = type; @@ -624,7 +609,7 @@ soclose(struct socket *so) (so->so_state & SS_NBIO)) goto drop; while (so->so_state & SS_ISCONNECTED) { - error = tsleep((caddr_t)&so->so_timeo, + error = tsleep((void *)&so->so_timeo, PSOCK | PCATCH, netcls, so->so_linger * hz); if (error) @@ -892,7 +877,7 @@ sosend(struct socket *so, struct mbuf *a if (atomic && top == 0 && len < mlen) MH_ALIGN(m, len); } - error = uiomove(mtod(m, caddr_t), (int)len, + error = uiomove(mtod(m, void *), (int)len, uio); have_data: resid = uio->uio_resid; @@ -998,7 +983,7 @@ soreceive(struct socket *so, struct mbuf if (error) goto bad; do { - error = uiomove(mtod(m, caddr_t), + error = uiomove(mtod(m, void *), (int) min(uio->uio_resid, m->m_len), uio); m = m_free(m); } while (uio->uio_resid && error == 0 && m); @@ -1212,7 +1197,7 @@ soreceive(struct socket *so, struct mbuf SBLASTRECORDCHK(&so->so_rcv, "soreceive uiomove"); SBLASTMBUFCHK(&so->so_rcv, "soreceive uiomove"); splx(s); - error = uiomove(mtod(m, caddr_t) + moff, (int)len, uio); + error = uiomove(mtod(m, char *) + moff, (int)len, uio); s = splsoftnet(); if (error) { /* @@ -1794,7 +1779,6 @@ sysctl_kern_somaxkva(SYSCTLFN_ARGS) { int error, new_somaxkva; struct sysctlnode node; - int s; new_somaxkva = somaxkva; node = *rnode; @@ -1806,12 +1790,10 @@ sysctl_kern_somaxkva(SYSCTLFN_ARGS) if (new_somaxkva < (16 * 1024 * 1024)) /* sanity */ return (EINVAL); - s = splvm(); - simple_lock(&so_pendfree_slock); + mutex_enter(&so_pendfree_lock); somaxkva = new_somaxkva; - wakeup(&socurkva); - simple_unlock(&so_pendfree_slock); - splx(s); + cv_broadcast(&socurkva_cv); + mutex_exit(&so_pendfree_lock); return (error); }