From owner-p4-projects@FreeBSD.ORG  Tue Mar 14 23:18:11 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 D513116A422; Tue, 14 Mar 2006 23:18:10 +0000 (UTC)
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 989BC16A41F
	for <perforce@freebsd.org>; Tue, 14 Mar 2006 23:18:10 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 62A6643D45
	for <perforce@freebsd.org>; Tue, 14 Mar 2006 23:18:10 +0000 (GMT)
	(envelope-from peter@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 k2ENIAbv094295
	for <perforce@freebsd.org>; Tue, 14 Mar 2006 23:18:10 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2ENIAaP094292
	for perforce@freebsd.org; Tue, 14 Mar 2006 23:18:10 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 14 Mar 2006 23:18:10 GMT
Message-Id: <200603142318.k2ENIAaP094292@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93320 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: Tue, 14 Mar 2006 23:18:11 -0000

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

Change 93320 by peter@peter_daintree on 2006/03/14 23:18:05

	Add some temporary bandaids to get back to single user

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#137 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#137 (text+ko) ====

@@ -1482,12 +1482,12 @@
 			pte = pmap_pte_pde(pmap, va, &ptepde);
 			tpte = pte_load_clear(pte);
 			KASSERT((tpte & PG_W) == 0,
-			    ("get_pv_entry: wired pte %#lx", tpte));
+			    ("pmap_collect: wired pte %#lx", tpte));
 			if (tpte & PG_A)
 				vm_page_flag_set(m, PG_REFERENCED);
 			if (tpte & PG_M) {
 				KASSERT((tpte & PG_RW),
-	("get_pv_entry: modified page not writable: va: %#lx, pte: %#lx",
+	("pmap_collect: modified page not writable: va: %#lx, pte: %#lx",
 				    va, tpte));
 				if (pmap_track_modified(va))
 					vm_page_dirty(m);
@@ -1557,14 +1557,18 @@
 	if (pv_entry_count > pv_entry_high_water)
 		pagedaemon_wakeup();
 	pc = TAILQ_FIRST(&pmap->pm_pvchunk);
+	if (pc == NULL)
+		goto alloc;
 	for (field = 0; field < _NPCM; field++) {
-		bit = bsrq(pc->pc_map[field]);
+		bit = -1;
+		if (pc->pc_map[field])
+			bit = bsfq(pc->pc_map[field]);
 		if (bit >= 0)
 			break;
 	}
 	if (bit >= 0) {
 		pv = &pc->pc_pventry[field * 64 + bit];
-		pc->pc_map[field] &= (1ul << bit);
+		pc->pc_map[field] &= ~(1ul << bit);
 		/* If this was the last item, move it to tail */
 		if (pc->pc_map[0] == 0 && pc->pc_map[1] == 0 &&
 		    pc->pc_map[2] == 0) {
@@ -1573,6 +1577,7 @@
 		}
 		return (pv);
 	}
+alloc:
 	/* No free items, allocate another chunk */
 	m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ);
 	if (m == NULL) {