From owner-svn-src-head@freebsd.org Thu Jan 18 11:01:42 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 826A6EC5279; Thu, 18 Jan 2018 11:01:42 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5E1022FE8; Thu, 18 Jan 2018 11:01:42 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6BEAF1D9EC; Thu, 18 Jan 2018 11:01:41 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0IB1frT040771; Thu, 18 Jan 2018 11:01:41 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0IB1ff0040770; Thu, 18 Jan 2018 11:01:41 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201801181101.w0IB1ff0040770@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 18 Jan 2018 11:01:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328116 - head/sys/amd64/amd64 X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/amd64/amd64 X-SVN-Commit-Revision: 328116 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jan 2018 11:01:42 -0000 Author: kib Date: Thu Jan 18 11:01:41 2018 New Revision: 328116 URL: https://svnweb.freebsd.org/changeset/base/328116 Log: Remove the 'last' argument from the pmap_pti_free_page(). It is in fact unused. Noted and reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 13 days Modified: head/sys/amd64/amd64/pmap.c Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Thu Jan 18 10:52:31 2018 (r328115) +++ head/sys/amd64/amd64/pmap.c Thu Jan 18 11:01:41 2018 (r328116) @@ -7550,17 +7550,16 @@ pmap_pti_alloc_page(void) } static bool -pmap_pti_free_page(vm_page_t m, bool last) +pmap_pti_free_page(vm_page_t m) { + KASSERT(m->wire_count > 0, ("page %p not wired", m)); m->wire_count--; - if (m->wire_count == 0 || last) { - KASSERT(m->wire_count == 0, ("page %p wired", m)); - atomic_subtract_int(&vm_cnt.v_wire_count, 1); - vm_page_free_zero(m); - return (true); - } - return (false); + if (m->wire_count != 0) + return (false); + atomic_subtract_int(&vm_cnt.v_wire_count, 1); + vm_page_free_zero(m); + return (true); } extern char kernphys[], etext[]; @@ -7626,7 +7625,7 @@ pmap_pti_pdpe(vm_offset_t va) panic("pml4 alloc after finalization\n"); m = pmap_pti_alloc_page(); if (*pml4e != 0) { - pmap_pti_free_page(m, true); + pmap_pti_free_page(m); mphys = *pml4e & ~PAGE_MASK; } else { mphys = VM_PAGE_TO_PHYS(m); @@ -7658,7 +7657,7 @@ pmap_pti_unwire_pde(void *pde, bool only_ref) m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((uintptr_t)pde)); MPASS(m->wire_count > 0); MPASS(only_ref || m->wire_count > 1); - pmap_pti_free_page(m, false); + pmap_pti_free_page(m); } static void @@ -7670,7 +7669,7 @@ pmap_pti_unwire_pte(void *pte, vm_offset_t va) VM_OBJECT_ASSERT_WLOCKED(pti_obj); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((uintptr_t)pte)); MPASS(m->wire_count > 0); - if (pmap_pti_free_page(m, false)) { + if (pmap_pti_free_page(m)) { pde = pmap_pti_pde(va); MPASS((*pde & (X86_PG_PS | X86_PG_V)) == X86_PG_V); *pde = 0; @@ -7693,7 +7692,7 @@ pmap_pti_pde(vm_offset_t va) if (*pdpe == 0) { m = pmap_pti_alloc_page(); if (*pdpe != 0) { - pmap_pti_free_page(m, true); + pmap_pti_free_page(m); MPASS((*pdpe & X86_PG_PS) == 0); mphys = *pdpe & ~PAGE_MASK; } else { @@ -7729,7 +7728,7 @@ pmap_pti_pte(vm_offset_t va, bool *unwire_pde) if (*pde == 0) { m = pmap_pti_alloc_page(); if (*pde != 0) { - pmap_pti_free_page(m, true); + pmap_pti_free_page(m); MPASS((*pde & X86_PG_PS) == 0); mphys = *pde & ~(PAGE_MASK | pg_nx); } else {