diff options
| author |   ariane <ariane@openbsd.org> | 2011-06-06 17:10:23 +0000 |
|---|---|---|
| committer | ariane <ariane@openbsd.org> | 2011-06-06 17:10:23 +0000 |
| commit | 97581e8a0a11f01a47d6770c7128a59e7705ac0a (patch) | |
| tree | ae5dfa1059412b2100527a457aa3ec56e96a260e /sys/uvm/uvm_io.c | |
| parent | push kernel malloc(9) and kernel stacks into non-dma memory, since that (diff) | |
| download | wireguard-openbsd-97581e8a0a11f01a47d6770c7128a59e7705ac0a.tar.xz wireguard-openbsd-97581e8a0a11f01a47d6770c7128a59e7705ac0a.zip | |
Backout vmmap in order to repair virtual address selection algorithms
outside the tree.
Diffstat (limited to 'sys/uvm/uvm_io.c')
| -rw-r--r-- | sys/uvm/uvm_io.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/uvm/uvm_io.c b/sys/uvm/uvm_io.c index 5e42d6b85f9..876b5420b6f 100644 --- a/sys/uvm/uvm_io.c +++ b/sys/uvm/uvm_io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_io.c,v 1.18 2011/05/24 15:27:36 ariane Exp $ */ +/* $OpenBSD: uvm_io.c,v 1.19 2011/06/06 17:10:23 ariane Exp $ */ /* $NetBSD: uvm_io.c,v 1.12 2000/06/27 17:29:23 mrg Exp $ */ /* @@ -64,7 +64,7 @@ uvm_io(vm_map_t map, struct uio *uio, int flags) { vaddr_t baseva, endva, pageoffset, kva; vsize_t chunksz, togo, sz; - struct uvm_map_deadq dead_entries; + vm_map_entry_t dead_entries; int error, extractflags; /* @@ -93,7 +93,7 @@ uvm_io(vm_map_t map, struct uio *uio, int flags) chunksz = min(round_page(togo + pageoffset), MAXBSIZE); error = 0; - extractflags = 0; + extractflags = UVM_EXTRACT_QREF | UVM_EXTRACT_CONTIG; if (flags & UVM_IO_FIXPROT) extractflags |= UVM_EXTRACT_FIXPROT; @@ -107,7 +107,7 @@ uvm_io(vm_map_t map, struct uio *uio, int flags) * step 2: extract mappings from the map into kernel_map */ - error = uvm_map_extract(map, baseva, chunksz, &kva, + error = uvm_map_extract(map, baseva, chunksz, kernel_map, &kva, extractflags); if (error) { @@ -139,11 +139,12 @@ uvm_io(vm_map_t map, struct uio *uio, int flags) */ vm_map_lock(kernel_map); - TAILQ_INIT(&dead_entries); uvm_unmap_remove(kernel_map, kva, kva+chunksz, - &dead_entries, FALSE, TRUE); + &dead_entries, NULL, FALSE); vm_map_unlock(kernel_map); - uvm_unmap_detach(&dead_entries, AMAP_REFALL); + + if (dead_entries != NULL) + uvm_unmap_detach(dead_entries, AMAP_REFALL); /* * We defer checking the error return from uiomove until |