From nobody Sat Dec 2 21:55:58 2023 X-Original-To: dev-commits-src-all@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 4SjNzL5JH9z52nYw; Sat, 2 Dec 2023 21:55:58 +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 4SjNzL1qcFz4pql; Sat, 2 Dec 2023 21:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554158; 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=tvzu8uzDJ8uf0dSeEM85PvfMA5i1Yemj42XT9r4IJH0=; b=hqep9K1B1XTVUdCeRqkkky+u9ugRlw06MKM2kKjJfRnrDaluWxUr8nVIao52vDqUefjeFq XlKXbt3R0uiHc+kIrGDNJ74ykFKhkvjYZ7Ina6/xF2CHxqCN/M948F4pQXGKpYiToWpAQu 6Gsp5ODofFii0Cb+bVfytjm7sYcR1f+Ta6y/i7xJH6LsZqd/CuaE/SaU7c6nDHlQLS2Ool /1wG0d9NLXHa9tmR911rET+bclDT0DA6bFLhivenMJB1adCMQJCD1leXZ0W5+BFvn9PCYO fvkoLAgh2Uw/a1euOAypPq+wFjf2i5K+rrhWJgAX3l9GahhuPj6LJZmqf1UZCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554158; 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=tvzu8uzDJ8uf0dSeEM85PvfMA5i1Yemj42XT9r4IJH0=; b=oXzwDMTm3mP8WWNAA/k2s1Kh8yAja6Emmfs5jVmoW1FzrQv/330hoZGoDIiaH8iEIhk29Z LbFaJGNTnO81v+whaTQClCf1Izgo4BO9brUQAzvoFn8WeiRDuwGf1IyDhp71Df1Lc2tWdm C0EwDphlG1np05PLd3sTF/eIgTulQWojRHPwd7Uyepiq14UASKOBL3C/tMjQH90Mf8f1e1 vqhX7CnbmDQ25p+okJ1zZ0J3Q3nQ9hLmbrmDGanHimY0rVnE50+8psL7zc8ecGgvZf8LAj Pk2S1E9yxWG4j1tN/cV7o6YDMUEh0FcPrqsy3ojsPrQRgJQqIlqaVf6xWo/lXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701554158; a=rsa-sha256; cv=none; b=U3GUcfIBROk0LS7DvMFQyBUR6niS36HAy1lvztzaQum70OWLDz3V8mXL4+kGwpEEwF+1XQ rQ2AyJ6KGkvrPXyBy+no4hZFkpH28EPe+3bYQTV0hGiIkvM7NWYydh+ZHaBgT3zJksxqMI tZfn6Ik6wB1yh4lo+W3yjJYbIPdBKmqhEaPs0nB/LISyuT5VlUPCUbFE0zOip8Buv8+RAc CaJgMYVwHh8GJ/Z2yhS3P7J4keK/ALnqBllR/4RmUFtPWjm8NVowDr4vXO5NOtPIUKn9Od MBTM64ykznYq1dXDh8phR/ERjgI7F8K38MrgXUz6BC1L4gUzdKL39qZ2dT7f9w== 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 4SjNzL0kZwzYVq; Sat, 2 Dec 2023 21:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B2LtwGi034723; Sat, 2 Dec 2023 21:55:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2Ltw4c034720; Sat, 2 Dec 2023 21:55:58 GMT (envelope-from git) Date: Sat, 2 Dec 2023 21:55:58 GMT Message-Id: <202312022155.3B2Ltw4c034720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 284ed592f06d - stable/14 - riscv: Port improvements from arm64/amd64 pmaps, part 2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 284ed592f06ddb8a79ebd6256322c46ece24fd79 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=284ed592f06ddb8a79ebd6256322c46ece24fd79 commit 284ed592f06ddb8a79ebd6256322c46ece24fd79 Author: Mark Johnston AuthorDate: 2023-11-02 18:33:55 +0000 Commit: Mark Johnston CommitDate: 2023-12-02 21:54:34 +0000 riscv: Port improvements from arm64/amd64 pmaps, part 2 - Give pmap_promote_l2() a return value indicating whether or not promotion succeeded. - Check pmap_ps_enabled() in pmap_promote_l2() rather than making callers do it. - Annotate superpages_enabled with __read_frequently. Reviewed by: kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D42289 (cherry picked from commit 3c4f46b0d57b76d304f8a94862c6ba9be0273565) --- sys/riscv/riscv/pmap.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 716f00b36005..376027c8be8e 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -256,7 +256,7 @@ CTASSERT(VM_EARLY_DTB_ADDRESS < (VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE) static struct rwlock_padalign pvh_global_lock; static struct mtx_padalign allpmaps_lock; -static int superpages_enabled = 1; +static int __read_frequently superpages_enabled = 1; SYSCTL_INT(_vm_pmap, OID_AUTO, superpages_enabled, CTLFLAG_RDTUN, &superpages_enabled, 0, "Enable support for transparent superpages"); @@ -2753,7 +2753,7 @@ pmap_demote_l2_locked(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, } #if VM_NRESERVLEVEL > 0 -static void +static bool pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, struct rwlock **lockp) { @@ -2761,6 +2761,8 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, vm_paddr_t pa; PMAP_LOCK_ASSERT(pmap, MA_OWNED); + if (!pmap_ps_enabled(pmap)) + return (false); KASSERT((pmap_load(l2) & PTE_RWX) == 0, ("pmap_promote_l2: invalid l2 entry %p", l2)); @@ -2777,7 +2779,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, CTR2(KTR_PMAP, "pmap_promote_l2: failure for va %#lx pmap %p", va, pmap); atomic_add_long(&pmap_l2_p_failures, 1); - return; + return (false); } /* @@ -2811,7 +2813,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, "pmap_promote_l2: failure for va %#lx pmap %p", va, pmap); atomic_add_long(&pmap_l2_p_failures, 1); - return; + return (false); } while ((l3e & (PTE_W | PTE_D)) == PTE_W) { if (atomic_fcmpset_64(l3, &l3e, l3e & ~PTE_W)) { @@ -2824,7 +2826,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, "pmap_promote_l2: failure for va %#lx pmap %p", va, pmap); atomic_add_long(&pmap_l2_p_failures, 1); - return; + return (false); } all_l3e_PTE_A &= l3e; pa -= PAGE_SIZE; @@ -2851,7 +2853,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, CTR2(KTR_PMAP, "pmap_promote_l2: failure for va %#lx pmap %p", va, pmap); atomic_add_long(&pmap_l2_p_failures, 1); - return; + return (false); } if ((firstl3e & PTE_SW_MANAGED) != 0) @@ -2862,6 +2864,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, atomic_add_long(&pmap_l2_promotions, 1); CTR2(KTR_PMAP, "pmap_promote_l2: success for va %#lx in pmap %p", va, pmap); + return (true); } #endif @@ -3127,10 +3130,9 @@ validate: #if VM_NRESERVLEVEL > 0 if (mpte != NULL && mpte->ref_count == Ln_ENTRIES && - pmap_ps_enabled(pmap) && (m->flags & PG_FICTITIOUS) == 0 && vm_reserv_level_iffullpop(m) == 0) - pmap_promote_l2(pmap, l2, va, mpte, &lock); + (void)pmap_promote_l2(pmap, l2, va, mpte, &lock); #endif rv = KERN_SUCCESS;