From owner-svn-src-head@freebsd.org Mon Sep 21 15:53:42 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 741C83F4F85; Mon, 21 Sep 2020 15:53: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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bw89y2S26z4RFL; Mon, 21 Sep 2020 15:53: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 376FC106EA; Mon, 21 Sep 2020 15:53:42 +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 08LFrgXs010546; Mon, 21 Sep 2020 15:53:42 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08LFrgwL010545; Mon, 21 Sep 2020 15:53:42 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202009211553.08LFrgwL010545@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 21 Sep 2020 15:53:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365951 - 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: 365951 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.33 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: Mon, 21 Sep 2020 15:53:42 -0000 Author: kib Date: Mon Sep 21 15:53:41 2020 New Revision: 365951 URL: https://svnweb.freebsd.org/changeset/base/365951 Log: amd64 pmap: only calculate page table page when needed. Noted by: alc Reviewed by: alc, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D26499 Modified: head/sys/amd64/amd64/pmap.c Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Mon Sep 21 15:49:02 2020 (r365950) +++ head/sys/amd64/amd64/pmap.c Mon Sep 21 15:53:41 2020 (r365951) @@ -6525,12 +6525,13 @@ restart: origpte = *pdpe; MPASS(origpte == 0); } else { - mp = PHYS_TO_VM_PAGE(*pml4e & PG_FRAME); pdpe = pmap_pdpe(pmap, va); KASSERT(pdpe != NULL, ("va %#lx lost pdpe", va)); origpte = *pdpe; - if ((origpte & PG_V) == 0) + if ((origpte & PG_V) == 0) { + mp = PHYS_TO_VM_PAGE(*pml4e & PG_FRAME); mp->ref_count++; + } } KASSERT((origpte & PG_V) == 0 || ((origpte & PG_PS) != 0 && (origpte & PG_FRAME) == (pten & PG_FRAME)), @@ -6563,10 +6564,11 @@ restart: } else { pdpe = pmap_pdpe(pmap, va); MPASS(pdpe != NULL && (*pdpe & PG_V) != 0); - mp = PHYS_TO_VM_PAGE(*pdpe & PG_FRAME); origpte = *pde; - if ((origpte & PG_V) == 0) + if ((origpte & PG_V) == 0) { + mp = PHYS_TO_VM_PAGE(*pdpe & PG_FRAME); mp->ref_count++; + } } KASSERT((origpte & PG_V) == 0 || ((origpte & PG_PS) != 0 && (origpte & PG_FRAME) == (pten & PG_FRAME)),