From owner-svn-src-head@FreeBSD.ORG  Sun Jul 12 12:37:38 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D855B106564A;
	Sun, 12 Jul 2009 12:37:38 +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 C6DC88FC1D;
	Sun, 12 Jul 2009 12:37:38 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6CCbcaM084306;
	Sun, 12 Jul 2009 12:37:38 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6CCbcwH084305;
	Sun, 12 Jul 2009 12:37:38 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200907121237.n6CCbcwH084305@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 12 Jul 2009 12:37:38 +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: r195635 - head/sys/vm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Jul 2009 12:37:39 -0000

Author: kib
Date: Sun Jul 12 12:37:38 2009
New Revision: 195635
URL: http://svn.freebsd.org/changeset/base/195635

Log:
  When VM_MAP_WIRE_HOLESOK is not specified and vm_map_wire(9) encounters
  non-readable and non-executable map entry, the entry is skipped from
  wiring and loop is aborted. But, since MAP_ENTRY_WIRE_SKIPPED was not
  set for the map entry, its wired_count is later erronously decremented.
  vm_map_delete(9) for such map entry stuck in "vmmaps".
  
  Properly set MAP_ENTRY_WIRE_SKIPPED when aborting the loop.
  
  Reported by:	John Marshall <john.marshall riverwillow com au>
  Approved by:	re (kensmith)

Modified:
  head/sys/vm/vm_map.c

Modified: head/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c	Sun Jul 12 09:14:28 2009	(r195634)
+++ head/sys/vm/vm_map.c	Sun Jul 12 12:37:38 2009	(r195635)
@@ -2354,12 +2354,12 @@ vm_map_wire(vm_map_t map, vm_offset_t st
 		if (entry->wired_count == 0) {
 			if ((entry->protection & (VM_PROT_READ|VM_PROT_EXECUTE))
 			    == 0) {
+				entry->eflags |= MAP_ENTRY_WIRE_SKIPPED;
 				if ((flags & VM_MAP_WIRE_HOLESOK) == 0) {
 					end = entry->end;
 					rv = KERN_INVALID_ADDRESS;
 					goto done;
 				}
-				entry->eflags |= MAP_ENTRY_WIRE_SKIPPED;
 				goto next_entry;
 			}
 			entry->wired_count++;