[src/trunk]: src Add the ability to specify a preferred address the "map anon...

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

details:   https://anonhg.NetBSD.org/src/rev/9909636e91d6
branches:  trunk
changeset: 755554:9909636e91d6
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Jun 09 11:35:36 2010 +0000

description:
Add the ability to specify a preferred address the "map anon memory"
hypercall.

diffstat:

 lib/librumpuser/rumpuser.c       |  10 ++++++----
 sys/rump/include/rump/rumpuser.h |   4 ++--
 sys/rump/librump/rumpkern/vm.c   |   9 +++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diffs (93 lines):

diff -r 6d177ce93891 -r 9909636e91d6 lib/librumpuser/rumpuser.c
--- a/lib/librumpuser/rumpuser.c        Wed Jun 09 08:37:16 2010 +0000
+++ b/lib/librumpuser/rumpuser.c        Wed Jun 09 11:35:36 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpuser.c,v 1.6 2010/06/02 18:15:35 pooka Exp $       */
+/*     $NetBSD: rumpuser.c,v 1.7 2010/06/09 11:35:36 pooka Exp $       */
 
 /*
  * Copyright (c) 2007-2010 Antti Kantee.  All Rights Reserved.
@@ -27,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: rumpuser.c,v 1.6 2010/06/02 18:15:35 pooka Exp $");
+__RCSID("$NetBSD: rumpuser.c,v 1.7 2010/06/09 11:35:36 pooka Exp $");
 #endif /* !lint */
 
 /* thank the maker for this */
@@ -229,7 +229,8 @@
 }
 
 void *
-rumpuser_anonmmap(size_t size, int alignbit, int exec, int *error)
+rumpuser_anonmmap(void *prefaddr, size_t size, int alignbit,
+       int exec, int *error)
 {
        void *rv;
        int prot;
@@ -238,7 +239,8 @@
        if (exec)
                prot |= PROT_EXEC;
        /* XXX: MAP_ALIGNED() is not portable */
-       rv = mmap(NULL, size, prot, MAP_ANON | MAP_ALIGNED(alignbit), -1, 0);
+       rv = mmap(prefaddr, size, prot,
+           MAP_ANON | MAP_ALIGNED(alignbit), -1, 0);
        if (rv == MAP_FAILED) {
                *error = errno;
                return NULL;
diff -r 6d177ce93891 -r 9909636e91d6 sys/rump/include/rump/rumpuser.h
--- a/sys/rump/include/rump/rumpuser.h  Wed Jun 09 08:37:16 2010 +0000
+++ b/sys/rump/include/rump/rumpuser.h  Wed Jun 09 11:35:36 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpuser.h,v 1.43 2010/06/01 20:11:33 pooka Exp $      */
+/*     $NetBSD: rumpuser.h,v 1.44 2010/06/09 11:35:36 pooka Exp $      */
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -55,7 +55,7 @@
 void *rumpuser_realloc(void *, size_t);
 void rumpuser_free(void *);
 
-void *rumpuser_anonmmap(size_t, int, int, int *);
+void *rumpuser_anonmmap(void *, size_t, int, int, int *);
 #define RUMPUSER_FILEMMAP_READ         0x01
 #define RUMPUSER_FILEMMAP_WRITE                0x02
 #define RUMPUSER_FILEMMAP_TRUNCATE     0x04
diff -r 6d177ce93891 -r 9909636e91d6 sys/rump/librump/rumpkern/vm.c
--- a/sys/rump/librump/rumpkern/vm.c    Wed Jun 09 08:37:16 2010 +0000
+++ b/sys/rump/librump/rumpkern/vm.c    Wed Jun 09 11:35:36 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm.c,v 1.80 2010/06/03 10:56:20 pooka Exp $    */
+/*     $NetBSD: vm.c,v 1.81 2010/06/09 11:35:36 pooka Exp $    */
 
 /*
  * Copyright (c) 2007-2010 Antti Kantee.  All Rights Reserved.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.80 2010/06/03 10:56:20 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.81 2010/06/09 11:35:36 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -289,7 +289,7 @@
        if (*addr != 0)
                panic("uvm_mmap() variant unsupported");
 
-       uaddr = rumpuser_anonmmap(size, 0, 0, &error);
+       uaddr = rumpuser_anonmmap(NULL, size, 0, 0, &error);
        if (uaddr == NULL)
                return error;
 
@@ -536,7 +536,8 @@
                alignbit = ffs(align)-1;
        }
 
-       rv = rumpuser_anonmmap(size, alignbit, flags & UVM_KMF_EXEC, &error);
+       rv = rumpuser_anonmmap(NULL, size, alignbit, flags & UVM_KMF_EXEC,
+           &error);
        if (rv == NULL) {
                if (flags & (UVM_KMF_CANFAIL | UVM_KMF_NOWAIT))
                        return 0;