Date: Mon, 8 Mar 2010 05:19:57 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r204857 - user/kmacy/releng_8_page_lock/sys/amd64/amd64 Message-ID: <201003080519.o285JvGF088743@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Mon Mar 8 05:19:56 2010 New Revision: 204857 URL: http://svn.freebsd.org/changeset/base/204857 Log: MFH 204856 Modified: user/kmacy/releng_8_page_lock/sys/amd64/amd64/pmap.c (contents, props changed) Modified: user/kmacy/releng_8_page_lock/sys/amd64/amd64/pmap.c ============================================================================== --- user/kmacy/releng_8_page_lock/sys/amd64/amd64/pmap.c Mon Mar 8 05:16:20 2010 (r204856) +++ user/kmacy/releng_8_page_lock/sys/amd64/amd64/pmap.c Mon Mar 8 05:19:56 2010 (r204857) @@ -2666,7 +2666,7 @@ static void pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde, vm_page_t *free) { pt_entry_t *pte; - vm_page_t m = NULL; + vm_paddr_t pa = 0; PMAP_LOCK_ASSERT(pmap, MA_OWNED); if ((*pde & PG_V) == 0) @@ -2674,17 +2674,12 @@ pmap_remove_page(pmap_t pmap, vm_offset_ pte = pmap_pde_to_pte(pde, va); if ((*pte & PG_V) == 0) return; - if (*pte & PG_MANAGED) { - m = PHYS_TO_VM_PAGE(*pte & PG_FRAME); - if (vm_page_trylock(m) == 0) { - PMAP_UNLOCK(pmap); - vm_page_lock(m); - PMAP_LOCK(pmap); - } - } + if (*pte & PG_MANAGED) + (void)pa_tryrelock(pmap, *pte & PG_FRAME, &pa); + pmap_remove_pte(pmap, pte, va, *pde, free); - if (m != NULL) - vm_page_unlock(m); + if (pa) + PA_UNLOCK(pa); pmap_invalidate_page(pmap, va); } @@ -2906,10 +2901,6 @@ restart: anyvalid = 1; ret = pmap_remove_pte(pmap, pte, sva, ptpaddr, &free); - if (pa) { - PA_UNLOCK(pa); - pa = 0; - } if (ret) break; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003080519.o285JvGF088743>