From owner-p4-projects@FreeBSD.ORG  Wed Jan  2 04:22:46 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8311816A419; Wed,  2 Jan 2008 04:22:46 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 48F7616A417
	for <perforce@freebsd.org>; Wed,  2 Jan 2008 04:22:46 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3A0EF13C44B
	for <perforce@freebsd.org>; Wed,  2 Jan 2008 04:22:46 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m024MkE2007201
	for <perforce@freebsd.org>; Wed, 2 Jan 2008 04:22:46 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m024Mko5007195
	for perforce@freebsd.org; Wed, 2 Jan 2008 04:22:46 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 2 Jan 2008 04:22:46 GMT
Message-Id: <200801020422.m024Mko5007195@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132286 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: Wed, 02 Jan 2008 04:22:46 -0000

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

Change 132286 by kmacy@pandemonium:kmacy:xen31 on 2008/01/02 04:22:34

	make sure that page tables and pv entry pages are zeroed

Affected files ...

.. //depot/projects/xen31/sys/i386/xen/pmap.c#10 edit

Differences ...

==== //depot/projects/xen31/sys/i386/xen/pmap.c#10 (text+ko) ====

@@ -1287,8 +1287,12 @@
 	/*
 	 * unmap the page table page
 	 */
-	xen_pt_unpin(pmap->pm_pdir[m->pindex]);	
+	xen_pt_unpin(pmap->pm_pdir[m->pindex]);
+	/*
+	 * page *might* contain residual mapping :-/  
+	 */
 	PD_CLEAR_VA(pmap, m->pindex, TRUE);
+	pmap_zero_page(m);
 	--pmap->pm_stats.resident_count;
 
 	/*
@@ -1427,6 +1431,8 @@
 #ifdef PAE
 #ifdef XEN
 	pmap_qenter((vm_offset_t)pmap->pm_pdpt, &ptdpg[NPGPTD*2], 1);
+	if ((ptdpg[NPGPTD*2]->flags & PG_ZERO) == 0)
+		bzero(pmap->pm_pdpt, PAGE_SIZE);
 #endif	
 	for (i = 0; i < NPGPTD; i++) {
 		vm_paddr_t ma;
@@ -2057,6 +2063,8 @@
 	colour++;
 	pc = (struct pv_chunk *)pmap_ptelist_alloc(&pv_vafree);
 	pmap_qenter((vm_offset_t)pc, &m, 1);
+	if ((m->flags & PG_ZERO) == 0)
+		bzero(pc, PG_ZERO);
 	pc->pc_pmap = pmap;
 	pc->pc_map[0] = pc_freemask[0] & ~1ul;	/* preallocated bit 0 */
 	for (field = 1; field < _NPCM; field++)
@@ -3300,6 +3308,11 @@
 				pv = &pc->pc_pventry[idx];
 				inuse &= ~bitmask;
 
+				if (pmap->pm_pdir_shadow[pv->pv_va >> PDRSHIFT] == 0) {
+					printf("PDIR IS ZERO @ VA %08x\n", pv->pv_va);
+					panic("bad pte");					
+				}
+
 				pte = vtopte(pv->pv_va);
 				tpte = PT_GET(pte);