diff options
author | alc <alc@FreeBSD.org> | 2003-11-16 06:11:26 +0000 |
---|---|---|
committer | alc <alc@FreeBSD.org> | 2003-11-16 06:11:26 +0000 |
commit | 74614e7f63a3fda41bd634356405cc328a9e2284 (patch) | |
tree | b69ee615792b94ee1abcb1231c0534c04003fef9 /sys/alpha | |
parent | a26ad70ac9b89e66563dd0bcc539d7bf9a9c2757 (diff) | |
download | FreeBSD-src-74614e7f63a3fda41bd634356405cc328a9e2284.zip FreeBSD-src-74614e7f63a3fda41bd634356405cc328a9e2284.tar.gz |
- Modify alpha's sf_buf implementation to use the direct virtual-to-
physical mapping.
- Move the sf_buf API to its own header file; make struct sf_buf's
definition machine dependent. In this commit, we remove an
unnecessary field from struct sf_buf on the alpha, amd64, and ia64.
Ultimately, we may eliminate struct sf_buf on those architecures
except as an opaque pointer that references a vm page.
Diffstat (limited to 'sys/alpha')
-rw-r--r-- | sys/alpha/alpha/vm_machdep.c | 10 | ||||
-rw-r--r-- | sys/alpha/include/sf_buf.h | 57 |
2 files changed, 59 insertions, 8 deletions
diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c index 05b9728..3518880 100644 --- a/sys/alpha/alpha/vm_machdep.c +++ b/sys/alpha/alpha/vm_machdep.c @@ -83,7 +83,7 @@ __FBSDID("$FreeBSD$"); #include <sys/vmmeter.h> #include <sys/kernel.h> #include <sys/mbuf.h> -#include <sys/socketvar.h> +#include <sys/sf_buf.h> #include <sys/sysctl.h> #include <sys/unistd.h> @@ -392,19 +392,15 @@ static void sf_buf_init(void *arg) { struct sf_buf *sf_bufs; - vm_offset_t sf_base; int i; mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF); mtx_lock(&sf_freelist.sf_lock); SLIST_INIT(&sf_freelist.sf_head); - sf_base = kmem_alloc_nofault(kernel_map, nsfbufs * PAGE_SIZE); sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, M_NOWAIT | M_ZERO); - for (i = 0; i < nsfbufs; i++) { - sf_bufs[i].kva = sf_base + i * PAGE_SIZE; + for (i = 0; i < nsfbufs; i++) SLIST_INSERT_HEAD(&sf_freelist.sf_head, &sf_bufs[i], free_list); - } sf_buf_alloc_want = 0; mtx_unlock(&sf_freelist.sf_lock); } @@ -434,7 +430,6 @@ sf_buf_alloc(struct vm_page *m) if (sf != NULL) { SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); sf->m = m; - pmap_qenter(sf->kva, &sf->m, 1); } mtx_unlock(&sf_freelist.sf_lock); return (sf); @@ -450,7 +445,6 @@ sf_buf_free(void *addr, void *args) struct vm_page *m; sf = args; - pmap_qremove((vm_offset_t)addr, 1); m = sf->m; vm_page_lock_queues(); vm_page_unwire(m, 0); diff --git a/sys/alpha/include/sf_buf.h b/sys/alpha/include/sf_buf.h new file mode 100644 index 0000000..8c7d7a6 --- /dev/null +++ b/sys/alpha/include/sf_buf.h @@ -0,0 +1,57 @@ +/*- + * Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _MACHINE_SF_BUF_H_ +#define _MACHINE_SF_BUF_H_ + +#include <sys/queue.h> + +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/vm_page.h> + +struct sf_buf { + SLIST_ENTRY(sf_buf) free_list; /* list of free buffer slots */ + vm_page_t m; /* currently mapped page */ +}; + +static __inline vm_offset_t +sf_buf_kva(struct sf_buf *sf) +{ + + return (ALPHA_PHYS_TO_K0SEG(sf->m->phys_addr)); +} + +static __inline vm_page_t +sf_buf_page(struct sf_buf *sf) +{ + + return (sf->m); +} + +#endif /* !_MACHINE_SF_BUF_H_ */ |