From nobody Wed Feb 09 00:43:36 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C5E7719B1AE0; Wed, 9 Feb 2022 00:43:37 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jth2K0WFNz4pnt; Wed, 9 Feb 2022 00:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644367417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SrmCaf0euVUk/QktGL4HGO/hmkMIUuS4DleitlybvE0=; b=gJZQETrkudH0UksPHtt7iDFLdEWJc8VvrUT7CvBGc40VzAFNL5x090mzVxIl8BBPmnVOWc uJKXZVqEoMvnma6/DcHkzJCtz7wXaWGlUhSSNRqCN1hf2mr8TlzDS/ZmayupoGbcksvcgs E8yoO/J6lt4qMsLAPt9v6di0fDp+cKBuvH1VVfLIx13Iqyl2udhq8GR2CpQ9ldyR5G0MA5 //585kPHz7w4HrP1ACv8DbQOkME5iWOAgOEVekLcX6ZY8et4hUE4O9oNSaHnXj2YU2/5Pz vuC7HKoftUlXopZKVICyhYwuAHEO/K8Fx6V9rRs9PyUxwrItTcwy4XjZ18KEdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B80412382A; Wed, 9 Feb 2022 00:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2190haFt083125; Wed, 9 Feb 2022 00:43:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2190haEl083124; Wed, 9 Feb 2022 00:43:36 GMT (envelope-from git) Date: Wed, 9 Feb 2022 00:43:36 GMT Message-Id: <202202090043.2190haEl083124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 10007de3d929 - stable/13 - amd64: micro-optimize vptopte()/vtopde() further List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 10007de3d929fba96b9f7c92bccd270448e5d851 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644367417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SrmCaf0euVUk/QktGL4HGO/hmkMIUuS4DleitlybvE0=; b=qCkxO873y/yACGJiPZUUxjRe9H3hY1kKxi8cjxgZ/Aqxe83jXraSTu+THT+9rrH1SV57Ul sE4RCUpZoKiRqRTunXVrZJBTzHhz5XE3Lwe5/+7D6zEwrZsGJUGSNxV0QW9QJ+DgWh2EFD DFHVNqoB9zDzRFb3QtOPHJMcb14Hb0CV0Pfznr9X9gBvIYpC3FYhxNIqjw38IuH+G/6Xul P0gWmvUdXMVmu617NLCaLg7STGd8Y1RM6YQLfMZmoYrB9+tMvaFBBodz781gvdFnZCtmMl ESyR6DK5nkVvL7fo3Dk+CmrVpCREqD8OPVKUsPSICDIb98rYrJU5PUbRnyOhxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644367417; a=rsa-sha256; cv=none; b=EYaIKvBeuqTLc2lxtiAFu9enIygd6hEcb5/6hDoBzbTjiQvjGNRSSWcaPAfrt7tiwWme7g EY5E0k1/DDdT7Od1qB+G0K1NiADQ2RvZBUOcFwJY6GH7PBgMD56jh3VpoEFfP+gGwsPE0a 65yVECFG2XPPRKRsa2vHT1WXJI10tau1GKALYPUukUB/vVKVtlA2Jr6jrep7lRhZO7q48X VeizRduEmBsXQcjn/WCPRx2LQqozcrPmCSCg/IJ9OahTuK0PfrV2KicdvkKoouFeZXqOsR tXhbXVXSa+H31N+ysZyoqA7VXzLqH3w71CHw4CLsSeDixHohwrOwh7svAtJiPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=10007de3d929fba96b9f7c92bccd270448e5d851 commit 10007de3d929fba96b9f7c92bccd270448e5d851 Author: Konstantin Belousov AuthorDate: 2022-01-08 05:09:09 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-09 00:42:44 +0000 amd64: micro-optimize vptopte()/vtopde() further (cherry picked from commit e7c54421628231650d61edd90b271e6b5e322e36) --- sys/amd64/amd64/pmap.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index c113d8f1e695..9d4c9307c43e 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -1504,28 +1504,28 @@ pmap_pt_page_count_adj(pmap_t pmap, int count) } } -pt_entry_t vtoptem __read_mostly = (1ul << (NPTEPGSHIFT + NPDEPGSHIFT + - NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1; -pt_entry_t *PTmap __read_mostly = P4Tmap; +pt_entry_t vtoptem __read_mostly = ((1ul << (NPTEPGSHIFT + NPDEPGSHIFT + + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1) << 3; +vm_offset_t PTmap __read_mostly = (vm_offset_t)P4Tmap; PMAP_INLINE pt_entry_t * vtopte(vm_offset_t va) { KASSERT(va >= VM_MAXUSER_ADDRESS, ("vtopte on a uva/gpa 0x%0lx", va)); - return (PTmap + ((va >> PAGE_SHIFT) & vtoptem)); + return ((pt_entry_t *)(PTmap + ((va >> (PAGE_SHIFT - 3)) & vtoptem))); } -pd_entry_t vtopdem __read_mostly = (1ul << (NPDEPGSHIFT + NPDPEPGSHIFT + - NPML4EPGSHIFT)) - 1; -pd_entry_t *PDmap __read_mostly = P4Dmap; +pd_entry_t vtopdem __read_mostly = ((1ul << (NPDEPGSHIFT + NPDPEPGSHIFT + + NPML4EPGSHIFT)) - 1) << 3; +vm_offset_t PDmap __read_mostly = (vm_offset_t)P4Dmap; static __inline pd_entry_t * vtopde(vm_offset_t va) { KASSERT(va >= VM_MAXUSER_ADDRESS, ("vtopde on a uva/gpa 0x%0lx", va)); - return (PDmap + ((va >> PDRSHIFT) & vtopdem)); + return ((pt_entry_t *)(PDmap + ((va >> (PDRSHIFT - 3)) & vtopdem))); } static u_int64_t @@ -2195,12 +2195,12 @@ pmap_bootstrap_la57(void *arg __unused) */ v_pml5[PML5PML5I] = KPML5phys | X86_PG_RW | X86_PG_V | pg_nx; - vtoptem = (1ul << (NPTEPGSHIFT + NPDEPGSHIFT + NPDPEPGSHIFT + - NPML4EPGSHIFT + NPML5EPGSHIFT)) - 1; - PTmap = P5Tmap; - vtopdem = (1ul << (NPDEPGSHIFT + NPDPEPGSHIFT + - NPML4EPGSHIFT + NPML5EPGSHIFT)) - 1; - PDmap = P5Dmap; + vtoptem = ((1ul << (NPTEPGSHIFT + NPDEPGSHIFT + NPDPEPGSHIFT + + NPML4EPGSHIFT + NPML5EPGSHIFT)) - 1) << 3; + PTmap = (vm_offset_t)P5Tmap; + vtopdem = ((1ul << (NPDEPGSHIFT + NPDPEPGSHIFT + + NPML4EPGSHIFT + NPML5EPGSHIFT)) - 1) << 3; + PDmap = (vm_offset_t)P5Dmap; kernel_pmap->pm_cr3 = KPML5phys; kernel_pmap->pm_pmltop = v_pml5;