From nobody Tue Oct 24 13:38:18 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 4SFCn719Vtz4y3rh; Tue, 24 Oct 2023 13:38:19 +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 4SFCn624Y3z4Z3w; Tue, 24 Oct 2023 13:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154698; 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=1ahNXjxPJSD7vmTRLJX5AFCeete2Ruei+7rR+cX6kbM=; b=JhFB/inKq51q68k3A5VeWDr6O2tV3canNxwL00mA3qjry5AEGFZf0gla9tj8QpHFTS2nNa VVNWjASRvwivLOfQ4DzxgUjMeTLw5XCKJW/9pUewP7WxEDy7IFcj5cO6zcvo1DnlmVILjF ROONIKY0Z7nJVqFE5Jd54Vaf69+QwWVf1F39POuq+jOvhSUy18XVdplMHEyXDgP2H8vtt9 5sNwqaFFTaBAt6Xb0f7voYyOB2Dp9/IydeOJZ+L/vqFRoEp6DSl/wMLGD6PTLwowPi7j96 xUMbsf3RrTpB5fuqjDcSlgMEyvboSM0ns7nn57g7DTWOLKPvTX9Evsuedue50A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154698; a=rsa-sha256; cv=none; b=VWUv19oLKDFZi86QM3G0qWkvlInXo+z4uGpnarTv3e9wGHVtTm8N3MiBegNLppTAyRvDmq sJoG2wI8pcqAbDIcrRCuGtXNz3FqF/1NDBaZm5Nc83XeonviWU4iZiFXJMnG7Dz7xMz7TX e06VFIGAs5TuxE2N76Ay0LQlvIG6LAOIMRyqlfgfue3Fx/zDkHY9sT8GF0PZvfQGGt2e2p K2pcU+2Y0W1lzfXAQcshvHEvuKfvUWD7PJuP26n/MRrjsJIgCAnocLM+n0+vA52KySZknO U0JY8rZ6BXHAw43iZeQCcNNBE9E4xjW+xqwBnJWdigTwp6+uiMDeWdeFELvY+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154698; 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=1ahNXjxPJSD7vmTRLJX5AFCeete2Ruei+7rR+cX6kbM=; b=h5V8iGC2vAU985Xik2zL+JdBhgWiWIZUOmrS+hZTBwt3BKUlZa2/oh+trMrUYEPN1j4+cW 8Y1kV6yHCQKfkE99Q0736Mvglx7PPQs9xoNIQ8FpChKDO2DiJ4oh9VBRuVo/+US6wZPO3s RAvWWdb050Qux2gMqy8BE8aLPCg1rIf1oG8+mvdnR9Rklg/QSoxkC7JikN9DtWc4LOYOOo Rv1VH6845qHJaxwvdTD6M6JL7c2kXYtga/u73xeRBdiBqwwthImoqaSBRbgYWLMIjL5r54 urJrHkbD7PbOV0xbhbjV80BCMJl0pb8cuMHDkot6i3sVofNJDo1qZsakJ4lTzQ== 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 4SFCn613P1z9d2; Tue, 24 Oct 2023 13:38:18 +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 39ODcIjr089073; Tue, 24 Oct 2023 13:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODcI2Q089070; Tue, 24 Oct 2023 13:38:18 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:18 GMT Message-Id: <202310241338.39ODcI2Q089070@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: ab6bc4893e4d - stable/14 - arm64: 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: ab6bc4893e4d0d0932b023c48231c7bb63c0baf2 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ab6bc4893e4d0d0932b023c48231c7bb63c0baf2 commit ab6bc4893e4d0d0932b023c48231c7bb63c0baf2 Author: Bojan Novković AuthorDate: 2023-10-09 00:38:08 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:17:37 +0000 arm64: 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 a step towards reverting commit 64087fd7f372. Reviewed by: alc, markj Sponsored by: Google, Inc. (GSoC 2023) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41634 (cherry picked from commit 808f5ac3c6dcbe38f505c0c843b0a10ae154e6ec) --- sys/arm64/arm64/pmap.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index a30a037c8d4a..6f2afa0b98a3 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -4797,6 +4797,7 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, struct spglist free; pd_entry_t *l2, old_l2; vm_page_t l2pg, mt; + vm_page_t uwptpg; PMAP_LOCK_ASSERT(pmap, MA_OWNED); KASSERT(ADDR_IS_CANONICAL(va), @@ -4864,6 +4865,24 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, } } + /* + * Allocate leaf ptpage for wired userspace pages. + */ + uwptpg = NULL; + if ((new_l2 & ATTR_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 = NL3PG; + } if ((new_l2 & ATTR_SW_MANAGED) != 0) { /* * Abort this mapping if its PV entry could not be created. @@ -4871,6 +4890,16 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, if (!pmap_pv_insert_l2(pmap, va, new_l2, flags, lockp)) { if (l2pg != NULL) pmap_abort_ptp(pmap, va, l2pg); + 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: failure for va %#lx in pmap %p", va, pmap);