From owner-p4-projects@FreeBSD.ORG Thu Jan 17 01:19:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FE9C16A468; Thu, 17 Jan 2008 01:19:54 +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 65A3116A417 for ; Thu, 17 Jan 2008 01:19:54 +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 57CD613C45A for ; Thu, 17 Jan 2008 01:19:54 +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 m0H1Jr7u081592 for ; Thu, 17 Jan 2008 01:19:53 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H1Jrpt081589 for perforce@freebsd.org; Thu, 17 Jan 2008 01:19:53 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 17 Jan 2008 01:19:53 GMT Message-Id: <200801170119.m0H1Jrpt081589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 133448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2008 01:19:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=133448 Change 133448 by kmacy@pandemonium:kmacy:xen31 on 2008/01/17 01:19:23 add copious asserts to check for invariants in pmap utility functions Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#15 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#15 (text+ko) ==== @@ -2805,7 +2805,7 @@ * But that isn't as quick as vtopte. */ pte = vtopte(va); - if (*pte) { + if (*pte & PG_V) { if (mpte != NULL) { mpte->wire_count--; mpte = NULL; @@ -3123,6 +3123,9 @@ #else *sysmaps->CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; #endif + KASSERT(*sysmaps->CMAP2 == (PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M), + ("CMAP2 did not get set is %llx", *sysmaps->CMAP2)); + invlcaddr(sysmaps->CADDR2); pagezero(sysmaps->CADDR2); PT_CLEAR_VA(sysmaps->CMAP2, TRUE); @@ -3193,17 +3196,25 @@ sysmaps = &sysmaps_pcpu[PCPU_GET(cpuid)]; mtx_lock(&sysmaps->lock); if (*sysmaps->CMAP1) - panic("pmap_copy_page: CMAP1 busy"); + panic("pmap_copy_page: CMAP1 busy, CMAP1=%llx", *sysmaps->CMAP1); if (*sysmaps->CMAP2) panic("pmap_copy_page: CMAP2 busy"); sched_pin(); invlpg((u_int)sysmaps->CADDR1); invlpg((u_int)sysmaps->CADDR2); - PT_SET_VA(sysmaps->CMAP1, PG_V | VM_PAGE_TO_PHYS(src) | PG_A, FALSE); + PT_SET_VA(sysmaps->CMAP1, PG_V | VM_PAGE_TO_PHYS(src) | PG_A, TRUE); PT_SET_VA(sysmaps->CMAP2, PG_V | PG_RW | VM_PAGE_TO_PHYS(dst) | PG_A | PG_M, TRUE); + KASSERT(*sysmaps->CMAP1 == (PG_V | xpmap_ptom(VM_PAGE_TO_PHYS(src)) | PG_A ), + ("CMAP1 did not get set is %llx", *sysmaps->CMAP1)); + KASSERT(*sysmaps->CMAP2 == (PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(dst)) | PG_A | PG_M), + ("CMAP2 did not get set is %llx", *sysmaps->CMAP2)); bcopy(sysmaps->CADDR1, sysmaps->CADDR2, PAGE_SIZE); PT_CLEAR_VA(sysmaps->CMAP1, FALSE); PT_CLEAR_VA(sysmaps->CMAP2, TRUE); + if (*sysmaps->CMAP1) + panic("pmap_copy_page: CMAP1 busy, CMAP1=%llx", *sysmaps->CMAP1); + if (*sysmaps->CMAP2) + panic("pmap_copy_page: CMAP2 busy"); sched_unpin(); mtx_unlock(&sysmaps->lock); } @@ -3317,9 +3328,8 @@ printf( "TPTE at %p IS ZERO @ VA %08x\n", pte, pv->pv_va); - panic("bad pte"); + panic("bad pte tpte"); } - /* * We cannot remove wired pages from a process' mapping at this time */