Module Name: src
Committed By: pooka
Date: Thu Feb 10 14:46:48 UTC 2011
Modified Files:
src/sys/arch/acorn26/acorn26: vm_machdep.c
src/sys/arch/alpha/alpha: vm_machdep.c
src/sys/arch/arm/arm32: vm_machdep.c
src/sys/arch/hppa/hppa: vm_machdep.c
src/sys/arch/ia64/ia64: vm_machdep.c
src/sys/arch/m68k/m68k: vm_machdep.c
src/sys/arch/mips/mips: vm_machdep.c
src/sys/arch/powerpc/powerpc: vm_machdep.c
src/sys/arch/sh3/sh3: vm_machdep.c
src/sys/arch/sparc/sparc: vm_machdep.c
src/sys/arch/sparc64/sparc64: vm_machdep.c
src/sys/arch/vax/vax: vm_machdep.c
src/sys/arch/x86/x86: vm_machdep.c
src/sys/kern: kern_physio.c
src/sys/rump/librump/rumpkern: vm.c
src/sys/uvm: uvm_extern.h
Log Message:
Make vmapbuf() return success/error and make physio deal with a
failure.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/acorn26/acorn26/vm_machdep.c
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/alpha/alpha/vm_machdep.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/arm/arm32/vm_machdep.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/hppa/hppa/vm_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ia64/ia64/vm_machdep.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/m68k/m68k/vm_machdep.c
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/mips/mips/vm_machdep.c
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/powerpc/powerpc/vm_machdep.c
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/sh3/sh3/vm_machdep.c
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/sparc/sparc/vm_machdep.c
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/sparc64/sparc64/vm_machdep.c
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/vax/vax/vm_machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/x86/vm_machdep.c
cvs rdiff -u -r1.91 -r1.92 src/sys/kern/kern_physio.c
cvs rdiff -u -r1.110 -r1.111 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.169 -r1.170 src/sys/uvm/uvm_extern.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn26/acorn26/vm_machdep.c
diff -u src/sys/arch/acorn26/acorn26/vm_machdep.c:1.26 src/sys/arch/acorn26/acorn26/vm_machdep.c:1.27
--- src/sys/arch/acorn26/acorn26/vm_machdep.c:1.26 Sun Nov 29 04:15:42 2009
+++ src/sys/arch/acorn26/acorn26/vm_machdep.c Thu Feb 10 14:46:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.26 2009/11/29 04:15:42 rmind Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.27 2011/02/10 14:46:45 pooka Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.26 2009/11/29 04:15:42 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.27 2011/02/10 14:46:45 pooka Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -173,7 +173,7 @@
* do not need to pass an access_type to pmap_enter().
*/
/* This code was originally stolen from the alpha port. */
-void
+int
vmapbuf(struct buf *bp, vsize_t len)
{
vaddr_t faddr, taddr, off;
@@ -203,6 +203,8 @@
taddr += PAGE_SIZE;
}
pmap_update(vm_map_pmap(phys_map));
+
+ return 0;
}
/*
Index: src/sys/arch/alpha/alpha/vm_machdep.c
diff -u src/sys/arch/alpha/alpha/vm_machdep.c:1.104 src/sys/arch/alpha/alpha/vm_machdep.c:1.105
--- src/sys/arch/alpha/alpha/vm_machdep.c:1.104 Sun Nov 29 04:15:42 2009
+++ src/sys/arch/alpha/alpha/vm_machdep.c Thu Feb 10 14:46:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.104 2009/11/29 04:15:42 rmind Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.105 2011/02/10 14:46:46 pooka Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.104 2009/11/29 04:15:42 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.105 2011/02/10 14:46:46 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -192,7 +192,7 @@
* Note: the pages are already locked by uvm_vslock(), so we
* do not need to pass an access_type to pmap_enter().
*/
-void
+int
vmapbuf(struct buf *bp, vsize_t len)
{
vaddr_t faddr, taddr, off;
@@ -219,6 +219,8 @@
taddr += PAGE_SIZE;
}
pmap_update(vm_map_pmap(phys_map));
+
+ return 0;
}
/*
Index: src/sys/arch/arm/arm32/vm_machdep.c
diff -u src/sys/arch/arm/arm32/vm_machdep.c:1.54 src/sys/arch/arm/arm32/vm_machdep.c:1.55
--- src/sys/arch/arm/arm32/vm_machdep.c:1.54 Fri Jan 14 02:06:23 2011
+++ src/sys/arch/arm/arm32/vm_machdep.c Thu Feb 10 14:46:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.54 2011/01/14 02:06:23 rmind Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.55 2011/02/10 14:46:46 pooka Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.54 2011/01/14 02:06:23 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.55 2011/02/10 14:46:46 pooka Exp $");
#include "opt_armfpe.h"
#include "opt_pmap_debug.h"
@@ -256,7 +256,7 @@
* Note: the pages are already locked by uvm_vslock(), so we
* do not need to pass an access_type to pmap_enter().
*/
-void
+int
vmapbuf(struct buf *bp, vsize_t len)
{
vaddr_t faddr, taddr, off;
@@ -293,6 +293,8 @@
len -= PAGE_SIZE;
}
pmap_update(pmap_kernel());
+
+ return 0;
}
/*
Index: src/sys/arch/hppa/hppa/vm_machdep.c
diff -u src/sys/arch/hppa/hppa/vm_machdep.c:1.47 src/sys/arch/hppa/hppa/vm_machdep.c:1.48
--- src/sys/arch/hppa/hppa/vm_machdep.c:1.47 Mon Feb 7 12:19:35 2011
+++ src/sys/arch/hppa/hppa/vm_machdep.c Thu Feb 10 14:46:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.47 2011/02/07 12:19:35 skrll Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.48 2011/02/10 14:46:46 pooka Exp $ */
/* $OpenBSD: vm_machdep.c,v 1.64 2008/09/30 18:54:26 miod Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.47 2011/02/07 12:19:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.48 2011/02/10 14:46:46 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -243,7 +243,7 @@
/*
* Map an IO request into kernel virtual address space.
*/
-void
+int
vmapbuf(struct buf *bp, vsize_t len)
{
vaddr_t uva, kva;
@@ -274,6 +274,8 @@
kva += PAGE_SIZE;
}
pmap_update(kpmap);
+
+ return 0;
}
/*
Index: src/sys/arch/ia64/ia64/vm_machdep.c
diff -u src/sys/arch/ia64/ia64/vm_machdep.c:1.10 src/sys/arch/ia64/ia64/vm_machdep.c:1.11
--- src/sys/arch/ia64/ia64/vm_machdep.c:1.10 Sun Nov 29 04:15:42 2009
+++ src/sys/arch/ia64/ia64/vm_machdep.c Thu Feb 10 14:46:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.10 2009/11/29 04:15:42 rmind Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.11 2011/02/10 14:46:46 pooka Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -142,11 +142,11 @@
* Note: the pages are already locked by uvm_vslock(), so we
* do not need to pass an access_type to pmap_enter().
*/
-void
+int
vmapbuf(struct buf *bp, vsize_t len)
{
printf("%s: not yet\n", __func__);
- return;
+ return 0;
}
/*
Index: src/sys/arch/m68k/m68k/vm_machdep.c
diff -u src/sys/arch/m68k/m68k/vm_machdep.c:1.36 src/sys/arch/m68k/m68k/vm_machdep.c:1.37
--- src/sys/arch/m68k/m68k/vm_machdep.c:1.36 Tue Feb 8 20:20:17 2011
+++ src/sys/arch/m68k/m68k/vm_machdep.c Thu Feb 10 14:46:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.36 2011/02/08 20:20:17 rmind Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.37 2011/02/10 14:46:46 pooka Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.36 2011/02/08 20:20:17 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.37 2011/02/10 14:46:46 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -159,7 +159,7 @@
* Note: the pages are already locked by uvm_vslock(), so we
* do not need to pass an access_type to pmap_enter().
*/
-void
+int
vmapbuf(struct buf *bp, vsize_t len)
{
struct pmap *upmap, *kpmap;
@@ -193,6 +193,8 @@
len -= PAGE_SIZE;
} while (len);
pmap_update(kpmap);
+
+ return 0;
}
/*
Index: src/sys/arch/mips/mips/vm_machdep.c
diff -u src/sys/arch/mips/mips/vm_machdep.c:1.134 src/sys/arch/mips/mips/vm_machdep.c:1.135
--- src/sys/arch/mips/mips/vm_machdep.c:1.134 Tue Feb 8 20:20:19 2011
+++ src/sys/arch/mips/mips/vm_machdep.c Thu Feb 10 14:46:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.134 2011/02/08 20:20:19 rmind Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.135 2011/02/10 14:46:47 pooka Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.134 2011/02/08 20:20:19 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.135 2011/02/10 14:46:47 pooka Exp $");
#include "opt_ddb.h"
@@ -191,7 +191,7 @@
/*
* Map a user I/O request into kernel virtual address space.
*/
-void
+int
vmapbuf(struct buf *bp, vsize_t len)
{
struct pmap *upmap;
@@ -219,6 +219,8 @@
len -= PAGE_SIZE;
} while (len);
pmap_update(vm_map_pmap(phys_map));
+
+ return 0;
}
/*
Index: src/sys/arch/powerpc/powerpc/vm_machdep.c
diff -u src/sys/arch/powerpc/powerpc/vm_machdep.c:1.82 src/sys/arch/powerpc/powerpc/vm_machdep.c:1.83
--- src/sys/arch/powerpc/powerpc/vm_machdep.c:1.82 Wed Feb 2 09:02:39 2011
+++ src/sys/arch/powerpc/powerpc/vm_machdep.c Thu Feb 10 14:46:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.82 2011/02/02 09:02:39 matt Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.83 2011/02/10 14:46:47 pooka Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.82 2011/02/02 09:02:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.83 2011/02/10 14:46:47 pooka Exp $");
#include "opt_altivec.h"
#include "opt_multiprocessor.h"
@@ -232,7 +232,7 @@
* Map a user I/O request into kernel virtual address space.
* Note: these pages have already been locked by uvm_vslock.
*/
-void
+int
vmapbuf(struct buf *bp, vsize_t len)
{
vaddr_t faddr, taddr;
@@ -265,6 +265,8 @@
taddr += PAGE_SIZE;
}
pmap_update(pmap_kernel());
+
+ return 0;
}
/*
Index: src/sys/arch/sh3/sh3/vm_machdep.c
diff -u src/sys/arch/sh3/sh3/vm_machdep.c:1.70 src/sys/arch/sh3/sh3/vm_machdep.c:1.71
--- src/sys/arch/sh3/sh3/vm_machdep.c:1.70 Tue Feb 1 01:54:14 2011
+++ src/sys/arch/sh3/sh3/vm_machdep.c Thu Feb 10 14:46:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.70 2011/02/01 01:54:14 uwe Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.71 2011/02/10 14:46:47 pooka Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.70 2011/02/01 01:54:14 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.71 2011/02/10 14:46:47 pooka Exp $");
#include "opt_kstack_debug.h"
@@ -327,7 +327,7 @@
* (a name with only slightly more meaning than "kernel_map")
*/
-void
+int
vmapbuf(struct buf *bp, vsize_t len)
{
vaddr_t faddr, taddr, off;
@@ -365,6 +365,8 @@
len -= PAGE_SIZE;
}
pmap_update(kpmap);
+
+ return 0;
}
/*
Index: src/sys/arch/sparc/sparc/vm_machdep.c
diff -u src/sys/arch/sparc/sparc/vm_machdep.c:1.103 src/sys/arch/sparc/sparc/vm_machdep.c:1.104
--- src/sys/arch/sparc/sparc/vm_machdep.c:1.103 Fri Jan 14 02:06:32 2011
+++ src/sys/arch/sparc/sparc/vm_machdep.c Thu Feb 10 14:46:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.103 2011/01/14 02:06:32 rmind Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.104 2011/02/10 14:46:47 pooka Exp $ */
/*
* Copyright (c) 1996
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.103 2011/01/14 02:06:32 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.104 2011/02/10 14:46:47 pooka Exp $");
#include "opt_multiprocessor.h"
@@ -77,7 +77,7 @@
* Note: the pages are already locked by uvm_vslock(), so we
* do not need to pass an access_type to pmap_enter().
*/
-void
+int
vmapbuf(struct buf *bp, vsize_t len)
{
struct pmap *upmap, *kpmap;
@@ -121,6 +121,8 @@
len -= PAGE_SIZE;
} while (len);
pmap_update(kpmap);
+
+ return 0;
}
/*
Index: src/sys/arch/sparc64/sparc64/vm_machdep.c
diff -u src/sys/arch/sparc64/sparc64/vm_machdep.c:1.94 src/sys/arch/sparc64/sparc64/vm_machdep.c:1.95
--- src/sys/arch/sparc64/sparc64/vm_machdep.c:1.94 Tue Jan 18 23:56:49 2011
+++ src/sys/arch/sparc64/sparc64/vm_machdep.c Thu Feb 10 14:46:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.94 2011/01/18 23:56:49 matt Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.95 2011/02/10 14:46:47 pooka Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.94 2011/01/18 23:56:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.95 2011/02/10 14:46:47 pooka Exp $");
#include "opt_multiprocessor.h"
@@ -75,7 +75,7 @@
* Note: the pages are already locked by uvm_vslock(), so we
* do not need to pass an access_type to pmap_enter().
*/
-void
+int
vmapbuf(struct buf *bp, vsize_t len)
{
struct pmap *upmap, *kpmap;
@@ -107,6 +107,8 @@
len -= PAGE_SIZE;
} while (len);
pmap_update(pmap_kernel());
+
+ return 0;
}
/*
Index: src/sys/arch/vax/vax/vm_machdep.c
diff -u src/sys/arch/vax/vax/vm_machdep.c:1.113 src/sys/arch/vax/vax/vm_machdep.c:1.114
--- src/sys/arch/vax/vax/vm_machdep.c:1.113 Tue Dec 14 23:44:50 2010
+++ src/sys/arch/vax/vax/vm_machdep.c Thu Feb 10 14:46:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.113 2010/12/14 23:44:50 matt Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.114 2011/02/10 14:46:48 pooka Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.113 2010/12/14 23:44:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.114 2011/02/10 14:46:48 pooka Exp $");
#include "opt_execfmt.h"
#include "opt_compat_ultrix.h"
@@ -261,7 +261,7 @@
* Note: the pages are already locked by uvm_vslock(), so we
* do not need to pass an access_type to pmap_enter().
*/
-void
+int
vmapbuf(struct buf *bp, vsize_t len)
{
#if VAX46 || VAX48 || VAX49 || VAX53 || VAXANY
@@ -273,7 +273,7 @@
&& vax_boardtype != VAX_BTYP_48
&& vax_boardtype != VAX_BTYP_49
&& vax_boardtype != VAX_BTYP_53)
- return;
+ return 0;
if ((bp->b_flags & B_PHYS) == 0)
panic("vmapbuf");
p = bp->b_proc;
@@ -295,6 +295,8 @@
}
pmap_update(vm_map_pmap(phys_map));
#endif
+
+ return 0;
}
/*
Index: src/sys/arch/x86/x86/vm_machdep.c
diff -u src/sys/arch/x86/x86/vm_machdep.c:1.12 src/sys/arch/x86/x86/vm_machdep.c:1.13
--- src/sys/arch/x86/x86/vm_machdep.c:1.12 Sat Feb 5 13:47:57 2011
+++ src/sys/arch/x86/x86/vm_machdep.c Thu Feb 10 14:46:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.12 2011/02/05 13:47:57 yamt Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.13 2011/02/10 14:46:48 pooka Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.12 2011/02/05 13:47:57 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.13 2011/02/10 14:46:48 pooka Exp $");
#include "opt_mtrr.h"
@@ -298,7 +298,7 @@
* Note: the pages are already locked by uvm_vslock(), so we
* do not need to pass an access_type to pmap_enter().
*/
-void
+int
vmapbuf(struct buf *bp, vsize_t len)
{
vaddr_t faddr, taddr, off;
@@ -333,6 +333,8 @@
len -= PAGE_SIZE;
}
pmap_update(pmap_kernel());
+
+ return 0;
}
/*
Index: src/sys/kern/kern_physio.c
diff -u src/sys/kern/kern_physio.c:1.91 src/sys/kern/kern_physio.c:1.92
--- src/sys/kern/kern_physio.c:1.91 Tue May 26 14:59:31 2009
+++ src/sys/kern/kern_physio.c Thu Feb 10 14:46:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_physio.c,v 1.91 2009/05/26 14:59:31 hannken Exp $ */
+/* $NetBSD: kern_physio.c,v 1.92 2011/02/10 14:46:45 pooka Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_physio.c,v 1.91 2009/05/26 14:59:31 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_physio.c,v 1.92 2011/02/10 14:46:45 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -324,16 +324,23 @@
/*
* Lock the part of the user address space involved
- * in the transfer. Beware vmapbuf(); it clobbers
- * b_data and saves it in b_saveaddr. However,
- * vunmapbuf() restores it.
+ * in the transfer.
*/
error = uvm_vslock(p->p_vmspace, bp->b_data, todo,
(flags & B_READ) ? VM_PROT_WRITE : VM_PROT_READ);
if (error) {
goto done;
}
- vmapbuf(bp, todo);
+
+ /*
+ * Beware vmapbuf(); if succesful it clobbers
+ * b_data and saves it in b_saveaddr.
+ * However, vunmapbuf() restores b_data.
+ */
+ if ((error = vmapbuf(bp, todo)) != 0) {
+ uvm_vsunlock(p->p_vmspace, bp->b_data, todo);
+ goto done;
+ }
BIO_SETPRIO(bp, BPRIO_TIMECRITICAL);
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.110 src/sys/rump/librump/rumpkern/vm.c:1.111
--- src/sys/rump/librump/rumpkern/vm.c:1.110 Thu Feb 10 13:49:10 2011
+++ src/sys/rump/librump/rumpkern/vm.c Thu Feb 10 14:46:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.110 2011/02/10 13:49:10 pooka Exp $ */
+/* $NetBSD: vm.c,v 1.111 2011/02/10 14:46:45 pooka Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.110 2011/02/10 13:49:10 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.111 2011/02/10 14:46:45 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -771,9 +771,10 @@
* For the remote case we need to reserve space and copy data in or
* out, depending on B_READ/B_WRITE.
*/
-void
+int
vmapbuf(struct buf *bp, vsize_t len)
{
+ int error = 0;
bp->b_saveaddr = bp->b_data;
@@ -781,10 +782,16 @@
if (!RUMP_LOCALPROC_P(curproc)) {
bp->b_data = rump_hypermalloc(len, 0, true, "vmapbuf");
if (BUF_ISWRITE(bp)) {
- copyin(bp->b_saveaddr, bp->b_data, len);
- /* XXX: error? */
+ error = copyin(bp->b_saveaddr, bp->b_data, len);
+ if (error) {
+ rump_hyperfree(bp->b_data, len);
+ bp->b_data = bp->b_saveaddr;
+ bp->b_saveaddr = 0;
+ }
}
}
+
+ return error;
}
void
Index: src/sys/uvm/uvm_extern.h
diff -u src/sys/uvm/uvm_extern.h:1.169 src/sys/uvm/uvm_extern.h:1.170
--- src/sys/uvm/uvm_extern.h:1.169 Wed Feb 2 15:13:34 2011
+++ src/sys/uvm/uvm_extern.h Thu Feb 10 14:46:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_extern.h,v 1.169 2011/02/02 15:13:34 chuck Exp $ */
+/* $NetBSD: uvm_extern.h,v 1.170 2011/02/10 14:46:44 pooka Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -559,7 +559,7 @@
MALLOC_DECLARE(M_VMPMAP);
/* vm_machdep.c */
-void vmapbuf(struct buf *, vsize_t);
+int vmapbuf(struct buf *, vsize_t);
void vunmapbuf(struct buf *, vsize_t);
/* uvm_aobj.c */
