From nobody Tue Mar 01 14:40:06 2022 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 4C23619DBA34; Tue, 1 Mar 2022 14:40:09 +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 4K7KfH6MMLz3G1N; Tue, 1 Mar 2022 14:40:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646145608; 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=mr4LDooaiWgkJR46S6GEZeuvODoC1uqFP6ncA8FOm2U=; b=YlCfPLyglLyb8LrXKRNLKm+Ez7t1Bo2rGMDg4rO21e87zlRHZq36HLNJVvXGljtbkuXcfG hdScg2wATUTLaa/0QNy+LPQ73GK1d4qski3zEdh6jI1RPFVKSkhIDEEhuOc11CjzO4LXlq 90rszHcIiS93VEjjtPcXebK/1Sx/RoVP9ta1jwW7JiqGLXSHLnGnokZ2lU2d1UPghQWB1m FpNqsScoaxfMFEqrB5WfaWhg9sez1MbJk2LpItycYeFDf15y/DZ+sVbF8gJKFA7Vyjp4R/ JqI6UTxpY38ndM+N7UuM/UzqRGQazc7Ju2ia+j19ht60x3v5/H5zxDLaW+jJpQ== 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 01C5F113D1; Tue, 1 Mar 2022 14:40:07 +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 221Ee6Rd041378; Tue, 1 Mar 2022 14:40:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 221Ee6sU041374; Tue, 1 Mar 2022 14:40:06 GMT (envelope-from git) Date: Tue, 1 Mar 2022 14:40:06 GMT Message-Id: <202203011440.221Ee6sU041374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1321117200de - main - riscv: Handle four-level page tables in various pmap traversal routines 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 1321117200de1d1796adad856f7e04a66850e992 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646145608; 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=mr4LDooaiWgkJR46S6GEZeuvODoC1uqFP6ncA8FOm2U=; b=tqQb2rYzDXKEK1THhqjMSYd1ZMotxjvocYGzCIoYo1NnWJyWvTcLLnDELUVeuqhjT9Se/E 5TrWTGi9JCjcFymO8uWdkZ67M7RJ4TvG6NoiF+fXFayobyK695pSKQB9x1SD6dUSJmQXhq j85bB9kn32KaKI64MJYgkYXbaRRq2sZPuw1z+16RBmdz6TawYpYi9BrzfbuvQYHOUQila9 RMSqkaHyrJaGzCt4miYvjXtW35ISJsXOHRdyyUR/8Ih6Cg+JY6S9hMoOrV4t31ATHzslS4 +q+ntEs+YM//eLCZVNOjMtxs643Ze4q/rHZrdzIOmFZbz1y46LiV95hSxHgHwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646145608; a=rsa-sha256; cv=none; b=xb69y61qDkYbhzCjiy7knG1FngYwhOzrCu+lCYGZKLrcZtYSRnIQDA9vLkP15/clcgzoQG /zyNiIVrwha1ZOVQtqZ3z1mg6RIgWOjxbV9ZYLc3/XVY02Jwor+0mg8Qe86vHA1JkeXpbc oDJjcFCc4nqO11B0x933dAEsKcgFqpMb1SjbeeeHKgeUyuNc+V3CjOQiW7DRy+ynfsCmOa PBSyQZpx0e8bLnF8CGdt08o+gxzaufa2SSChdZzE5A4/EFxOkMfxNyyjrQ8mJNrrhcetV6 SdbIO3RTM1/tCWIsbHjXVigkkdSEt6p+/ONi3dDFXsvY44hlqJ6X82dOQRqMNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1321117200de1d1796adad856f7e04a66850e992 commit 1321117200de1d1796adad856f7e04a66850e992 Author: Mark Johnston AuthorDate: 2022-03-01 14:06:42 +0000 Commit: Mark Johnston CommitDate: 2022-03-01 14:39:44 +0000 riscv: Handle four-level page tables in various pmap traversal routines Reviewed by: jhb MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34278 --- sys/riscv/riscv/pmap.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index aaaccfec4fe9..6e69fec6365e 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -2187,7 +2187,7 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) struct spglist free; struct rwlock *lock; vm_offset_t va, va_next; - pd_entry_t *l1, *l2, l2e; + pd_entry_t *l0, *l1, *l2, l2e; pt_entry_t *l3; /* @@ -2206,7 +2206,19 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) if (pmap->pm_stats.resident_count == 0) break; - l1 = pmap_l1(pmap, sva); + if (pmap_mode == PMAP_MODE_SV48) { + l0 = pmap_l0(pmap, sva); + if (pmap_load(l0) == 0) { + va_next = (sva + L0_SIZE) & ~L0_OFFSET; + if (va_next < sva) + va_next = eva; + continue; + } + l1 = pmap_l0_to_l1(l0, sva); + } else { + l1 = pmap_l1(pmap, sva); + } + if (pmap_load(l1) == 0) { va_next = (sva + L1_SIZE) & ~L1_OFFSET; if (va_next < sva) @@ -2357,7 +2369,7 @@ pmap_remove_all(vm_page_t m) void pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) { - pd_entry_t *l1, *l2, l2e; + pd_entry_t *l0, *l1, *l2, l2e; pt_entry_t *l3, l3e, mask; vm_page_t m, mt; vm_paddr_t pa; @@ -2383,7 +2395,19 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) resume: PMAP_LOCK(pmap); for (; sva < eva; sva = va_next) { - l1 = pmap_l1(pmap, sva); + if (pmap_mode == PMAP_MODE_SV48) { + l0 = pmap_l0(pmap, sva); + if (pmap_load(l0) == 0) { + va_next = (sva + L0_SIZE) & ~L0_OFFSET; + if (va_next < sva) + va_next = eva; + continue; + } + l1 = pmap_l0_to_l1(l0, sva); + } else { + l1 = pmap_l1(pmap, sva); + } + if (pmap_load(l1) == 0) { va_next = (sva + L1_SIZE) & ~L1_OFFSET; if (va_next < sva) @@ -3334,7 +3358,7 @@ void pmap_unwire(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { vm_offset_t va_next; - pd_entry_t *l1, *l2, l2e; + pd_entry_t *l0, *l1, *l2, l2e; pt_entry_t *l3, l3e; bool pv_lists_locked; @@ -3342,7 +3366,19 @@ pmap_unwire(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) retry: PMAP_LOCK(pmap); for (; sva < eva; sva = va_next) { - l1 = pmap_l1(pmap, sva); + if (pmap_mode == PMAP_MODE_SV48) { + l0 = pmap_l0(pmap, sva); + if (pmap_load(l0) == 0) { + va_next = (sva + L0_SIZE) & ~L0_OFFSET; + if (va_next < sva) + va_next = eva; + continue; + } + l1 = pmap_l0_to_l1(l0, sva); + } else { + l1 = pmap_l1(pmap, sva); + } + if (pmap_load(l1) == 0) { va_next = (sva + L1_SIZE) & ~L1_OFFSET; if (va_next < sva)