[src/trunk]: src/sys/arch/usermode Implement physio() for NetBSD/usermode the...

[reinoud <reinoud%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a6ade5ffe11b
branches:  trunk
changeset: 772275:a6ade5ffe11b
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Tue Dec 27 14:55:31 2011 +0000

description:
Implement physio() for NetBSD/usermode the right way!

diffstat:

 sys/arch/usermode/dev/cpu.c             |  13 ++++++-
 sys/arch/usermode/usermode/machdep.c    |   6 ++-
 sys/arch/usermode/usermode/pmap.c       |   7 +--
 sys/arch/usermode/usermode/vm_machdep.c |  60 ++++++++++++++++++++++++++++++--
 4 files changed, 73 insertions(+), 13 deletions(-)

diffs (185 lines):

diff -r dce6445ce573 -r a6ade5ffe11b sys/arch/usermode/dev/cpu.c
--- a/sys/arch/usermode/dev/cpu.c       Tue Dec 27 14:51:15 2011 +0000
+++ b/sys/arch/usermode/dev/cpu.c       Tue Dec 27 14:55:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.56 2011/12/24 12:23:24 reinoud Exp $ */
+/* $NetBSD: cpu.c,v 1.57 2011/12/27 14:55:31 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -30,7 +30,7 @@
 #include "opt_hz.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.56 2011/12/24 12:23:24 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.57 2011/12/27 14:55:31 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -379,16 +379,25 @@
 void
 cpu_startup(void)
 {
+       vaddr_t minaddr, maxaddr;
        size_t stacksize, msgbufsize = 32 * 1024;
        void *stack_pagefault_ucp;
 
+       /* get ourself a message buffer */
        um_msgbuf = kmem_zalloc(msgbufsize, KM_SLEEP);
        if (um_msgbuf == NULL)
                panic("couldn't allocate msgbuf");
        initmsgbuf(um_msgbuf, msgbufsize);
 
+       /* allocate a submap for physio, 1Mb enough? */
+       minaddr = 0;
+       phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
+                                  1024 * 1024, 0, false, NULL);
+
+       /* say hi! */
        banner();
 
+       /* init lwp0 */
        memset(&lwp0pcb, 0, sizeof(lwp0pcb));
        if (thunk_getcontext(&lwp0pcb.pcb_ucp))
                panic("getcontext failed");
diff -r dce6445ce573 -r a6ade5ffe11b sys/arch/usermode/usermode/machdep.c
--- a/sys/arch/usermode/usermode/machdep.c      Tue Dec 27 14:51:15 2011 +0000
+++ b/sys/arch/usermode/usermode/machdep.c      Tue Dec 27 14:55:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.45 2011/12/26 21:22:23 jmcneill Exp $ */
+/* $NetBSD: machdep.c,v 1.46 2011/12/27 14:55:31 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <reinoud%netbsd.org@localhost>
@@ -38,7 +38,7 @@
 #include "opt_sdl.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.45 2011/12/26 21:22:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.46 2011/12/27 14:55:31 reinoud Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -62,6 +62,8 @@
 char machine_arch[_SYS_NMLN] = "";
 char module_machine_usermode[_SYS_NMLN] = "";
 
+struct vm_map *phys_map = NULL;
+
 static char **saved_argv;
 char *usermode_root_image_path = NULL;
 static char usermode_tap_devicebuf[PATH_MAX] = "";
diff -r dce6445ce573 -r a6ade5ffe11b sys/arch/usermode/usermode/pmap.c
--- a/sys/arch/usermode/usermode/pmap.c Tue Dec 27 14:51:15 2011 +0000
+++ b/sys/arch/usermode/usermode/pmap.c Tue Dec 27 14:55:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.82 2011/12/25 21:10:00 reinoud Exp $ */
+/* $NetBSD: pmap.c,v 1.83 2011/12/27 14:55:31 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <reinoud%NetBSD.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.82 2011/12/25 21:10:00 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.83 2011/12/27 14:55:31 reinoud Exp $");
 
 #include "opt_memsize.h"
 #include "opt_kmempages.h"
@@ -648,9 +648,6 @@
        uint32_t map_flags;
        void *addr;
 
-       if (pv->pv_vflags & PV_WIRED)
-               return;
-
        map_flags = THUNK_MAP_FILE | THUNK_MAP_FIXED | THUNK_MAP_SHARED;
        addr = thunk_mmap((void *) va, PAGE_SIZE, THUNK_PROT_NONE,
                map_flags, mem_fh, pa);
diff -r dce6445ce573 -r a6ade5ffe11b sys/arch/usermode/usermode/vm_machdep.c
--- a/sys/arch/usermode/usermode/vm_machdep.c   Tue Dec 27 14:51:15 2011 +0000
+++ b/sys/arch/usermode/usermode/vm_machdep.c   Tue Dec 27 14:55:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.3 2011/08/10 01:32:44 jmcneill Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.4 2011/12/27 14:55:31 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,21 +27,73 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.3 2011/08/10 01:32:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.4 2011/12/27 14:55:31 reinoud Exp $");
 
-#include <sys/types.h>
 #include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
 
 #include <uvm/uvm_extern.h>
 
+
+/*
+ * Map a user I/O request into kernel virtual address space.
+ * Note: the pages are already locked by uvm_vslock(), so we
+ * do not need to pass an access_type to pmap_enter().
+ */
+/* This code was originally stolen from the alpha/acorn26 port. */
+
 int
 vmapbuf(struct buf *bp, vsize_t len)
 {
+       vaddr_t faddr, taddr, off;
+       paddr_t pa;
+       struct proc *p;
+       vm_prot_t prot;
+
+       if ((bp->b_flags & B_PHYS) == 0)
+               panic("vmapbuf");
+       p = bp->b_proc;
+       bp->b_saveaddr = bp->b_data;
+       faddr = trunc_page((vaddr_t)bp->b_data);
+       off = (vaddr_t)bp->b_data - faddr;
+       len = round_page(off + len);
+       taddr = uvm_km_alloc(phys_map, len, 0, UVM_KMF_VAONLY | UVM_KMF_WAITVA);
+       bp->b_data = (void *)(taddr + off);
+       len = atop(len);
+       prot = bp->b_flags & B_READ ? VM_PROT_READ | VM_PROT_WRITE :
+                                     VM_PROT_READ;
+       while (len--) {
+               if (pmap_extract(vm_map_pmap(&p->p_vmspace->vm_map), faddr,
+                   &pa) == false)
+                       panic("vmapbuf: null page frame");
+               pmap_enter(vm_map_pmap(phys_map), taddr, trunc_page(pa),
+                   prot, prot | PMAP_WIRED);
+               faddr += PAGE_SIZE;
+               taddr += PAGE_SIZE;
+       }
+       pmap_update(vm_map_pmap(phys_map));
+
        return 0;
 }
 
+/*
+ * Unmap a previously-mapped user I/O request.
+ */
 void
 vunmapbuf(struct buf *bp, vsize_t len)
 {
+       vaddr_t addr, off;
+
+       if ((bp->b_flags & B_PHYS) == 0)
+               panic("vunmapbuf");
+       addr = trunc_page((vaddr_t)bp->b_data);
+       off = (vaddr_t)bp->b_data - addr;
+       len = round_page(off + len);
+       pmap_remove(vm_map_pmap(phys_map), addr, addr + len);
+       pmap_update(vm_map_pmap(phys_map));
+       uvm_km_free(phys_map, addr, len, UVM_KMF_VAONLY);
+       bp->b_data = bp->b_saveaddr;
+       bp->b_saveaddr = NULL;
 }
+