From nobody Sun Aug 10 23:23:41 2025 X-Original-To: dev-commits-src-all@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 4c0Yjp0CTNz63X4L; Sun, 10 Aug 2025 23:23:42 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c0Yjn6NVvz3fdv; Sun, 10 Aug 2025 23:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754868221; 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=gD1NDPLPmos2iAzzEYmjO8L6TCd1iiX6ppJ/J3jjlSY=; b=edK53LAGyGRQHAS5Ovvznjp4o48jNSJNyaLK5l09gpgxh5691pLiy0h2XWNv1021M00HWH qw5lWJmjHBaciDpK5ltl76Y6lPK/3/kr+p5F96+vagoHl0i2UbTFgT861wyEeY3qaqBtIB TJL/8SRWjoTGhMxrcNbhHXxYpcca97EQnJzZCAUy2oP/wTlmWrnvOWinrMxEsswGmRL74l 7ExQ2PpRnYOb7SFCoaJn9k3adc/MZQKPqeGrl5+YymU22tm0qQBZLVgql1X9mOAF+i2jZl FVxZxtbjj/g6JhCVwv6fuTw0xW/DzY7yal5oHu5HHeotHWnhplRtbqiI1tAGQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754868221; 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=gD1NDPLPmos2iAzzEYmjO8L6TCd1iiX6ppJ/J3jjlSY=; b=nTYIyJnOQoYNq/0mSN3svSjpvTCbiO4HqBmu0Ve0xHLHgXotvDfJ/CixYe8fWPXMsTWLXw RAuhI8HSimzzNnPHFRqvVXnY3+0kWwnQm204wBWI3YXSg3gmzFjZVAhc7kiEquhEdpjNkT E+JGbbQ0uou0aDKqF4DbC1Qe0/16SkWnUXNF/tCRah/sV1hjO5Odn5bcEY+a1Yn7qG5zw3 3SMaqQEyysx9MG+Si3exl8xcyN6p/yJR8YMuDttPiJKB81DXSkCGK5/BVJLXKtW3qTuNEY M7CyYvN0kI8eruN/OlPHBk6oXe0n9H0FggTNolOfXOlw0WGjmYULLpyRYcXkjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754868221; a=rsa-sha256; cv=none; b=G5zhPH+8G0tYIMX09DCOApdJTloBZmxNOqXD+ghRlhvSOYwe4sFm1Bgebgzd5c1lkLqt32 a6wXmebZiQCDJ0MbKycDMyMf0mAeKetoGSu7r3P4yuY4hXNuvcX3MLYHT9zpMtjatDBqlR 7WCsMWOE9RVmnBX6qwvZFNFy3lwJB086pGf7cYq3IqXOxUhSLk1SrZ6cVGg9NWNOuNGwAo 7rAoN+3O5/7KBZK7D2Owj/7t+AyM7kYQY0gj1FVa7zIzBzDfCEUZO1v2VAI++r8G1VrCj1 yZOX+ZPCQIUBD6HBkEzeUcLpqekZqb7i85e9UcHrr80+GFfajsJm2CHpC+pPjA== 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 4c0Yjn6040zBbC; Sun, 10 Aug 2025 23:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57ANNfXb054100; Sun, 10 Aug 2025 23:23:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57ANNfvk054097; Sun, 10 Aug 2025 23:23:41 GMT (envelope-from git) Date: Sun, 10 Aug 2025 23:23:41 GMT Message-Id: <202508102323.57ANNfvk054097@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Cox Subject: git: f406b54c806a - stable/14 - pmap_enter_{l2,pde}: correct the handling of an error case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alc X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f406b54c806a3348ef4d4aab5e7290ce74ba9d71 Auto-Submitted: auto-generated The branch stable/14 has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=f406b54c806a3348ef4d4aab5e7290ce74ba9d71 commit f406b54c806a3348ef4d4aab5e7290ce74ba9d71 Author: Alan Cox AuthorDate: 2025-07-16 08:08:49 +0000 Commit: Alan Cox CommitDate: 2025-08-10 16:01:06 +0000 pmap_enter_{l2,pde}: correct the handling of an error case When pmap_enter_object()'s call to pmap_enter_{l2,pde}() fails to create a managed mapping within the kernel address space due to the inability to allocate a PV entry, it needs to remove the kernel page table page from the pmap's trie of idle page table pages. Previously, it did not. (cherry picked from commit 5a846c48f209d04dad36aa35a9968f557c4516f7) --- sys/amd64/amd64/pmap.c | 11 +++++++++++ sys/arm64/arm64/pmap.c | 12 ++++++++++++ 2 files changed, 23 insertions(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index ba0ce76c5335..8aea7ad6d622 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -7500,6 +7500,9 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, u_int flags, PG_RW = pmap_rw_bit(pmap); KASSERT((newpde & (pmap_modified_bit(pmap) | PG_RW)) != PG_RW, ("pmap_enter_pde: newpde is missing PG_M")); + KASSERT((flags & (PMAP_ENTER_NOREPLACE | PMAP_ENTER_NORECLAIM)) != + PMAP_ENTER_NORECLAIM, + ("pmap_enter_pde: flags is missing PMAP_ENTER_NOREPLACE")); PG_V = pmap_valid_bit(pmap); PMAP_LOCK_ASSERT(pmap, MA_OWNED); @@ -7629,6 +7632,14 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, u_int flags, if (!pmap_pv_insert_pde(pmap, va, newpde, flags, lockp)) { if (pdpg != NULL) pmap_abort_ptp(pmap, va, pdpg); + else { + KASSERT(va >= VM_MAXUSER_ADDRESS && + (*pde & (PG_PS | PG_V)) == PG_V, + ("pmap_enter_pde: invalid kernel PDE")); + mt = pmap_remove_pt_page(pmap, va); + KASSERT(mt != NULL, + ("pmap_enter_pde: missing kernel PTP")); + } if (uwptpg != NULL) { mt = pmap_remove_pt_page(pmap, va); KASSERT(mt == uwptpg, diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index f8dec0d3a82b..05cb0df4a1ae 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -4822,6 +4822,9 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, PMAP_LOCK_ASSERT(pmap, MA_OWNED); KASSERT(ADDR_IS_CANONICAL(va), ("%s: Address not in canonical form: %lx", __func__, va)); + KASSERT((flags & (PMAP_ENTER_NOREPLACE | PMAP_ENTER_NORECLAIM)) != + PMAP_ENTER_NORECLAIM, + ("pmap_enter_l2: flags is missing PMAP_ENTER_NOREPLACE")); if ((l2 = pmap_alloc_l2(pmap, va, &l2pg, (flags & PMAP_ENTER_NOSLEEP) != 0 ? NULL : lockp)) == NULL) { @@ -4928,6 +4931,15 @@ 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); + else { + KASSERT(ADDR_IS_KERNEL(va) && + (pmap_load(l2) & ATTR_DESCR_MASK) == + L2_TABLE, + ("pmap_enter_l2: invalid kernel L2E")); + mt = pmap_remove_pt_page(pmap, va); + KASSERT(mt != NULL, + ("pmap_enter_l2: missing kernel PTP")); + } if (uwptpg != NULL) { mt = pmap_remove_pt_page(pmap, va); KASSERT(mt == uwptpg,