From nobody Wed Nov 11 16:49:53 2026 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 4jPqJ20tVKz70Sg9 for ; Wed, 11 Nov 2026 16:49:54 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jPqJ16wx4z4mrD for ; Wed, 11 Nov 2026 16:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794415794; 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=HI9BnxShhk4I+c77W5vg2dzuTsGqYXA6ydaULA7P+8Y=; b=OaWyBtHYVeiw69luNolv8x2l4+hEUJ6h2aW16d6EH50tM3DG7FjSmKWS3kEDXnGRTpmHpW 5e5JTq/r+lAT6TUMW5JdBzRsESuS6pll31Xr4siAelZjTiShe32/4jeCy9kI83x2fBGC6E RnQvtXvKjcc83NJ246btcYLqOv1ku0q3ISL4Bjtse5YGsLVk20YH+PgAZ332gqSM0EkBNk /+RMC6tQZgCLxndt4UJSARBFESmO+jC+B58AE9C1e/yAwBdVDb0K6utKLQjSb79kLUM191 5/g5BZXONtPjlVig5zcQ0PwzGCeiiZPLGQb5S/clm+mQioyA5pdCSQrXllK9eg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794415794; b=q9EAeJYsAzZh0iwPfPTsfS484Sp52Ai1m51Snx2EQNpQc7QdryWW6bcriPM1EMktU1mC6W LEEdFux0FTyDHhkBmCZz0apWY0MzqN76QsR9P1C1MExVY1ks8IVOrhE8f3rdz4ILMWmYaN wDGyg7DRSprf2KOz0xiENnjlg5y5/J1Du/BWEy8Zz2qkI+r+u5X1L8r0n6KPS0/05yAIU0 jiBGUu6qCbijgkkMMHv3USN1hGa9AGlTwC6fXxOgXz3yfpjVjRkKylcKJNGs90kcC5rOfx bkuMA8H4i3Gdodhqrg4ZVpfaydkSb0KqbUI9ZHvIpsEbi+ZqWP92wAmbE2dcgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794415794; 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=HI9BnxShhk4I+c77W5vg2dzuTsGqYXA6ydaULA7P+8Y=; b=YBuaMYso8ZcFbRaVs+PhRzg7g/FOPXBWKHtdOIYgoAdWK4V4I/Gg6etUrCDKWFPG1TQwdr wo2yJ7u3M0svuo/MAzZIWctzSutcNevPwRchQKxq0qOh00tcNyc/bATtTNvFRrQtMiprWV dyWY/4Z9DgMqR16UtgQ4xVQEJzoe9o7IkoIurntrCA2yXM2Ikf5oARtTUnKuGAya5ykeRV hQEsNQ2Bgy21dvcwi/KQMWBkCguGtXERfZOGGypIJG2IS+IZW2HhioqxttuTvgPiYvBQrY 3qYxa9TP+BEpMmd/aaLRgPikXRdF90V08wXpS3GD67NOL/criRbdOJYv4f4NwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jPqJ16RQyzN72 for ; Wed, 11 Nov 2026 16:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cc5d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 16:49:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: da507ac5503d - main - pmap: Fix some bugs around accounting of wired mappings List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: da507ac5503d9af35f5aff4a7a773f6a92746e4a Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 16:49:53 +0000 Message-Id: <6af49cb1.1cc5d.571efd53@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da507ac5503d9af35f5aff4a7a773f6a92746e4a commit da507ac5503d9af35f5aff4a7a773f6a92746e4a Author: Mark Johnston AuthorDate: 2026-11-11 14:15:35 +0000 Commit: Mark Johnston CommitDate: 2026-11-11 16:49:42 +0000 pmap: Fix some bugs around accounting of wired mappings The amd64 and arm64 pmaps failed to decrement the count when tearing down a 1GB largepage mapping. The riscv pmap failed to decrement the count when unwiring a superpage mapping. Reported by: alc Reviewed by: bnovkov, alc, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D61414 --- sys/amd64/amd64/pmap.c | 2 ++ sys/arm64/arm64/pmap.c | 3 +++ sys/riscv/riscv/pmap.c | 2 ++ 3 files changed, 7 insertions(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 12c17a8ced64..d6c2636d5844 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -6394,6 +6394,8 @@ pmap_remove1(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, bool map_delete) MPASS(pmap != kernel_pmap); /* XXXKIB */ MPASS((*pdpe & (PG_MANAGED | PG_G)) == 0); anyvalid = 1; + if ((*pdpe & PG_W) != 0) + pmap->pm_stats.wired_count -= NBPDP / PAGE_SIZE; *pdpe = 0; pmap_resident_count_adj(pmap, -NBPDP / PAGE_SIZE); mt = PHYS_TO_VM_PAGE(*pmap_pml4e(pmap, sva) & PG_FRAME); diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index c65de8094dcc..c7fa75d1f25f 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -4598,6 +4598,9 @@ pmap_remove1(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, bool map_delete) pmap_load(l1), sva, eva, va_next)); MPASS(pmap != kernel_pmap); MPASS((pmap_load(l1) & ATTR_SW_MANAGED) == 0); + if ((pmap_load(l1) & ATTR_SW_WIRED) != 0) + pmap->pm_stats.wired_count -= + L1_SIZE / PAGE_SIZE; pmap_clear(l1); pmap_s1_invalidate_page(pmap, sva, true, TLBI_TTL_L1); pmap_resident_count_dec(pmap, L1_SIZE / PAGE_SIZE); diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 66dd65747f13..097d16590268 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -4069,6 +4069,8 @@ retry: panic("pmap_unwire: l2 %#jx is missing " "PTE_SW_WIRED", (uintmax_t)l2e); pmap_clear_bits(l2, PTE_SW_WIRED); + pmap->pm_stats.wired_count -= L2_SIZE / + PAGE_SIZE; continue; } else { if (!pv_lists_locked) {