Module Name: src
Committed By: pooka
Date: Wed Jun 9 11:35:36 UTC 2010
Modified Files:
src/lib/librumpuser: rumpuser.c
src/sys/rump/include/rump: rumpuser.h
src/sys/rump/librump/rumpkern: vm.c
Log Message:
Add the ability to specify a preferred address the "map anon memory"
hypercall.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/librumpuser/rumpuser.c
cvs rdiff -u -r1.43 -r1.44 src/sys/rump/include/rump/rumpuser.h
cvs rdiff -u -r1.80 -r1.81 src/sys/rump/librump/rumpkern/vm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.6 src/lib/librumpuser/rumpuser.c:1.7
--- src/lib/librumpuser/rumpuser.c:1.6 Wed Jun 2 18:15:35 2010
+++ src/lib/librumpuser/rumpuser.c Wed Jun 9 11:35:36 2010
@@ -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;
Index: src/sys/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.43 src/sys/rump/include/rump/rumpuser.h:1.44
--- src/sys/rump/include/rump/rumpuser.h:1.43 Tue Jun 1 20:11:33 2010
+++ src/sys/rump/include/rump/rumpuser.h Wed Jun 9 11:35:36 2010
@@ -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
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.80 src/sys/rump/librump/rumpkern/vm.c:1.81
--- src/sys/rump/librump/rumpkern/vm.c:1.80 Thu Jun 3 10:56:20 2010
+++ src/sys/rump/librump/rumpkern/vm.c Wed Jun 9 11:35:36 2010
@@ -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;
