From owner-p4-projects@FreeBSD.ORG  Thu Jan 26 02:11:04 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5A3DF16A423; Thu, 26 Jan 2006 02:11:04 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F290B16A420
	for <perforce@freebsd.org>; Thu, 26 Jan 2006 02:11:03 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7915D43D46
	for <perforce@freebsd.org>; Thu, 26 Jan 2006 02:11:03 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0Q2B3IV012191
	for <perforce@freebsd.org>; Thu, 26 Jan 2006 02:11:03 GMT
	(envelope-from alc@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0Q2B3Iw012188
	for perforce@freebsd.org; Thu, 26 Jan 2006 02:11:03 GMT
	(envelope-from alc@freebsd.org)
Date: Thu, 26 Jan 2006 02:11:03 GMT
Message-Id: <200601260211.k0Q2B3Iw012188@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	alc@freebsd.org using -f
From: Alan Cox <alc@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 90376 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jan 2006 02:11:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=90376

Change 90376 by alc@alc_home on 2006/01/26 02:10:43

	Merge the rewritten get_pv_entry().  It has to understand superpages.

Affected files ...

.. //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#5 edit

Differences ...

==== //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#5 (text+ko) ====

@@ -1421,7 +1421,7 @@
 	static const struct timeval printinterval = { 60, 0 };
 	static struct timeval lastprint;
 	struct vpgqueues *vpq;
-	pd_entry_t ptepde;
+	pd_entry_t *pde;
 	pmap_t pmap;
 	pt_entry_t *pte, tpte;
 	pv_entry_t allocated_pv, next_pv, pv;
@@ -1461,7 +1461,22 @@
 			else if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap))
 				continue;
 			pmap->pm_stats.resident_count--;
-			pte = pmap_pte_pde(pmap, va, &ptepde);
+			pde = pmap_pde(pmap, va);
+			if ((*pde & PG_PS) != 0 &&
+			    !pmap_demote(pmap, pde, va)) {
+				/*
+				 * All mappings within the same 2mpage were
+				 * destroyed and pv was freed.
+				 */
+				if (pmap != locked_pmap)
+					PMAP_UNLOCK(pmap);
+				if (allocated_pv == NULL) {
+					allocated_pv = uma_zalloc(pvzone,
+					    M_NOWAIT);
+				}
+				continue;
+			}
+			pte = pmap_pde_to_pte(pde, va);
 			tpte = pte_load_clear(pte);
 			KASSERT((tpte & PG_W) == 0,
 			    ("get_pv_entry: wired pte %#lx", tpte));
@@ -1480,7 +1495,7 @@
 			if (TAILQ_EMPTY(&m->md.pv_list))
 				vm_page_flag_clear(m, PG_WRITEABLE);
 			m->md.pv_list_count--;
-			pmap_unuse_pt(pmap, va, ptepde);
+			pmap_unuse_pt(pmap, va, *pde);
 			if (pmap != locked_pmap)
 				PMAP_UNLOCK(pmap);
 			if (allocated_pv == NULL)