From nobody Sat Aug 9 21:09:57 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 4bztnx5WrBz64PYM; Sat, 09 Aug 2025 21:09:57 +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 4bztnx4wS2z3P2F; Sat, 09 Aug 2025 21:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754773797; 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=T+Qjy6d9vm1bxppKJMNW9D9xbbfwSvomMyvkv0d8Xdw=; b=YgkHKqXMqMUlXjbqZgJAsuW8dhGFab9BwbuXvE//bU7C3gDn9xgIHgk5winHaLM3AoqnYG H0Gas+rNje8MPsbQiCwhF18ZBP4U9d+/nFw7BaVzWkJtM8IwqEtvLDVYjj2FIS4sRQj121 ddI5ufJIWM+sfjjLsPAtZMewCRm3d5Hi4oVfoUZoxNoo4+Sdt18oPnwN/xk+QW9VE2pj0O 6meNMlWtGtLKFU4QGQcL9kYtSaVOjjM16nTXL3UqRPkBnDfaNCsK7QZ8dCKHSqjJVhv/aO aHSExm/C6bKSdYnRWukK9NJnsKkGFjHOBi1d1b2rZ+grU97nKsA5ErPeaAcfug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754773797; 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=T+Qjy6d9vm1bxppKJMNW9D9xbbfwSvomMyvkv0d8Xdw=; b=Otukyycj258RMXrN7kd+JMp6blJdTHTyjFb44E3GkFbEJbGxkx73AaYfpsPwABkVudZsHu GD8tR5lXteF1DHeG3U7EgLaSV8EVIDAiqwoiSf3XmibQaj9zs3H7ThCohQZIaHdw085Bmh ERrvkRWV1dE6ba2pZYn54UvF1La7v6UBcGaDQfzt3nyQJfQBiT+lnbHq27tNp0G6CBRLWV njAZUv+Kk+TDHvtt+K06X2pcggoMETN/e16YE/ohxzIdOtfxtcqy/oNp49SD1Dl53uJPdF A4h7DchDH6Yx2uipTGj9RdExRtRIpv7pFfimfTCUIv09b8ZU3POSR1TmPNJgXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754773797; a=rsa-sha256; cv=none; b=WPIKIcxLoFRtb/KSavEgz+qqU8BP3Biixuph32fLlr7wyC+mDv0aEsXpdOT4Xf+dm4cFxM 3KfRbWC3DNakFM6jt3E1K/u+OdWvNnvBOlGvAnhSnbbDWtP2Sv0ytagUeoUUQdU7EHipBE kxlkL0dgg/Tgkxt75QTgnvyTAEC6wAQBO29X4fYiykztAqG1zwj6qI0nzbVGbaIENRitqa 3+HkM5tqSL4aNew/WNEM7CaimCx+P/f3FaKHsPe2+z+1+EC/TxGBmb06EGef0IR9zp43vq gtVqJxFxJAgM377yfS2ulWXhb8MHMD3G1R3KAEBaCTKTeIOS8soboMOXg7V2pA== 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 4bztnx482jzdBH; Sat, 09 Aug 2025 21:09:57 +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 579L9vu6082971; Sat, 9 Aug 2025 21:09:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 579L9vxG082968; Sat, 9 Aug 2025 21:09:57 GMT (envelope-from git) Date: Sat, 9 Aug 2025 21:09:57 GMT Message-Id: <202508092109.579L9vxG082968@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: 9810fb151938 - stable/14 - amd64 pmap: convert panics to KASSERTs 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: 9810fb151938b8ceb2e8774b85f1530f41c8241c Auto-Submitted: auto-generated The branch stable/14 has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=9810fb151938b8ceb2e8774b85f1530f41c8241c commit 9810fb151938b8ceb2e8774b85f1530f41c8241c Author: Alan Cox AuthorDate: 2025-07-06 17:42:08 +0000 Commit: Alan Cox CommitDate: 2025-08-09 21:01:10 +0000 amd64 pmap: convert panics to KASSERTs With the recent changes to pmap_demote_DMAP(), the calls to pmap_demote_pdpe() and pmap_demote_pde_mpte() should never fail, so we change the associated panics to KASSERTs. (cherry picked from commit 6a7761b4d27c99b3b548f2d948b88bf1430ee636) --- sys/amd64/amd64/pmap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 7fc17a55d2a1..b818fc6979d3 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -9979,7 +9979,7 @@ pmap_demote_DMAP(vm_paddr_t base, vm_size_t len, boolean_t invalidate) pd_entry_t *pde; vm_offset_t va; vm_page_t m, mpte; - bool changed; + bool changed, rv __diagused; if (len == 0) return; @@ -10009,8 +10009,8 @@ pmap_demote_DMAP(vm_paddr_t base, vm_size_t len, boolean_t invalidate) if ((*pdpe & X86_PG_V) == 0) panic("pmap_demote_DMAP: invalid PDPE"); if ((*pdpe & PG_PS) != 0) { - if (!pmap_demote_pdpe(kernel_pmap, pdpe, va, m)) - panic("pmap_demote_DMAP: PDPE failed"); + rv = pmap_demote_pdpe(kernel_pmap, pdpe, va, m); + KASSERT(rv, ("pmap_demote_DMAP: PDPE failed")); changed = true; m = NULL; } @@ -10021,9 +10021,9 @@ pmap_demote_DMAP(vm_paddr_t base, vm_size_t len, boolean_t invalidate) if ((*pde & PG_PS) != 0) { mpte->pindex = pmap_pde_pindex(va); pmap_pt_page_count_adj(kernel_pmap, 1); - if (!pmap_demote_pde_mpte(kernel_pmap, pde, va, - NULL, mpte)) - panic("pmap_demote_DMAP: PDE failed"); + rv = pmap_demote_pde_mpte(kernel_pmap, pde, va, + NULL, mpte); + KASSERT(rv, ("pmap_demote_DMAP: PDE failed")); changed = true; mpte = NULL; }