From nobody Sun Nov 08 04:26:22 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 4jMfxV32k5z6ybCH for ; Sun, 08 Nov 2026 04:26:22 +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 4jMfxV1LZ1z58R7 for ; Sun, 08 Nov 2026 04:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794111982; 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=sqDKCtbc2uQM0rSZkN2fT72vKhDme0oLcOCI9H7ckRs=; b=L6B3wCfSB3XBHlZ9J5lxW5l4bZPqXGAplqX0UP7/iLnOAyjNC1wb8Jh086XzrGfK28G1Ux lCOY9FSAXP1T8S135Ws5TFRNZ/VlRT0QylWcMhy8a/PEFDQCDmmEGTZu6tTu+xwQxZf32U GDLgyCPNaD8O8mySZPjzdQnz99DoT8FgIj5/AVUTYyBPsv2kNVfK/gCQNVexq2kCtguxaj hJ/hyXa+8Xz3yBNiNkalWbYBF9WVY5vtbDJavJTGGORXdEDNZgITdyHgefey0L8GGXmtWt utNX1/P++F9GFcqr0de492Tz93j77E90PEGsYINPEhkviSRe30BbvOhLKlgg7Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794111982; b=GCrak9z3B1Zrq2RVqhW0MlhgzbnRfWrDPRrut89MqsIP/GU+xwVicdBTqxr4XZ4su8T8gJ Wj8B55mptOD7E9kYFYm09/ig1C79vMF+ao/VaBIIBPlXUHTxFzeojYp0Ad9TBlP5CUwLR3 Th4tB8iSS+Q0cME0gLGqnP3JAOf9Ad3Wiq26NZcg5yEr/SH2JXkSdueHkWNkfPVacaLGO9 D1dmqqlVUKiVCTbY1eccshYKG3yKuf+KHf5P96bOgEjYYeAwDgmU+YjSJpIAau/iAnkBuT LtsS1LG9PUYaa7sPkaaafe0P8d9ngskQ3BAPg3Q3rJ/1Qg46/Xg4PPyUgc6u4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794111982; 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=sqDKCtbc2uQM0rSZkN2fT72vKhDme0oLcOCI9H7ckRs=; b=ERMCUMdxFsZRBRxm4w+/dZ1oiP2CBfF+v1IOqudxEMTSa/oTvRpwq/9AaBtnpCnVjeAMp0 oR3mPAGJHkFFKoyRxB7OsXJDmyGrmgj0aRyiKcMhTQYeUR4p99DnRpquolebyoK5rOcDyn W+xbhuL0OeXlIquVFw1Jzi8yiRXITf1Q78TMcmtkTxPT9zDmKfmTifmnsr6Wr0JXYtWcdQ r93hMWOnKh48IEI5HujEAgzYHlbKebcQPrCNh0yz9uePDcR6tVoXiuupnyqyoYV4cbMUqN NDEA/P8D9/9dFdT1YV9aViXkidDbkN10Zu9ZSistbUmnKrHxfY5ZOHQqk5b/aA== 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 4jMfxV0WMrzspb for ; Sun, 08 Nov 2026 04:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9dbb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 08 Nov 2026 04:26:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Cox Subject: git: 77fa63fa43fc - stable/15 - arm64 pmap: demote L3C pages in pmap_clear_modify() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: alc X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 77fa63fa43fc8df1cfb86476b9caff24d10de6bc Auto-Submitted: auto-generated Date: Sun, 08 Nov 2026 04:26:22 +0000 Message-Id: <6aeff9ee.9dbb.4b6f4557@gitrepo.freebsd.org> The branch stable/15 has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=77fa63fa43fc8df1cfb86476b9caff24d10de6bc commit 77fa63fa43fc8df1cfb86476b9caff24d10de6bc Author: Alan Cox AuthorDate: 2026-11-01 18:25:05 +0000 Commit: Alan Cox CommitDate: 2026-11-08 04:09:31 +0000 arm64 pmap: demote L3C pages in pmap_clear_modify() When pmap_clear_modify() demotes a dirty L2 block mapping, it write protects the L3 entry that maps "m", so that a subsequent write access may repromote. However, since fd6cb031f577, the L3 entries created by pmap_demote_l2_locked() may have ATTR_CONTIGUOUS set, and pmap_clear_modify() was write protecting one L3 entry within an L3C page while leaving the page's other L3 entries writeable with ATTR_CONTIGUOUS still set. A TLB entry that a processor creates from any of those other L3 entries may translate "m"'s virtual address and permit writes to "m" without a fault. To fix this issue, as in pmap_remove_write(), demote the L3C page before write protecting the L3 entry. (cherry picked from commit 6d7960628f825f1eec0959d6000a79ca8a4ae927) --- sys/arm64/arm64/pmap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 60915c4afc71..6c2ed9631b93 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -7983,6 +7983,8 @@ restart: */ va += VM_PAGE_TO_PHYS(m) - PTE_TO_PHYS(oldl2); l3 = pmap_l2_to_l3(l2, va); + if ((pmap_load(l3) & ATTR_CONTIGUOUS) != 0) + (void)pmap_demote_l3c(pmap, l3, va); oldl3 = pmap_load(l3); while (!atomic_fcmpset_long(l3, &oldl3, (oldl3 & ~ATTR_SW_DBM) | ATTR_S1_AP(ATTR_S1_AP_RO)))