From nobody Sat Dec 02 21:56:02 2023 X-Original-To: dev-commits-src-branches@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 4SjNzQ61P3z52npH; Sat, 2 Dec 2023 21:56:02 +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 4SjNzQ5TCnz4q81; Sat, 2 Dec 2023 21:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554162; 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=tsgoK/ZieH9eg5dkmk78P3yGdWK9JMu8C5GTjHlV59U=; b=KHp9RRuzcb3q0zWm+iFYyTZb/zuF3JQd7/vwE/f9D9u9mvwdyQaxFXGvwHOZDG+rbLXrtT ZvJ7CtL2f+A0BEG/PmuiLEtO4DPCqBoWZxACbBuuyC/alOrMJ9iZHhpvq7lL9OMaO2rkwN ec/KBcWHEBF3bnZE4WcwX75Ff2d38RSV8P3Izh3yydDBkPjUF1DX24L9g2X90EGQMK/130 8TZOq5O8fWr7YhTRV4lhRUuINvzTfb+bNrcrB3dBumTBR8/SxK/tCCUim/OcQVYkPvf2p+ NmJpsxSI1WPwCNOC8BhFCkeukH/sm91kwrzkXtb+6P2z+VZkzJUY+e8pQdgTAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554162; 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=tsgoK/ZieH9eg5dkmk78P3yGdWK9JMu8C5GTjHlV59U=; b=wSGNDNej1l9Tgypwt/ElcK73i9IkWYI6fIBK8Qx7gOvFnCfGHva9Y0SDqf0qq6WRJoKjtF hKLtoS8Acr4YHOe/7OTAXkqhAPyjVBCkwRmvQvU9rH+T0FPB06IhWEL229aDuWU4wMoF8i V/wHQuMh3vezLq4NHClf9beeOrUnKXsNiW2aqx2qI/GT5PHN5lqePmxZ5B83yvI3sFERrl 7vhQN8fQ2U5wdDjBQAm/wPyLoxJ1IiJelHyYHX7xWX1NhALm44WCqC0viVYfKvDKgsUOHi EnUxWZR7QmaKxwS7NaFOQXtbldrQz37iuL98EsuSA7jhpkivqBtSrU8hENhhfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701554162; a=rsa-sha256; cv=none; b=QfkdC6pLcmVrFTaeADK80g4FbfTQ9qJTaFEphSOB7/TCM+7ejSu4p7IGW9dxTaQaxNIm6L 86cB6ys0bu5UbkV7f1m9HDIM4hcNw76RCNzqRTp0nfLSDf4xfTGUA+Dgbnn8tmDErrZuAp 0oSH49n+Saty9ohs+mi9ga5S/AVJkrHjJx6mgJyRfvwGEnagdyYQHmEb/nyzW/XteFYALj +wBt/05Jq1rMK2Ei0PCozr1jbUvdtV7E5NfxKzYLTL4VvvY07FskhAPYxdhfCoOK4BPmTY ABATDZ0NxwhNQFaEElrdyC9VOCaJnpKRqJurVDai0xzoD+kx3tIh3tILch5zrA== 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 4SjNzQ4W4MzZ8c; Sat, 2 Dec 2023 21:56:02 +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 3B2Lu2VC034950; Sat, 2 Dec 2023 21:56:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2Lu2vF034947; Sat, 2 Dec 2023 21:56:02 GMT (envelope-from git) Date: Sat, 2 Dec 2023 21:56:02 GMT Message-Id: <202312022156.3B2Lu2vF034947@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: 998d0babdde6 - stable/14 - riscv: Add a leaf PTP when pmap_enter(psind=1) creates a wired mapping List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 998d0babdde6e58e2675487cd12da97f4d625d9d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=998d0babdde6e58e2675487cd12da97f4d625d9d commit 998d0babdde6e58e2675487cd12da97f4d625d9d Author: Bojan Novković AuthorDate: 2023-11-08 10:20:06 +0000 Commit: Mark Johnston CommitDate: 2023-12-02 21:54:37 +0000 riscv: Add a leaf PTP when pmap_enter(psind=1) creates a wired mapping Let pmap_enter_l2() create wired mappings. In particular, allocate a leaf PTP for use during demotion. This is the last pmap which requires such a change ahead of reverting commit 64087fd7f372. Reviewed by: markj Sponsored by: Google, Inc. (GSoC 2023) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41633 (cherry picked from commit d0941ed9b5c39d92d0aa75bc253506cb59a2e9a1) --- sys/riscv/riscv/pmap.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 8bd5b5e9374d..8ddc31bed81c 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -2679,6 +2679,8 @@ pmap_demote_l2_locked(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, ("pmap_demote_l2_locked: oldl2 is not a leaf entry")); if ((oldl2 & PTE_A) == 0 || (mpte = pmap_remove_pt_page(pmap, va)) == NULL) { + KASSERT((oldl2 & PTE_SW_WIRED) == 0, + ("pmap_demote_l2_locked: page table page for a wired mapping is missing")); if ((oldl2 & PTE_A) == 0 || (mpte = vm_page_alloc_noobj( (VIRT_IN_DMAP(va) ? VM_ALLOC_INTERRUPT : 0) | VM_ALLOC_WIRED)) == NULL) { @@ -3211,6 +3213,7 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, pd_entry_t *l2, *l3, oldl2; vm_offset_t sva; vm_page_t l2pg, mt; + vm_page_t uwptpg; PMAP_LOCK_ASSERT(pmap, MA_OWNED); @@ -3268,6 +3271,24 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, ("pmap_enter_l2: non-zero L2 entry %p", l2)); } + /* + * Allocate leaf ptpage for wired userspace pages. + */ + uwptpg = NULL; + if ((new_l2 & PTE_SW_WIRED) != 0 && pmap != kernel_pmap) { + uwptpg = vm_page_alloc_noobj(VM_ALLOC_WIRED); + if (uwptpg == NULL) { + return (KERN_RESOURCE_SHORTAGE); + } + uwptpg->pindex = pmap_l2_pindex(va); + if (pmap_insert_pt_page(pmap, uwptpg, true, false)) { + vm_page_unwire_noq(uwptpg); + vm_page_free(uwptpg); + return (KERN_RESOURCE_SHORTAGE); + } + pmap_resident_count_inc(pmap, 1); + uwptpg->ref_count = Ln_ENTRIES; + } if ((new_l2 & PTE_SW_MANAGED) != 0) { /* * Abort this mapping if its PV entry could not be created. @@ -3284,6 +3305,16 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, pmap_invalidate_page(pmap, va); vm_page_free_pages_toq(&free, true); } + if (uwptpg != NULL) { + mt = pmap_remove_pt_page(pmap, va); + KASSERT(mt == uwptpg, + ("removed pt page %p, expected %p", mt, + uwptpg)); + pmap_resident_count_dec(pmap, 1); + uwptpg->ref_count = 1; + vm_page_unwire_noq(uwptpg); + vm_page_free(uwptpg); + } CTR2(KTR_PMAP, "pmap_enter_l2: failed to create PV entry" " for va %#lx in pmap %p", va, pmap);