From owner-svn-src-user@FreeBSD.ORG  Fri Jun 26 06:11:40 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2E3F61065672;
	Fri, 26 Jun 2009 06:11:40 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D2258FC12;
	Fri, 26 Jun 2009 06:11:40 +0000 (UTC)
	(envelope-from kmacy@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 n5Q6Be7i076921;
	Fri, 26 Jun 2009 06:11:40 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5Q6Bd6R076919;
	Fri, 26 Jun 2009 06:11:39 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906260611.n5Q6Bd6R076919@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 26 Jun 2009 06:11:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195040 - user/kmacy/releng_7_2_fcs/sys/amd64/amd64
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Jun 2009 06:11:40 -0000

Author: kmacy
Date: Fri Jun 26 06:11:39 2009
New Revision: 195040
URL: http://svn.freebsd.org/changeset/base/195040

Log:
  hold page queue lock across freeing of all pages in the list

Modified:
  user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c

Modified: user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c	Fri Jun 26 05:58:52 2009	(r195039)
+++ user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c	Fri Jun 26 06:11:39 2009	(r195040)
@@ -1248,12 +1248,16 @@ pmap_free_zero_pages(vm_page_t free)
 {
 	vm_page_t m;
 
+	if (free == NULL)
+		return;	
+	vm_page_lock_queues();
 	while (free != NULL) {
 		m = free;
 		free = m->right;
 		/* Preserve the page's PG_ZERO setting. */
-		vm_page_free_toq(m);
+		vm_page_free_toq_locked(m);
 	}
+	vm_page_unlock_queues();
 }
 
 /*
@@ -1951,7 +1955,7 @@ pmap_collect(pmap_t locked_pmap, struct 
 	pt_entry_t *pte, tpte;
 	pv_entry_t next_pv, pv;
 	vm_offset_t va;
-	vm_page_t m, free;
+	vm_page_t m, free = NULL;
 
 	vm_page_lock_queues();
 	TAILQ_FOREACH(m, &vpq->pl, pageq) {
@@ -1981,7 +1985,6 @@ pmap_collect(pmap_t locked_pmap, struct 
 				vm_page_flag_set(m, PG_REFERENCED);
 			if ((tpte & (PG_M | PG_RW)) == (PG_M | PG_RW))
 				vm_page_dirty(m);
-			free = NULL;
 			pmap_unuse_pt(pmap, va, *pde, &free);
 			pmap_invalidate_page(pmap, va);
 			TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
@@ -1993,10 +1996,10 @@ pmap_collect(pmap_t locked_pmap, struct 
 			free_pv_entry(pmap, pv, &free);
 			if (pmap != locked_pmap)
 				PMAP_UNLOCK(pmap);
-			pmap_free_zero_pages(free);
 		}
 		vm_page_unlock(m);
 	}
+	pmap_free_zero_pages(free);
 	vm_page_unlock_queues();
 }