From owner-svn-src-user@FreeBSD.ORG  Sun Jun 28 16:34:34 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 121A2106566C;
	Sun, 28 Jun 2009 16:34:34 +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 00AD58FC17;
	Sun, 28 Jun 2009 16:34:34 +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 n5SGYXLt016241;
	Sun, 28 Jun 2009 16:34:33 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5SGYXOq016239;
	Sun, 28 Jun 2009 16:34:33 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906281634.n5SGYXOq016239@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 28 Jun 2009 16:34:33 +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: r195138 - 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: Sun, 28 Jun 2009 16:34:34 -0000

Author: kmacy
Date: Sun Jun 28 16:34:33 2009
New Revision: 195138
URL: http://svn.freebsd.org/changeset/base/195138

Log:
  - add page lock to protect md pv list in pmap_pv_promote_pde
  - add pv_lock to protect stats in pmap_remove_pages

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	Sun Jun 28 15:38:50 2009	(r195137)
+++ user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c	Sun Jun 28 16:34:33 2009	(r195138)
@@ -2227,7 +2227,9 @@ pmap_pv_promote_pde(pmap_t pmap, vm_offs
 	do {
 		m++;
 		va += PAGE_SIZE;
+		vm_page_lock(m);
 		pmap_pvh_free(&m->md, pmap, va, free);
+		vm_page_unlock(m);
 	} while (va < va_last);
 }
 
@@ -3984,9 +3986,11 @@ restart:
 				}
 
 				/* Mark free */
+				mtx_lock(&pv_lock);
 				PV_STAT(pv_entry_frees++);
 				PV_STAT(pv_entry_spare++);
 				pv_entry_count--;
+				mtx_unlock(&pv_lock);
 				pc->pc_map[field] |= bitmask;
 				if ((tpte & PG_PS) != 0) {
 					pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;