From nobody Thu Dec 11 18:05:51 2025 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 4dS0rH32CCz6K7lF for ; Thu, 11 Dec 2025 18:05:51 +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 4dS0rH2MjTz46fq for ; Thu, 11 Dec 2025 18:05:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765476351; 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=Ix+20c06W4J3eZaAelBKC/xw4Vo0Eja3LV0WYOxjP9s=; b=lZlHVs3tuvr1wThkiRFdcJC+2IF/+Amajm7xmNsk2Mn6BPUysBpajADMKN7AGRRrwgJxAN +jHwte/zDT0bD0EmWJDb+ZuF+C33Y2+Q+XGsx4EuXgXMtWxUytIRMMAMcSfw8oY26RAwgT fHVd8nWWwp6BwOMte/Pb4DF2LPjJ4ExXryz2X6r04RGMapTiTtXRpkkuRZI6qplPwu6q5H LbroGBrjCoBW1NxGiRVEDsLy3bB5S36wKBpjmTPcoIWoUkaoRtb3gMhzIQLvnVOaWviukM bpNTrDamh6xWr9QU5OXxNy4rCoU5hjqCuyr+eTtDsAWv27BXS2KvI3vuYkq0qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765476351; 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=Ix+20c06W4J3eZaAelBKC/xw4Vo0Eja3LV0WYOxjP9s=; b=mAsTJWl5B5/RoVxvB7tsFzzqyTDwzJJ93M9Sv/A1yFsP3Xs+TccnsuVeir+6nTe2/ossls EfPXkjC0ogXgwP0xX+i1r4V0LatWOvX12bDUaY5fH6qOcMKTUCxf5Ml+za3t3jTmmCUsEh 1JgqCcXDNqScqm0UIYUjyJ1VYDsP7F8ZZg674htVcsfgsDwcTBXXCWY2i+upMrWdXExgbq Ag+WwTBJ2kZR16aAmkDUhml8vmMaWpmJabPvJIrqkpWpzz/tqR7S6FjJTxB6+bMM1imxsJ s6TfsO633xAnrx/OTY1zCGnjtHoPGwUnsMHxvkwGFHKuaZJGxwxxeO3x+TMZFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765476351; a=rsa-sha256; cv=none; b=AjIObHgzzWQSv8oFXoeNmxINQZKFKbriw2KhOCsAa39rQzAKJE0FEHFPKDIi1C7gIGzhDp NC+UMPbRjB/5y+g1qtrIaklc46neRDwQw3ZNPGN8zlQgSTXvGnwCsqsWD/tsBwEQMhqIiq 8/w4ol36/K6RcIsCXnZUvDCqeUIpTME/bmYmpTYoXUWVMJzhFtUfiQxcKifztvJp2Y3BbW yutjd8ZuLa0Tmgv6ufomnHjySMcp7bG7SGaDHuO6Qw432q0zzn21aVMz94QG/5dsp6odi5 dpLWuykQTz9K7T0ZLgakQDx/awmLfSnpZJn73URIFbKrpas7G2bnlPVMmwaqUA== 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 4dS0rH1vnLzhRZ for ; Thu, 11 Dec 2025 18:05:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21aaf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 11 Dec 2025 18:05:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f50f8cbb401b - stable/15 - riscv/pmap: Handle superpages in pmap_extract_and_hold() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: f50f8cbb401b35d0fad17ae1f84c56040bf12d2c Auto-Submitted: auto-generated Date: Thu, 11 Dec 2025 18:05:51 +0000 Message-Id: <693b07ff.21aaf.7fe3f4f8@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f50f8cbb401b35d0fad17ae1f84c56040bf12d2c commit f50f8cbb401b35d0fad17ae1f84c56040bf12d2c Author: Mark Johnston AuthorDate: 2025-12-03 13:41:30 +0000 Commit: Mark Johnston CommitDate: 2025-12-11 17:59:09 +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 (cherry picked from commit 20a0a2f8f36f5db704b674106fa61d8d95b6b071) --- 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); }