From owner-svn-src-all@FreeBSD.ORG  Sat Apr 21 18:36:54 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 387A01065670;
	Sat, 21 Apr 2012 18:36:54 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2432F8FC08;
	Sat, 21 Apr 2012 18:36:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3LIasc2000197;
	Sat, 21 Apr 2012 18:36:54 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3LIarcY000195;
	Sat, 21 Apr 2012 18:36:53 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201204211836.q3LIarcY000195@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 21 Apr 2012 18:36:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234556 - head/sys/vm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Apr 2012 18:36:54 -0000

Author: kib
Date: Sat Apr 21 18:36:53 2012
New Revision: 234556
URL: http://svn.freebsd.org/changeset/base/234556

Log:
  When MAP_STACK mapping is created, the map entry is created only to
  cover the initial stack size. For MCL_WIREFUTURE maps, the subsequent
  call to vm_map_wire() to wire the whole stack region fails due to
  VM_MAP_WIRE_NOHOLES flag.
  
  Use the VM_MAP_WIRE_HOLESOK to only wire mapped part of the stack.
  
  Reported and tested by:	Sushanth Rai <sushanth_rai yahoo com>
  Reviewed by:	alc
  MFC after:	1 week

Modified:
  head/sys/vm/vm_mmap.c

Modified: head/sys/vm/vm_mmap.c
==============================================================================
--- head/sys/vm/vm_mmap.c	Sat Apr 21 18:30:48 2012	(r234555)
+++ head/sys/vm/vm_mmap.c	Sat Apr 21 18:36:53 2012	(r234556)
@@ -1561,9 +1561,11 @@ vm_mmap(vm_map_t map, vm_offset_t *addr,
 		 * If the process has requested that all future mappings
 		 * be wired, then heed this.
 		 */
-		if (map->flags & MAP_WIREFUTURE)
+		if (map->flags & MAP_WIREFUTURE) {
 			vm_map_wire(map, *addr, *addr + size,
-			    VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES);
+			    VM_MAP_WIRE_USER | ((flags & MAP_STACK) ?
+			    VM_MAP_WIRE_HOLESOK : VM_MAP_WIRE_NOHOLES));
+		}
 	} else {
 		/*
 		 * If this mapping was accounted for in the vnode's