From: David van Moolenbroek <david@minix3.org>
Date: Sun, 22 Jan 2012 17:20:45 +0000 (+0100)
Subject: vm: if mmap address is given, try that first
X-Git-Tag: v3.2.1~648
X-Git-Url: http://zhaoyanbai.com/repos/dnssec-importkey.html?a=commitdiff_plain;h=b91295a8d2b40e60e3867cc019feace277034035;p=minix.git

vm: if mmap address is given, try that first

Previously, the mmap address (if given) was merely used as a lower
bound, and then possibly overriden with a hint. Now, the mapping is
first tried at the exact given address. If that fails, the start of
the mmap range is used as lower bound (which is then still overridden
by the hint for efficiency).

This allows two pages to be mapped in at predefined addresses, where
the second address is lower than the first. That was not possible.
---

diff --git a/servers/vm/mmap.c b/servers/vm/mmap.c
index 8e1c3abc4..a61fee08a 100644
--- a/servers/vm/mmap.c
+++ b/servers/vm/mmap.c
@@ -40,6 +40,7 @@ PUBLIC int do_mmap(message *m)
 	int r, n;
 	struct vmproc *vmp;
 	int mfflags = 0;
+	vir_bytes addr;
 	struct vir_region *vr = NULL;
 
 	if((r=vm_isokendpt(m->m_source, &n)) != OK) {
@@ -81,10 +82,20 @@ PUBLIC int do_mmap(message *m)
 		if(len % VM_PAGE_SIZE)
 			len += VM_PAGE_SIZE - (len % VM_PAGE_SIZE);
 
-		if(!(vr = map_page_region(vmp,
-			arch_vir2map(vmp,
-				m->VMM_ADDR ? m->VMM_ADDR : vmp->vm_stacktop),
-			VM_DATATOP, len, MAP_NONE, vrflags, mfflags))) {
+		vr = NULL;
+		if (m->VMM_ADDR) {
+			/* An address is given, first try at that address. */
+			addr = arch_vir2map(vmp, m->VMM_ADDR);
+			vr = map_page_region(vmp, addr, 0, len, MAP_NONE,
+				vrflags, mfflags);
+		}
+		if (!vr) {
+			/* No address given or address already in use. */
+			addr = arch_vir2map(vmp, vmp->vm_stacktop);
+			vr = map_page_region(vmp, addr, VM_DATATOP, len,
+				MAP_NONE, vrflags, mfflags);
+		}
+		if (!vr) {
 			return ENOMEM;
 		}
 	} else {