From nobody Wed Dec 3 14:43:33 2025 X-Original-To: dev-commits-src-main@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 4dM0kY4lMtz6JW8T for ; Wed, 03 Dec 2025 14:43:33 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM0kY3sNLz3PVc for ; Wed, 03 Dec 2025 14:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764773013; 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=OOm+6qXgTwLrMQFImqbKKAcXv7FfO5u3XDv1Us9Gp/g=; b=tU7s2mJaqlVScYgaR5WptZ0A6eme2HtLxNG/qxjHsQ7emRKRXgO0it8x16Ie0DRtcmHc5X VVrOSSwD1+zQxmcuyKPwz9OSjFcWHCK3836HQCHpsQGPWLz7D+SBkCuxynZoKMMkzCi7aP MwJxH6kGnFw25Rm4SwY0kKwSIPr+/XwaAOo+T9tcxP29bonZPTH0zdagi8Z+hlitL4MH1H GSe3rrSeq+grfNtFX7RsF8pbw3OO05un1+aNb22Tpi3lMf+JaRQJ6TXd201IeducOTwWNt tQlXFWd9hKU3BCtz20RIqwS2X1d4LTRmZ4a/mEjVHdGv/tUF+Wh7LVhLj8aDSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764773013; 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=OOm+6qXgTwLrMQFImqbKKAcXv7FfO5u3XDv1Us9Gp/g=; b=uN7OXe4pf4YmP/+BqTeSHBrJzi1gO5x+GL4T8aB/IqvRLgyHG+SRso7w76Po3Q0iKBYC6A 4+sMWugfxwmDKmxH3YIn/Qb74pqRjD5Z9UTK9WpRM49EB6Tp4VwniCitexhK0OFkmpVAjj TIZtU5/BaofrUWPt39/EoAp+PSUbEHoZK0r9vTjJ/rjJ/4cL5OKadnsQFCdIolIdsBCiw+ zcp4IuMehPkkwKB0P+LHMu1pjt6zNLF7GLI4JLq8nAW6kk3hQZWtcXeY9wzC8NFH59sPfY cC83MjpJ5waDodjAJ7rbrx2T/BOV7vz91KXx5us8yL0PenJtm9w9mmZECJPVdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764773013; a=rsa-sha256; cv=none; b=IOb6lWCl0kap/fJOs/+VGJuCGH3At2q74+uhAulPRfDgLd5xp13oIg6F3CUyfsoGLsPSkT hHwLouu8DjR9YnE7Gznpdb+5y+ghofUYvKV2BW2u6P77oEQ89NFlaxC7EKX+chD6sChKlv PgwKSaWB+kaPwIhxMLl/EDQU5LO5wzyhQGJquf+SbB9262DrUl1xTtBvJrR+QCykjMzQ0+ MVxgq8+xbrQ6OJYA/e+ekFj7ImjDMDXGHEEON9oLPVQE0wNMdPOZTLJXRzw03DeZUoz3Pq rwaXlNCFpF3BkIwAFMhj0i16+ohiYbDzTc1qGI+rn2rOCng/3ONhT4Esanc7rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM0kY3GYdzhk7 for ; Wed, 03 Dec 2025 14:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2b636 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 14:43:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 20a0a2f8f36f - main - riscv/pmap: Handle superpages in pmap_extract_and_hold() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 20a0a2f8f36f5db704b674106fa61d8d95b6b071 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 14:43:33 +0000 Message-Id: <69304c95.2b636.575d86af@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=20a0a2f8f36f5db704b674106fa61d8d95b6b071 commit 20a0a2f8f36f5db704b674106fa61d8d95b6b071 Author: Mark Johnston AuthorDate: 2025-12-03 13:41:30 +0000 Commit: Mark Johnston CommitDate: 2025-12-03 13:41:30 +0000 riscv/pmap: Handle superpages in pmap_extract_and_hold() Without this change, vm_fault_quick_hold_pages() falls back to the slow fault handler when it encounters a superpage mapping. Reviewed by: alc, kib Reported and tested by: br MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54022 --- sys/riscv/riscv/pmap.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 26efaecc64d1..0deb8b93a6dc 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -1134,19 +1134,29 @@ pmap_extract(pmap_t pmap, vm_offset_t va) vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { + pd_entry_t *l2p, l2; pt_entry_t *l3p, l3; vm_page_t m; m = NULL; PMAP_LOCK(pmap); - l3p = pmap_l3(pmap, va); - if (l3p != NULL && (l3 = pmap_load(l3p)) != 0) { - if ((l3 & PTE_W) != 0 || (prot & VM_PROT_WRITE) == 0) { - m = PTE_TO_VM_PAGE(l3); - if (!vm_page_wire_mapped(m)) - m = NULL; + l2p = pmap_l2(pmap, va); + if (l2p == NULL || ((l2 = pmap_load(l2p)) & PTE_V) == 0) { + ; + } else if ((l2 & PTE_RWX) != 0) { + if ((l2 & PTE_W) != 0 || (prot & VM_PROT_WRITE) == 0) { + m = PHYS_TO_VM_PAGE(L2PTE_TO_PHYS(l2) + + (va & L2_OFFSET)); + } + } else { + l3p = pmap_l2_to_l3(l2p, va); + if ((l3 = pmap_load(l3p)) != 0) { + if ((l3 & PTE_W) != 0 || (prot & VM_PROT_WRITE) == 0) + m = PTE_TO_VM_PAGE(l3); } } + if (m != NULL && !vm_page_wire_mapped(m)) + m = NULL; PMAP_UNLOCK(pmap); return (m); }