Date: Sun, 21 Feb 2010 19:53:33 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r204176 - in head/sys: conf kern Message-ID: <201002211953.o1LJrXBA022479@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed Date: Sun Feb 21 19:53:33 2010 New Revision: 204176 URL: http://svn.freebsd.org/changeset/base/204176 Log: Decompose the most lousy named file in sys/kern; kern_subr.c. Although this file has historically been used as a dumping ground for random functions, nowadays it only contains functions related to copying bits {from,to} userspace and hash table utility functions. Behold, subr_uio.c and subr_hash.c. Added: head/sys/kern/subr_hash.c - copied, changed from r204168, head/sys/kern/kern_subr.c head/sys/kern/subr_uio.c - copied, changed from r204168, head/sys/kern/kern_subr.c Deleted: head/sys/kern/kern_subr.c Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sun Feb 21 17:27:20 2010 (r204175) +++ head/sys/conf/files Sun Feb 21 19:53:33 2010 (r204176) @@ -2084,7 +2084,6 @@ kern/kern_sdt.c optional kdtrace_hooks kern/kern_sema.c standard kern/kern_shutdown.c standard kern/kern_sig.c standard -kern/kern_subr.c standard kern/kern_switch.c standard kern/kern_sx.c standard kern/kern_synch.c standard @@ -2121,6 +2120,7 @@ kern/subr_disk.c standard kern/subr_eventhandler.c standard kern/subr_fattime.c standard kern/subr_firmware.c optional firmware +kern/subr_hash.c standard kern/subr_hints.c standard kern/subr_kdb.c standard kern/subr_kobj.c standard @@ -2146,6 +2146,7 @@ kern/subr_stack.c optional ddb | stack kern/subr_taskqueue.c standard kern/subr_trap.c standard kern/subr_turnstile.c standard +kern/subr_uio.c standard kern/subr_unit.c standard kern/subr_witness.c optional witness kern/sys_generic.c standard Copied and modified: head/sys/kern/subr_hash.c (from r204168, head/sys/kern/kern_subr.c) ============================================================================== --- head/sys/kern/kern_subr.c Sun Feb 21 11:22:01 2010 (r204168, copy source) +++ head/sys/kern/subr_hash.c Sun Feb 21 19:53:33 2010 (r204176) @@ -37,328 +37,9 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_zero.h" - #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/ktr.h> -#include <sys/limits.h> -#include <sys/lock.h> -#include <sys/mutex.h> -#include <sys/proc.h> #include <sys/malloc.h> -#include <sys/resourcevar.h> -#include <sys/sched.h> -#include <sys/sysctl.h> -#include <sys/vnode.h> - -#include <vm/vm.h> -#include <vm/vm_page.h> -#include <vm/vm_map.h> -#ifdef ZERO_COPY_SOCKETS -#include <vm/vm_param.h> -#include <vm/vm_object.h> -#endif - -SYSCTL_INT(_kern, KERN_IOV_MAX, iov_max, CTLFLAG_RD, NULL, UIO_MAXIOV, - "Maximum number of elements in an I/O vector; sysconf(_SC_IOV_MAX)"); - -#ifdef ZERO_COPY_SOCKETS -/* Declared in uipc_socket.c */ -extern int so_zero_copy_receive; - -/* - * Identify the physical page mapped at the given kernel virtual - * address. Insert this physical page into the given address space at - * the given virtual address, replacing the physical page, if any, - * that already exists there. - */ -static int -vm_pgmoveco(vm_map_t mapa, vm_offset_t kaddr, vm_offset_t uaddr) -{ - vm_map_t map = mapa; - vm_page_t kern_pg, user_pg; - vm_object_t uobject; - vm_map_entry_t entry; - vm_pindex_t upindex; - vm_prot_t prot; - boolean_t wired; - - KASSERT((uaddr & PAGE_MASK) == 0, - ("vm_pgmoveco: uaddr is not page aligned")); - - /* - * Herein the physical page is validated and dirtied. It is - * unwired in sf_buf_mext(). - */ - kern_pg = PHYS_TO_VM_PAGE(vtophys(kaddr)); - kern_pg->valid = VM_PAGE_BITS_ALL; - KASSERT(kern_pg->queue == PQ_NONE && kern_pg->wire_count == 1, - ("vm_pgmoveco: kern_pg is not correctly wired")); - - if ((vm_map_lookup(&map, uaddr, - VM_PROT_WRITE, &entry, &uobject, - &upindex, &prot, &wired)) != KERN_SUCCESS) { - return(EFAULT); - } - VM_OBJECT_LOCK(uobject); -retry: - if ((user_pg = vm_page_lookup(uobject, upindex)) != NULL) { - if (vm_page_sleep_if_busy(user_pg, TRUE, "vm_pgmoveco")) - goto retry; - vm_page_lock_queues(); - pmap_remove_all(user_pg); - vm_page_free(user_pg); - } else { - /* - * Even if a physical page does not exist in the - * object chain's first object, a physical page from a - * backing object may be mapped read only. - */ - if (uobject->backing_object != NULL) - pmap_remove(map->pmap, uaddr, uaddr + PAGE_SIZE); - vm_page_lock_queues(); - } - vm_page_insert(kern_pg, uobject, upindex); - vm_page_dirty(kern_pg); - vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(uobject); - vm_map_lookup_done(map, entry); - return(KERN_SUCCESS); -} -#endif /* ZERO_COPY_SOCKETS */ - -int -uiomove(void *cp, int n, struct uio *uio) -{ - struct thread *td = curthread; - struct iovec *iov; - u_int cnt; - int error = 0; - int save = 0; - - KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE, - ("uiomove: mode")); - KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, - ("uiomove proc")); - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, - "Calling uiomove()"); - - save = td->td_pflags & TDP_DEADLKTREAT; - td->td_pflags |= TDP_DEADLKTREAT; - - while (n > 0 && uio->uio_resid) { - iov = uio->uio_iov; - cnt = iov->iov_len; - if (cnt == 0) { - uio->uio_iov++; - uio->uio_iovcnt--; - continue; - } - if (cnt > n) - cnt = n; - - switch (uio->uio_segflg) { - - case UIO_USERSPACE: - if (ticks - PCPU_GET(switchticks) >= hogticks) - uio_yield(); - if (uio->uio_rw == UIO_READ) - error = copyout(cp, iov->iov_base, cnt); - else - error = copyin(iov->iov_base, cp, cnt); - if (error) - goto out; - break; - - case UIO_SYSSPACE: - if (uio->uio_rw == UIO_READ) - bcopy(cp, iov->iov_base, cnt); - else - bcopy(iov->iov_base, cp, cnt); - break; - case UIO_NOCOPY: - break; - } - iov->iov_base = (char *)iov->iov_base + cnt; - iov->iov_len -= cnt; - uio->uio_resid -= cnt; - uio->uio_offset += cnt; - cp = (char *)cp + cnt; - n -= cnt; - } -out: - if (save == 0) - td->td_pflags &= ~TDP_DEADLKTREAT; - return (error); -} - -/* - * Wrapper for uiomove() that validates the arguments against a known-good - * kernel buffer. Currently, uiomove accepts a signed (n) argument, which - * is almost definitely a bad thing, so we catch that here as well. We - * return a runtime failure, but it might be desirable to generate a runtime - * assertion failure instead. - */ -int -uiomove_frombuf(void *buf, int buflen, struct uio *uio) -{ - unsigned int offset, n; - - if (uio->uio_offset < 0 || uio->uio_resid < 0 || - (offset = uio->uio_offset) != uio->uio_offset) - return (EINVAL); - if (buflen <= 0 || offset >= buflen) - return (0); - if ((n = buflen - offset) > INT_MAX) - return (EINVAL); - return (uiomove((char *)buf + offset, n, uio)); -} - -#ifdef ZERO_COPY_SOCKETS -/* - * Experimental support for zero-copy I/O - */ -static int -userspaceco(void *cp, u_int cnt, struct uio *uio, int disposable) -{ - struct iovec *iov; - int error; - - iov = uio->uio_iov; - if (uio->uio_rw == UIO_READ) { - if ((so_zero_copy_receive != 0) - && ((cnt & PAGE_MASK) == 0) - && ((((intptr_t) iov->iov_base) & PAGE_MASK) == 0) - && ((uio->uio_offset & PAGE_MASK) == 0) - && ((((intptr_t) cp) & PAGE_MASK) == 0) - && (disposable != 0)) { - /* SOCKET: use page-trading */ - /* - * We only want to call vm_pgmoveco() on - * disposeable pages, since it gives the - * kernel page to the userland process. - */ - error = vm_pgmoveco(&curproc->p_vmspace->vm_map, - (vm_offset_t)cp, (vm_offset_t)iov->iov_base); - - /* - * If we get an error back, attempt - * to use copyout() instead. The - * disposable page should be freed - * automatically if we weren't able to move - * it into userland. - */ - if (error != 0) - error = copyout(cp, iov->iov_base, cnt); - } else { - error = copyout(cp, iov->iov_base, cnt); - } - } else { - error = copyin(iov->iov_base, cp, cnt); - } - return (error); -} - -int -uiomoveco(void *cp, int n, struct uio *uio, int disposable) -{ - struct iovec *iov; - u_int cnt; - int error; - - KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE, - ("uiomoveco: mode")); - KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, - ("uiomoveco proc")); - - while (n > 0 && uio->uio_resid) { - iov = uio->uio_iov; - cnt = iov->iov_len; - if (cnt == 0) { - uio->uio_iov++; - uio->uio_iovcnt--; - continue; - } - if (cnt > n) - cnt = n; - - switch (uio->uio_segflg) { - - case UIO_USERSPACE: - if (ticks - PCPU_GET(switchticks) >= hogticks) - uio_yield(); - - error = userspaceco(cp, cnt, uio, disposable); - - if (error) - return (error); - break; - - case UIO_SYSSPACE: - if (uio->uio_rw == UIO_READ) - bcopy(cp, iov->iov_base, cnt); - else - bcopy(iov->iov_base, cp, cnt); - break; - case UIO_NOCOPY: - break; - } - iov->iov_base = (char *)iov->iov_base + cnt; - iov->iov_len -= cnt; - uio->uio_resid -= cnt; - uio->uio_offset += cnt; - cp = (char *)cp + cnt; - n -= cnt; - } - return (0); -} -#endif /* ZERO_COPY_SOCKETS */ - -/* - * Give next character to user as result of read. - */ -int -ureadc(int c, struct uio *uio) -{ - struct iovec *iov; - char *iov_base; - - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, - "Calling ureadc()"); - -again: - if (uio->uio_iovcnt == 0 || uio->uio_resid == 0) - panic("ureadc"); - iov = uio->uio_iov; - if (iov->iov_len == 0) { - uio->uio_iovcnt--; - uio->uio_iov++; - goto again; - } - switch (uio->uio_segflg) { - - case UIO_USERSPACE: - if (subyte(iov->iov_base, c) < 0) - return (EFAULT); - break; - - case UIO_SYSSPACE: - iov_base = iov->iov_base; - *iov_base = c; - iov->iov_base = iov_base; - break; - - case UIO_NOCOPY: - break; - } - iov->iov_base = (char *)iov->iov_base + 1; - iov->iov_len--; - uio->uio_resid--; - uio->uio_offset++; - return (0); -} /* * General routine to allocate a hash table with control of memory flags. @@ -449,123 +130,3 @@ phashinit(int elements, struct malloc_ty *nentries = hashsize; return (hashtbl); } - -void -uio_yield(void) -{ - struct thread *td; - - td = curthread; - DROP_GIANT(); - thread_lock(td); - sched_prio(td, td->td_user_pri); - mi_switch(SW_INVOL | SWT_RELINQUISH, NULL); - thread_unlock(td); - PICKUP_GIANT(); -} - -int -copyinfrom(const void * __restrict src, void * __restrict dst, size_t len, - int seg) -{ - int error = 0; - - switch (seg) { - case UIO_USERSPACE: - error = copyin(src, dst, len); - break; - case UIO_SYSSPACE: - bcopy(src, dst, len); - break; - default: - panic("copyinfrom: bad seg %d\n", seg); - } - return (error); -} - -int -copyinstrfrom(const void * __restrict src, void * __restrict dst, size_t len, - size_t * __restrict copied, int seg) -{ - int error = 0; - - switch (seg) { - case UIO_USERSPACE: - error = copyinstr(src, dst, len, copied); - break; - case UIO_SYSSPACE: - error = copystr(src, dst, len, copied); - break; - default: - panic("copyinstrfrom: bad seg %d\n", seg); - } - return (error); -} - -int -copyiniov(struct iovec *iovp, u_int iovcnt, struct iovec **iov, int error) -{ - u_int iovlen; - - *iov = NULL; - if (iovcnt > UIO_MAXIOV) - return (error); - iovlen = iovcnt * sizeof (struct iovec); - *iov = malloc(iovlen, M_IOV, M_WAITOK); - error = copyin(iovp, *iov, iovlen); - if (error) { - free(*iov, M_IOV); - *iov = NULL; - } - return (error); -} - -int -copyinuio(struct iovec *iovp, u_int iovcnt, struct uio **uiop) -{ - struct iovec *iov; - struct uio *uio; - u_int iovlen; - int error, i; - - *uiop = NULL; - if (iovcnt > UIO_MAXIOV) - return (EINVAL); - iovlen = iovcnt * sizeof (struct iovec); - uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK); - iov = (struct iovec *)(uio + 1); - error = copyin(iovp, iov, iovlen); - if (error) { - free(uio, M_IOV); - return (error); - } - uio->uio_iov = iov; - uio->uio_iovcnt = iovcnt; - uio->uio_segflg = UIO_USERSPACE; - uio->uio_offset = -1; - uio->uio_resid = 0; - for (i = 0; i < iovcnt; i++) { - if (iov->iov_len > INT_MAX - uio->uio_resid) { - free(uio, M_IOV); - return (EINVAL); - } - uio->uio_resid += iov->iov_len; - iov++; - } - *uiop = uio; - return (0); -} - -struct uio * -cloneuio(struct uio *uiop) -{ - struct uio *uio; - int iovlen; - - iovlen = uiop->uio_iovcnt * sizeof (struct iovec); - uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK); - *uio = *uiop; - uio->uio_iov = (struct iovec *)(uio + 1); - bcopy(uiop->uio_iov, uio->uio_iov, iovlen); - return (uio); -} Copied and modified: head/sys/kern/subr_uio.c (from r204168, head/sys/kern/kern_subr.c) ============================================================================== --- head/sys/kern/kern_subr.c Sun Feb 21 11:22:01 2010 (r204168, copy source) +++ head/sys/kern/subr_uio.c Sun Feb 21 19:53:33 2010 (r204176) @@ -42,13 +42,10 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/ktr.h> #include <sys/limits.h> #include <sys/lock.h> #include <sys/mutex.h> #include <sys/proc.h> -#include <sys/malloc.h> -#include <sys/resourcevar.h> #include <sys/sched.h> #include <sys/sysctl.h> #include <sys/vnode.h> @@ -360,96 +357,6 @@ again: return (0); } -/* - * General routine to allocate a hash table with control of memory flags. - */ -void * -hashinit_flags(int elements, struct malloc_type *type, u_long *hashmask, - int flags) -{ - long hashsize; - LIST_HEAD(generic, generic) *hashtbl; - int i; - - if (elements <= 0) - panic("hashinit: bad elements"); - - /* Exactly one of HASH_WAITOK and HASH_NOWAIT must be set. */ - KASSERT((flags & HASH_WAITOK) ^ (flags & HASH_NOWAIT), - ("Bad flags (0x%x) passed to hashinit_flags", flags)); - - for (hashsize = 1; hashsize <= elements; hashsize <<= 1) - continue; - hashsize >>= 1; - - if (flags & HASH_NOWAIT) - hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), - type, M_NOWAIT); - else - hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), - type, M_WAITOK); - - if (hashtbl != NULL) { - for (i = 0; i < hashsize; i++) - LIST_INIT(&hashtbl[i]); - *hashmask = hashsize - 1; - } - return (hashtbl); -} - -/* - * Allocate and initialize a hash table with default flag: may sleep. - */ -void * -hashinit(int elements, struct malloc_type *type, u_long *hashmask) -{ - - return (hashinit_flags(elements, type, hashmask, HASH_WAITOK)); -} - -void -hashdestroy(void *vhashtbl, struct malloc_type *type, u_long hashmask) -{ - LIST_HEAD(generic, generic) *hashtbl, *hp; - - hashtbl = vhashtbl; - for (hp = hashtbl; hp <= &hashtbl[hashmask]; hp++) - if (!LIST_EMPTY(hp)) - panic("hashdestroy: hash not empty"); - free(hashtbl, type); -} - -static const int primes[] = { 1, 13, 31, 61, 127, 251, 509, 761, 1021, 1531, - 2039, 2557, 3067, 3583, 4093, 4603, 5119, 5623, 6143, - 6653, 7159, 7673, 8191, 12281, 16381, 24571, 32749 }; -#define NPRIMES (sizeof(primes) / sizeof(primes[0])) - -/* - * General routine to allocate a prime number sized hash table. - */ -void * -phashinit(int elements, struct malloc_type *type, u_long *nentries) -{ - long hashsize; - LIST_HEAD(generic, generic) *hashtbl; - int i; - - if (elements <= 0) - panic("phashinit: bad elements"); - for (i = 1, hashsize = primes[1]; hashsize <= elements;) { - i++; - if (i == NPRIMES) - break; - hashsize = primes[i]; - } - hashsize = primes[i - 1]; - hashtbl = malloc((u_long)hashsize * sizeof(*hashtbl), type, M_WAITOK); - for (i = 0; i < hashsize; i++) - LIST_INIT(&hashtbl[i]); - *nentries = hashsize; - return (hashtbl); -} - void uio_yield(void) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002211953.o1LJrXBA022479>