diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c index a8c1548c23a8..13fafbc90fd5 100644 --- a/sys/amd64/amd64/mem.c +++ b/sys/amd64/amd64/mem.c @@ -1,282 +1,295 @@ /*- * Copyright (c) 1988 University of Utah. * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. * All rights reserved. * * This code is derived from software contributed to Berkeley by * the Systems Programming Group of the University of Utah Computer * Science Department, and code derived from software contributed to * Berkeley by William Jolitz. * * 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. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $Id: mem.c,v 1.11 1995/09/08 11:07:08 bde Exp $ + * $Id: mem.c,v 1.12 1995/09/09 18:09:46 davidg Exp $ */ /* * Memory special file */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #ifdef DEVFS #include #include "sys/kernel.h" int mmopen(); void memdev_init(void *data) /* data not used */ { void * x; /* path name devsw minor type uid gid perm*/ x=dev_add("/misc", "mem", mmopen, 0, DV_CHR, 0, 2, 0640); x=dev_add("/misc", "kmem", mmopen, 1, DV_CHR, 0, 2, 0640); x=dev_add("/misc", "null", mmopen, 2, DV_CHR, 0, 0, 0666); x=dev_add("/misc", "zero", mmopen, 12, DV_CHR, 0, 0, 0666); x=dev_add("/misc", "io", mmopen, 14, DV_CHR, 0, 2, 0640); } SYSINIT(memdev,SI_SUB_DEVFS, SI_ORDER_ANY, memdev_init, NULL) #endif /*DEVFS*/ extern char *ptvmmap; /* poor name! */ /*ARGSUSED*/ int mmclose(dev, flags, fmt, p) dev_t dev; int flags; int fmt; struct proc *p; { struct trapframe *fp; switch (minor(dev)) { case 14: fp = (struct trapframe *)curproc->p_md.md_regs; fp->tf_eflags &= ~PSL_IOPL; break; default: break; } return(0); } /*ARGSUSED*/ int mmopen(dev, flags, fmt, p) dev_t dev; int flags; int fmt; struct proc *p; { struct trapframe *fp; switch (minor(dev)) { case 14: fp = (struct trapframe *)curproc->p_md.md_regs; fp->tf_eflags |= PSL_IOPL; break; default: break; } return(0); } /*ARGSUSED*/ int mmrw(dev, uio, flags) dev_t dev; struct uio *uio; int flags; { register int o; register u_int c, v; register struct iovec *iov; int error = 0; caddr_t zbuf = NULL; while (uio->uio_resid > 0 && error == 0) { iov = uio->uio_iov; if (iov->iov_len == 0) { uio->uio_iov++; uio->uio_iovcnt--; if (uio->uio_iovcnt < 0) panic("mmrw"); continue; } switch (minor(dev)) { /* minor device 0 is physical memory */ case 0: v = uio->uio_offset; pmap_enter(kernel_pmap, (vm_offset_t)ptvmmap, v, uio->uio_rw == UIO_READ ? VM_PROT_READ : VM_PROT_WRITE, TRUE); o = (int)uio->uio_offset & PGOFSET; c = (u_int)(NBPG - ((int)iov->iov_base & PGOFSET)); c = min(c, (u_int)(NBPG - o)); c = min(c, (u_int)iov->iov_len); error = uiomove((caddr_t)&ptvmmap[o], (int)c, uio); pmap_remove(kernel_pmap, (vm_offset_t)ptvmmap, (vm_offset_t)&ptvmmap[NBPG]); continue; /* minor device 1 is kernel memory */ - case 1: + case 1: { + vm_offset_t addr, eaddr; c = iov->iov_len; + + /* + * Make sure that all of the pages are currently resident so + * that we don't create any zero-fill pages. + */ + addr = trunc_page(uio->uio_offset); + eaddr = round_page(addr + c); + for (; addr < eaddr; addr += PAGE_SIZE) + if (pmap_extract(kernel_pmap, addr) == 0) + return EFAULT; + if (!kernacc((caddr_t)(int)uio->uio_offset, c, uio->uio_rw == UIO_READ ? B_READ : B_WRITE)) return(EFAULT); error = uiomove((caddr_t)(int)uio->uio_offset, (int)c, uio); continue; + } /* minor device 2 is EOF/RATHOLE */ case 2: if (uio->uio_rw == UIO_READ) return (0); c = iov->iov_len; break; /* minor device 12 (/dev/zero) is source of nulls on read, rathole on write */ case 12: if (uio->uio_rw == UIO_WRITE) { c = iov->iov_len; break; } if (zbuf == NULL) { zbuf = (caddr_t) malloc(CLBYTES, M_TEMP, M_WAITOK); bzero(zbuf, CLBYTES); } c = min(iov->iov_len, CLBYTES); error = uiomove(zbuf, (int)c, uio); continue; #ifdef notyet /* 386 I/O address space (/dev/ioport[bwl]) is a read/write access to seperate i/o device address bus, different than memory bus. Semantics here are very different than ordinary read/write, as if iov_len is a multiple an implied string move from a single port will be done. Note that lseek must be used to set the port number reliably. */ case 14: if (iov->iov_len == 1) { u_char tmp; tmp = inb(uio->uio_offset); error = uiomove (&tmp, iov->iov_len, uio); } else { if (!useracc((caddr_t)iov->iov_base, iov->iov_len, uio->uio_rw)) return (EFAULT); insb(uio->uio_offset, iov->iov_base, iov->iov_len); } break; case 15: if (iov->iov_len == sizeof (short)) { u_short tmp; tmp = inw(uio->uio_offset); error = uiomove (&tmp, iov->iov_len, uio); } else { if (!useracc((caddr_t)iov->iov_base, iov->iov_len, uio->uio_rw)) return (EFAULT); insw(uio->uio_offset, iov->iov_base, iov->iov_len/ sizeof (short)); } break; case 16: if (iov->iov_len == sizeof (long)) { u_long tmp; tmp = inl(uio->uio_offset); error = uiomove (&tmp, iov->iov_len, uio); } else { if (!useracc((caddr_t)iov->iov_base, iov->iov_len, uio->uio_rw)) return (EFAULT); insl(uio->uio_offset, iov->iov_base, iov->iov_len/ sizeof (long)); } break; #endif default: return (ENXIO); } if (error) break; iov->iov_base += c; iov->iov_len -= c; uio->uio_offset += c; uio->uio_resid -= c; } if (zbuf) free(zbuf, M_TEMP); return (error); } /*******************************************************\ * allow user processes to MMAP some memory sections * * instead of going through read/write * \*******************************************************/ int memmmap(dev_t dev, int offset, int nprot) { switch (minor(dev)) { /* minor device 0 is physical memory */ case 0: return i386_btop(offset); /* minor device 1 is kernel memory */ case 1: return i386_btop(vtophys(offset)); default: return -1; } } diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index a8c1548c23a8..13fafbc90fd5 100644 --- a/sys/i386/i386/mem.c +++ b/sys/i386/i386/mem.c @@ -1,282 +1,295 @@ /*- * Copyright (c) 1988 University of Utah. * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. * All rights reserved. * * This code is derived from software contributed to Berkeley by * the Systems Programming Group of the University of Utah Computer * Science Department, and code derived from software contributed to * Berkeley by William Jolitz. * * 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. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $Id: mem.c,v 1.11 1995/09/08 11:07:08 bde Exp $ + * $Id: mem.c,v 1.12 1995/09/09 18:09:46 davidg Exp $ */ /* * Memory special file */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #ifdef DEVFS #include #include "sys/kernel.h" int mmopen(); void memdev_init(void *data) /* data not used */ { void * x; /* path name devsw minor type uid gid perm*/ x=dev_add("/misc", "mem", mmopen, 0, DV_CHR, 0, 2, 0640); x=dev_add("/misc", "kmem", mmopen, 1, DV_CHR, 0, 2, 0640); x=dev_add("/misc", "null", mmopen, 2, DV_CHR, 0, 0, 0666); x=dev_add("/misc", "zero", mmopen, 12, DV_CHR, 0, 0, 0666); x=dev_add("/misc", "io", mmopen, 14, DV_CHR, 0, 2, 0640); } SYSINIT(memdev,SI_SUB_DEVFS, SI_ORDER_ANY, memdev_init, NULL) #endif /*DEVFS*/ extern char *ptvmmap; /* poor name! */ /*ARGSUSED*/ int mmclose(dev, flags, fmt, p) dev_t dev; int flags; int fmt; struct proc *p; { struct trapframe *fp; switch (minor(dev)) { case 14: fp = (struct trapframe *)curproc->p_md.md_regs; fp->tf_eflags &= ~PSL_IOPL; break; default: break; } return(0); } /*ARGSUSED*/ int mmopen(dev, flags, fmt, p) dev_t dev; int flags; int fmt; struct proc *p; { struct trapframe *fp; switch (minor(dev)) { case 14: fp = (struct trapframe *)curproc->p_md.md_regs; fp->tf_eflags |= PSL_IOPL; break; default: break; } return(0); } /*ARGSUSED*/ int mmrw(dev, uio, flags) dev_t dev; struct uio *uio; int flags; { register int o; register u_int c, v; register struct iovec *iov; int error = 0; caddr_t zbuf = NULL; while (uio->uio_resid > 0 && error == 0) { iov = uio->uio_iov; if (iov->iov_len == 0) { uio->uio_iov++; uio->uio_iovcnt--; if (uio->uio_iovcnt < 0) panic("mmrw"); continue; } switch (minor(dev)) { /* minor device 0 is physical memory */ case 0: v = uio->uio_offset; pmap_enter(kernel_pmap, (vm_offset_t)ptvmmap, v, uio->uio_rw == UIO_READ ? VM_PROT_READ : VM_PROT_WRITE, TRUE); o = (int)uio->uio_offset & PGOFSET; c = (u_int)(NBPG - ((int)iov->iov_base & PGOFSET)); c = min(c, (u_int)(NBPG - o)); c = min(c, (u_int)iov->iov_len); error = uiomove((caddr_t)&ptvmmap[o], (int)c, uio); pmap_remove(kernel_pmap, (vm_offset_t)ptvmmap, (vm_offset_t)&ptvmmap[NBPG]); continue; /* minor device 1 is kernel memory */ - case 1: + case 1: { + vm_offset_t addr, eaddr; c = iov->iov_len; + + /* + * Make sure that all of the pages are currently resident so + * that we don't create any zero-fill pages. + */ + addr = trunc_page(uio->uio_offset); + eaddr = round_page(addr + c); + for (; addr < eaddr; addr += PAGE_SIZE) + if (pmap_extract(kernel_pmap, addr) == 0) + return EFAULT; + if (!kernacc((caddr_t)(int)uio->uio_offset, c, uio->uio_rw == UIO_READ ? B_READ : B_WRITE)) return(EFAULT); error = uiomove((caddr_t)(int)uio->uio_offset, (int)c, uio); continue; + } /* minor device 2 is EOF/RATHOLE */ case 2: if (uio->uio_rw == UIO_READ) return (0); c = iov->iov_len; break; /* minor device 12 (/dev/zero) is source of nulls on read, rathole on write */ case 12: if (uio->uio_rw == UIO_WRITE) { c = iov->iov_len; break; } if (zbuf == NULL) { zbuf = (caddr_t) malloc(CLBYTES, M_TEMP, M_WAITOK); bzero(zbuf, CLBYTES); } c = min(iov->iov_len, CLBYTES); error = uiomove(zbuf, (int)c, uio); continue; #ifdef notyet /* 386 I/O address space (/dev/ioport[bwl]) is a read/write access to seperate i/o device address bus, different than memory bus. Semantics here are very different than ordinary read/write, as if iov_len is a multiple an implied string move from a single port will be done. Note that lseek must be used to set the port number reliably. */ case 14: if (iov->iov_len == 1) { u_char tmp; tmp = inb(uio->uio_offset); error = uiomove (&tmp, iov->iov_len, uio); } else { if (!useracc((caddr_t)iov->iov_base, iov->iov_len, uio->uio_rw)) return (EFAULT); insb(uio->uio_offset, iov->iov_base, iov->iov_len); } break; case 15: if (iov->iov_len == sizeof (short)) { u_short tmp; tmp = inw(uio->uio_offset); error = uiomove (&tmp, iov->iov_len, uio); } else { if (!useracc((caddr_t)iov->iov_base, iov->iov_len, uio->uio_rw)) return (EFAULT); insw(uio->uio_offset, iov->iov_base, iov->iov_len/ sizeof (short)); } break; case 16: if (iov->iov_len == sizeof (long)) { u_long tmp; tmp = inl(uio->uio_offset); error = uiomove (&tmp, iov->iov_len, uio); } else { if (!useracc((caddr_t)iov->iov_base, iov->iov_len, uio->uio_rw)) return (EFAULT); insl(uio->uio_offset, iov->iov_base, iov->iov_len/ sizeof (long)); } break; #endif default: return (ENXIO); } if (error) break; iov->iov_base += c; iov->iov_len -= c; uio->uio_offset += c; uio->uio_resid -= c; } if (zbuf) free(zbuf, M_TEMP); return (error); } /*******************************************************\ * allow user processes to MMAP some memory sections * * instead of going through read/write * \*******************************************************/ int memmmap(dev_t dev, int offset, int nprot) { switch (minor(dev)) { /* minor device 0 is physical memory */ case 0: return i386_btop(offset); /* minor device 1 is kernel memory */ case 1: return i386_btop(vtophys(offset)); default: return -1; } }