From owner-svn-src-user@FreeBSD.ORG Sun Apr 25 23:08:38 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C96B1065673; Sun, 25 Apr 2010 23:08:38 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EF85D8FC0C; Sun, 25 Apr 2010 23:08:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3PN8bl8098358; Sun, 25 Apr 2010 23:08:37 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3PN8bP2098356; Sun, 25 Apr 2010 23:08:37 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201004252308.o3PN8bP2098356@svn.freebsd.org> From: Kip Macy Date: Sun, 25 Apr 2010 23:08:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207209 - user/kmacy/head_page_lock_2/sys/amd64/amd64 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2010 23:08:38 -0000 Author: kmacy Date: Sun Apr 25 23:08:37 2010 New Revision: 207209 URL: http://svn.freebsd.org/changeset/base/207209 Log: reduce delta with HEAD - white space cleanups - remove comment and braces no longer present in HEAD - remove INVARIANTS check Modified: user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c Modified: user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c ============================================================================== --- user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c Sun Apr 25 22:39:25 2010 (r207208) +++ user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c Sun Apr 25 23:08:37 2010 (r207209) @@ -2328,12 +2328,6 @@ pmap_pv_demote_pde(pmap_t pmap, vm_offse pv = pmap_pvh_remove(pvh, pmap, va); KASSERT(pv != NULL, ("pmap_pv_demote_pde: pv not found")); m = PHYS_TO_VM_PAGE(pa); -#ifdef INVARIANTS - if (va == 0) { - printf("inserting va==0\n"); - kdb_backtrace(); - } -#endif vm_page_lock(m); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); vm_page_unlock(m); @@ -2352,12 +2346,6 @@ pmap_pv_demote_pde(pmap_t pmap, vm_offse va += PAGE_SIZE; pv = TAILQ_FIRST(pv_list); TAILQ_REMOVE(pv_list, pv, pv_list); -#ifdef INVARIANTS - if (va == 0) { - printf("inserting va==0\n"); - kdb_backtrace(); - } -#endif pv->pv_va = va; vm_page_lock(m); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); @@ -2443,12 +2431,6 @@ pmap_try_insert_pv_entry(pmap_t pmap, vm vm_page_lock_assert(m, MA_OWNED); if (pv_entry_count < pv_entry_high_water && (pv = get_pv_entry(pmap)) != NULL) { -#ifdef INVARIANTS - if (va == 0) { - printf("inserting va==0\n"); - kdb_backtrace(); - } -#endif pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); return (TRUE); @@ -2469,12 +2451,6 @@ pmap_pv_insert_pde(pmap_t pmap, vm_offse PMAP_LOCK_ASSERT(pmap, MA_OWNED); if (pv_entry_count < pv_entry_high_water && (pv = get_pv_entry(pmap)) != NULL) { -#ifdef INVARIANTS - if (va == 0) { - printf("inserting va==0\n"); - kdb_backtrace(); - } -#endif pv->pv_va = va; pvh = pa_to_pvh(pa); TAILQ_INSERT_TAIL(&pvh->pv_list, pv, pv_list); @@ -3089,18 +3065,9 @@ retry: if (oldpde & PG_MANAGED) { eva = sva + NBPDR; for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME); - va < eva; va += PAGE_SIZE, m++) { - /* - * In contrast to the analogous operation on a 4KB page - * mapping, the mapping's PG_A flag is not cleared and - * the page's PG_REFERENCED flag is not set. The - * reason is that pmap_demote_pde() expects that a 2MB - * page mapping with a stored page table page has PG_A - * set. - */ + va < eva; va += PAGE_SIZE, m++) if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); - } } if ((prot & VM_PROT_WRITE) == 0) newpde &= ~(PG_RW | PG_M); @@ -3473,7 +3440,6 @@ restart: goto restart; } } - /* * Mapping has not changed, must be protection or wiring change. */ @@ -3505,7 +3471,6 @@ restart: } goto validate; } - /* * Mapping has changed, invalidate old range and fall through to * handle validating new mapping. @@ -3533,12 +3498,6 @@ restart: if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva, ("pmap_enter: managed mapping within the clean submap")); -#ifdef INVARIANTS - if (va == 0) { - printf("inserting va==0\n"); - kdb_backtrace(); - } -#endif pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); pa |= PG_MANAGED; @@ -4417,6 +4376,7 @@ restart: } else vm_page_dirty(m); } + /* Mark free */ PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); @@ -4434,7 +4394,7 @@ restart: mpte = pmap_lookup_pt_page(pmap, pv->pv_va); if (mpte != NULL) { pmap_remove_pt_page(pmap, mpte); - pmap_resident_count_dec(pmap, 1); + pmap_resident_count_dec(pmap, 1); KASSERT(mpte->wire_count == NPTEPG, ("pmap_remove_pages: pte page wire count error")); mpte->wire_count = 0;