From nobody Tue Mar 01 14:40:04 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 DA16919DB464; Tue, 1 Mar 2022 14:40:05 +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 4K7KfF2NN0z3FbC; Tue, 1 Mar 2022 14:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646145605; 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=P/NR9FyXty+nCtVwTG0+qB6v0qBIkPJKr/aH98wqWxo=; b=I/7nXgPeDRJaSrPnGFY7r5UdXYscPEoFPnZnifPp7TaZEyu8oFk/+ON2pg4EZwXH/hL8ys o1huUI8dOnhsqAYqGNNBtqmTu2bskH1ETXbQzFBILN9G/7HhlgsChh6bhxigZnmKHat816 XGZZKU5U8H2KpKdpF94/VHaiDRG9lBabXCQOGXCI5d4PJhzlAGHu4xUkpOzRcTOeGFyezz epkbIrms17xWibDjRzhzJXEC2uHULAVFGdB5GUOl3yW4ZJ6uOZbMcM9EozSjwQ/N0128U1 T3nisZRMkWEmoidwgh4neW1POfdubWZe/xmFoZnUO1sxcuQijaong94eT6RDEQ== 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 CB6961149E; Tue, 1 Mar 2022 14:40:04 +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 221Ee4A9040947; Tue, 1 Mar 2022 14:40:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 221Ee4ir040944; Tue, 1 Mar 2022 14:40:04 GMT (envelope-from git) Date: Tue, 1 Mar 2022 14:40:04 GMT Message-Id: <202203011440.221Ee4ir040944@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: 5cf3a8216e3a - main - riscv: Add pmap helper functions required by four-level page tables 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: 5cf3a8216e3adad06f1ab02c9a9b201cebcd4809 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646145605; 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=P/NR9FyXty+nCtVwTG0+qB6v0qBIkPJKr/aH98wqWxo=; b=d5kAEewlpu6B+KVRP0bwToqS970DLC9cBdp2Ea1HRJ4F+XbgmYM5CFGaN8IAdQ5ZSNRqAs +LSqIT3fwYGoeqy259jVDiQBvsP70xDos5NdZTpejynb8CjeeHrytbMGlP4xEd03lBpAYn PercNYZ60u2zUGTZL236bA562p4FzPVzeufQy1wgL256VkxnHeUbDf2kTtMyjl6AGWD0ZN a/A58ogwbPClx5hM8aT7FeknmU+YtAt9eo+7YXd4aYAHIZwpmF0/pEGn3o+UJDHGLboXtl XCu7QFPi4s6wei6I/RiM+XRlfhiICEPZMun5q2uGUnD4z8yGwr7PsLrBTBb56g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646145605; a=rsa-sha256; cv=none; b=Ga/Od1J1DwbCj7UZJifyn/yF2UpEPx5vAXcOujgbZb8wCUG85Ny0f/A4ZCMhIjBucsd/pv UHD4zzNusec3ANUXdFK7fY5p7uwL4RpX0+7QfI0bMy4WKjkS4Yy/q/Ebl+HC3lxlcM601n xbQQPBsbxpFqnJM88F5AbQVdgIQ2epcBsJ+b6hRgh+P0NVHKUxuGojeyQA7e2zjU7Wxy// v5enOgtQxZ4mYl5pK7VNyTP2Vy0KmO9xWgS0WXM5jWkPDmSzarRrns9V65QYzGivk+XSwD yrb90yGsQp0BLEv7EvzDVTqC+DaoenUkDEPMNhCug5ffnLuMOheIK5R9ylNgVQ== 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=5cf3a8216e3adad06f1ab02c9a9b201cebcd4809 commit 5cf3a8216e3adad06f1ab02c9a9b201cebcd4809 Author: Mark Johnston AuthorDate: 2022-03-01 14:06:15 +0000 Commit: Mark Johnston CommitDate: 2022-03-01 14:39:44 +0000 riscv: Add pmap helper functions required by four-level page tables No functional change intended. Reviewed by: jhb MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34276 --- sys/riscv/riscv/pmap.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 1d46e9e817c1..2bd8f8843a57 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -363,13 +363,45 @@ pagezero(void *p) #define L2PTE_TO_PHYS(l2) \ ((((l2) & ~PTE_HI_MASK) >> PTE_PPN1_S) << L2_SHIFT) +static __inline pd_entry_t * +pmap_l0(pmap_t pmap, vm_offset_t va) +{ + KASSERT(pmap_mode != PMAP_MODE_SV39, ("%s: in SV39 mode", __func__)); + KASSERT(VIRT_IS_VALID(va), + ("%s: malformed virtual address %#lx", __func__, va)); + return (&pmap->pm_top[pmap_l0_index(va)]); +} + +static __inline pd_entry_t * +pmap_l0_to_l1(pd_entry_t *l0, vm_offset_t va) +{ + vm_paddr_t phys; + pd_entry_t *l1; + + KASSERT(pmap_mode != PMAP_MODE_SV39, ("%s: in SV39 mode", __func__)); + phys = PTE_TO_PHYS(pmap_load(l0)); + l1 = (pd_entry_t *)PHYS_TO_DMAP(phys); + + return (&l1[pmap_l1_index(va)]); +} + static __inline pd_entry_t * pmap_l1(pmap_t pmap, vm_offset_t va) { + pd_entry_t *l0; KASSERT(VIRT_IS_VALID(va), ("%s: malformed virtual address %#lx", __func__, va)); - return (&pmap->pm_top[pmap_l1_index(va)]); + if (pmap_mode == PMAP_MODE_SV39) { + return (&pmap->pm_top[pmap_l1_index(va)]); + } else { + l0 = pmap_l0(pmap, va); + if ((pmap_load(l0) & PTE_V) == 0) + return (NULL); + if ((pmap_load(l0) & PTE_RX) != 0) + return (NULL); + return (pmap_l0_to_l1(l0, va)); + } } static __inline pd_entry_t * @@ -390,6 +422,8 @@ pmap_l2(pmap_t pmap, vm_offset_t va) pd_entry_t *l1; l1 = pmap_l1(pmap, va); + if (l1 == NULL) + return (NULL); if ((pmap_load(l1) & PTE_V) == 0) return (NULL); if ((pmap_load(l1) & PTE_RX) != 0)