From owner-svn-src-user@FreeBSD.ORG Tue Apr 20 22:24:36 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 0261D1065673; Tue, 20 Apr 2010 22:24:36 +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 E67CB8FC0A; Tue, 20 Apr 2010 22:24:35 +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 o3KMOZaj062624; Tue, 20 Apr 2010 22:24:35 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3KMOZeS062622; Tue, 20 Apr 2010 22:24:35 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201004202224.o3KMOZeS062622@svn.freebsd.org> From: Kip Macy Date: Tue, 20 Apr 2010 22:24:35 +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: r206943 - 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: Tue, 20 Apr 2010 22:24:36 -0000 Author: kmacy Date: Tue Apr 20 22:24:35 2010 New Revision: 206943 URL: http://svn.freebsd.org/changeset/base/206943 Log: acquire page lock in pmap_remove_pde if we need to change the page's flags 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 Tue Apr 20 22:20:31 2010 (r206942) +++ user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c Tue Apr 20 22:24:35 2010 (r206943) @@ -2689,6 +2689,7 @@ pmap_remove_pde(pmap_t pmap, pd_entry_t pd_entry_t oldpde; vm_offset_t eva, va; vm_page_t m, mpte; + vm_paddr_t paddr, pa = 0; PMAP_LOCK_ASSERT(pmap, MA_OWNED); KASSERT((sva & PDRMASK) == 0, @@ -2708,9 +2709,13 @@ pmap_remove_pde(pmap_t pmap, pd_entry_t pvh = pa_to_pvh(oldpde & PG_PS_FRAME); pmap_pvh_free(pvh, pmap, sva); eva = sva + NBPDR; - panic("XXX - not properly locked"); - for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME); - va < eva; va += PAGE_SIZE, m++) { + paddr = oldpde & PG_PS_FRAME; + for (va = sva, m = PHYS_TO_VM_PAGE(paddr); + va < eva; va += PAGE_SIZE, paddr += PAGE_SIZE, m++) { + if ((oldpde & PG_A) || + (TAILQ_EMPTY(&m->md.pv_list) && + TAILQ_EMPTY(&pvh->pv_list))) + pa_tryrelock(pmap, paddr, &pa); if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); @@ -2720,6 +2725,8 @@ pmap_remove_pde(pmap_t pmap, pd_entry_t TAILQ_EMPTY(&pvh->pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); } + if (pa) + PA_UNLOCK(pa); } if (pmap == kernel_pmap) { if (!pmap_demote_pde(pmap, pdq, sva, pv_list))