From nobody Sat Dec 02 21:55:59 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 4SjNzM3NkNz52n15; Sat, 2 Dec 2023 21:55:59 +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 4SjNzM2xYGz4pnl; Sat, 2 Dec 2023 21:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554159; 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=emrHU9k9OQkByFQdqtja6B2VLt9GkLCYWB8/B9hiLaE=; b=wrtltIhrhQPIz7MOYC/a0cbY+9TCIk1yeQjaJ+y2KkYJbOk85HaleqxusopHYJfrB4K6QV 2tKR9/wyMQMKK+zx5zlpdkxBRtQ2Sz7OXW0hAPr0tHov5f+IPZZhKKI6/xeJm+fUmNucc9 iwIbUiOQYLbLxBdJ3ygV46bW/Wpa3e46v/d+KMSPXHtnRZ11rDfAwwx9M0XfDKSQGN733R iXi8Sy2yRYhWBsj4bOng+ysIuAzk4hr1egcl6YZLOBGx65x/HyRSKpeACNcWW3RNaH2pbP wgsLW0J/bBN0fyx15fVEWv2MomEUnEQU7r+mYv6vb5193JwGBrpEmem+I+ivZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554159; 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=emrHU9k9OQkByFQdqtja6B2VLt9GkLCYWB8/B9hiLaE=; b=PbwxjYbJLD4DqEGX4gtkpNiS6PR+5Bd7dnH4taeABjiOzYmtVf9faOqUSc/Z8wKTxu8cuq PKcSoqXqCnf1eWTO6B90hbJoqKdvlggjUMgcr5ETMeH9tw03Vn9Z4qB0HIZ/wwO1qWBYhH qox2OOBm1P0CW7mQrOU+tVrsDin/N3j8YHtb7yRorHB/Nr7uRfwsEIbAWw3fx7Dkibq0JI E17B0R2VIbIltZf+QH6xIvwlTnl/07FYjqB3/5TfLWS8qVArBTuYAKKXAQyLxZc/txuG56 8pSpSAf15fpgWN/LoWiPh91SJjSJM2PqpvLLIZknxxsiSJ4NG/eG1Ly/2j0fCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701554159; a=rsa-sha256; cv=none; b=Fp3shXpuRYPbA0QCnYb+LOYheO3EBXB29isie3PmI/nsYhiTVTbJSzPwscJP2d1/Sa50xD m3pWcbPuku/EEvl/fulGXmbHy1qzjOYM5dMzD5EWk7bb7ItYXBniOzNCAeyHUUq6uf6N5I nq/C4ESKVK4HcljkG6/ZJoCoExDmpJrjyQ/4rKpHjUiiWQA5ICIWdeShBSeJjJO4ETVqcv 2hqGo7wIVZ/EKDJKzwnoiU/yn18GY5M8qOeNpjIEOqzyFIgPuSIT4b3225T6FnqdRwU8sl +T83WoYhm1Cgvt1st/AEkPW0aRPOg7FD+e9QTcEzyJB473eKg+fq/UPkx5U0+Q== 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 4SjNzM1n0NzYjv; Sat, 2 Dec 2023 21:55:59 +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 3B2Ltx2U034780; Sat, 2 Dec 2023 21:55:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2LtxNZ034777; Sat, 2 Dec 2023 21:55:59 GMT (envelope-from git) Date: Sat, 2 Dec 2023 21:55:59 GMT Message-Id: <202312022155.3B2LtxNZ034777@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: 0a13f4d7934f - stable/14 - riscv: Port improvements from arm64/amd64 pmaps, part 3 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: 0a13f4d7934fe1af776f5ec60d5159a59a1a5575 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0a13f4d7934fe1af776f5ec60d5159a59a1a5575 commit 0a13f4d7934fe1af776f5ec60d5159a59a1a5575 Author: Mark Johnston AuthorDate: 2023-11-02 18:34:07 +0000 Commit: Mark Johnston CommitDate: 2023-12-02 21:54:35 +0000 riscv: Port improvements from arm64/amd64 pmaps, part 3 - Let pmap_enter_quick_locked() trigger superpage promotions. Reviewed by: kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D42290 (cherry picked from commit 0b8372b707a50c2deeaf66d4c55fec51007cec44) --- sys/riscv/riscv/pmap.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 376027c8be8e..79248c4c1fcd 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -3399,6 +3399,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, ("pmap_enter_quick_locked: managed mapping within the clean submap")); rw_assert(&pvh_global_lock, RA_LOCKED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); + l2 = NULL; CTR2(KTR_PMAP, "pmap_enter_quick_locked: %p %lx", pmap, va); /* @@ -3497,6 +3498,26 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, pmap_store(l3, newl3); +#if VM_NRESERVLEVEL > 0 + /* + * If both the PTP and the reservation are fully populated, then attempt + * promotion. + */ + if ((mpte == NULL || mpte->ref_count == Ln_ENTRIES) && + (m->flags & PG_FICTITIOUS) == 0 && + vm_reserv_level_iffullpop(m) == 0) { + if (l2 == NULL) + l2 = pmap_l2(pmap, va); + + /* + * If promotion succeeds, then the next call to this function + * should not be given the unmapped PTP as a hint. + */ + if (pmap_promote_l2(pmap, l2, va, mpte, lockp)) + mpte = NULL; + } +#endif + pmap_invalidate_page(pmap, va); return (mpte); }