From owner-p4-projects@FreeBSD.ORG Sun Jan 20 05:51:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F92016A420; Sun, 20 Jan 2008 05:51:52 +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 AAF2A16A418 for ; Sun, 20 Jan 2008 05:51:51 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 734D413C4CE for ; Sun, 20 Jan 2008 05:51:51 +0000 (UTC) (envelope-from scottl@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 m0K5ppcV066920 for ; Sun, 20 Jan 2008 05:51:51 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0K5ppJq066917 for perforce@freebsd.org; Sun, 20 Jan 2008 05:51:51 GMT (envelope-from scottl@freebsd.org) Date: Sun, 20 Jan 2008 05:51:51 GMT Message-Id: <200801200551.m0K5ppJq066917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 133708 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: Sun, 20 Jan 2008 05:51:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=133708 Change 133708 by scottl@scottl-deimos on 2008/01/20 05:51:33 Bring in new pmap functionality and VM asserts. Affected files ... .. //depot/projects/xen31-xenbus/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/xen31-xenbus/sys/vm/vm_page.c#2 integrate Differences ... ==== //depot/projects/xen31-xenbus/sys/i386/xen/pmap.c#4 (text+ko) ==== @@ -1767,7 +1767,6 @@ vm_paddr_t ptppaddr; vm_page_t nkpg; pd_entry_t newpdir; - pt_entry_t *pde; mtx_assert(&kernel_map->system_mtx, MA_OWNED); if (kernel_vm_end == 0) { @@ -1808,19 +1807,12 @@ pmap_zero_page(nkpg); ptppaddr = VM_PAGE_TO_PHYS(nkpg); newpdir = (pd_entry_t) (ptppaddr | PG_V | PG_RW | PG_A | PG_M); -#ifdef notyet - PD_SET_VA(kernel_pmap, &pdir_pde(kernel_pmap->pm_pdir, kernel_vm_end), newpdir, TRUE); -#else - panic("implement me"); -#endif + PD_SET_VA(kernel_pmap, (kernel_vm_end >> PDRSHIFT), newpdir, TRUE); mtx_lock_spin(&allpmaps_lock); - LIST_FOREACH(pmap, &allpmaps, pm_list) { - pde = pmap_pde(pmap, kernel_vm_end); -#ifdef notyet - PD_SET_VA(pmap, pde, newpdir, FALSE); -#endif - } + LIST_FOREACH(pmap, &allpmaps, pm_list) + PD_SET_VA(pmap, (kernel_vm_end >> PDRSHIFT), newpdir, FALSE); + PT_UPDATES_FLUSH(); mtx_unlock_spin(&allpmaps_lock); kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); ==== //depot/projects/xen31-xenbus/sys/vm/vm_page.c#2 (text+ko) ==== @@ -139,6 +139,7 @@ int vm_page_array_size = 0; long first_page = 0; int vm_page_zero_count = 0; +extern unsigned long physfree; static int boot_pages = UMA_BOOT_PAGES; TUNABLE_INT("vm.boot_pages", &boot_pages); @@ -494,6 +495,8 @@ { m->flags &= ~PG_ZERO; + + KASSERT(VM_PAGE_TO_PHYS(m) >= physfree, ("freeing page from initial memory 0x%jx", VM_PAGE_TO_PHYS(m))); vm_page_free_toq(m); } @@ -507,6 +510,7 @@ { m->flags |= PG_ZERO; + KASSERT(VM_PAGE_TO_PHYS(m) >= physfree, ("freeing page from initial memory 0x%jx", VM_PAGE_TO_PHYS(m))); vm_page_free_toq(m); } @@ -1156,6 +1160,8 @@ if (vm_paging_needed()) pagedaemon_wakeup(); + + KASSERT(VM_PAGE_TO_PHYS(m) >= physfree, ("allocating page from initial memory 0x%jx", VM_PAGE_TO_PHYS(m))); return (m); }