From nobody Sun Nov 22 17:09:44 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 4jXbCr43ZNz72Fc0 for ; Sun, 22 Nov 2026 17:09:44 +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 4jXbCr3WJCz3Crs for ; Sun, 22 Nov 2026 17:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795367384; 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=cr9uwgnv6A5MU+ssSpHTVIKUEoxWPjJmARTj4zWsp04=; b=m+zYgTFcEEu7gnQoFgKIRKNnYCnqOMQBMXPVSsMtLg4XT/7AzwRn6EvBSXCTPUUJ4ggLT9 oywEcvT7Nn/uRsrIDp8263C236J7/tPtkQDlKhTyPnggCEAZsNUTYgOL4SQk0GIKBX4jvb bAlTg1zbtiKbi6CO83qO2De56kU0KvZUwsEf2KYMWJNmM9IUFrv4cVkuduOcO5jgUym3DH 9n1NtMPiCxM8K/XbJAXgMWR3LqlRbvFBKkT8GZOuTMqUASUWfwE6PLhfBxH3mVw6wVGnS9 0DPVXGhDMrbBrW7l8tFavqs8EN4sxHVYH81xwWdATdmAe9QLxbbQOVuZZv5xyA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795367384; b=RVwyYm3xqwSrb54I8XQfWaurlLZx4Xoodq2cyiVFPIdWxU1aIFDt9kCtcJR7GTQ37yqGQZ Iznqu2KVDysPFLiw2lIeMreVTdkZtrnNeceINjtTv4YyR1Fh9S3puxioO57vtn4dhTPvp/ zjVxYpvdTjdgXqXrol2YurBgD7jfLKAZUFSx6lhEk45TkPhPbNpdW5mZXHbiz/i7MckvuH 9t869ipW5HAbAYylh+PpHWnNd7uBAY5Bck90Jev+mrGFl33kaF2b5F0KCg/F7/sw8AQQsl BUnbie/X08z8XX8K/J8UEW2che2cmPBqokCX1+w03tPyVo+9hOHergkwWjO19g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795367384; 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=cr9uwgnv6A5MU+ssSpHTVIKUEoxWPjJmARTj4zWsp04=; b=XLST+fSdL1idxCzRXOXxiVepaFhv6taF79JsWItknyFo5uGgE4zrCJrKEH+vT7DVB4I712 +bsDSBAc9iXZGeq5H/aVZH5pTJGNjiGgGHbADSQkAYdLJOielG9uGosGcQfqIbL5CA2Cd9 j0J0SRTDk7Ta1/pfLwul0LAjNXsyNBvEt5wDnSJTZr89lq6o2X9UBUmB++BZKreS3Nl9ua RZ/rGCv1jvxnc9AkUfZt1HAiHmWiVShaqRzXgvHyQ+R2n42aM38sFPiDgvaH4U2Edemo3L x3v97ELk1vimaD68Y9znQgPW/7p+PzPksoJUDBjxUl1FiAcgD6AWSD4Ik2omtg== 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 4jXbCr33Vdz1RFt for ; Sun, 22 Nov 2026 17:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 17386 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Nov 2026 17:09:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: d222889396ea - main - arm64 pmap: Sync the icache in pmap_enter_largepage() 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: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d222889396ea45cd4547fa92f25dd28e908db515 Auto-Submitted: auto-generated Date: Sun, 22 Nov 2026 17:09:44 +0000 Message-Id: <6b0321d8.17386.1bf58449@gitrepo.freebsd.org> The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=d222889396ea45cd4547fa92f25dd28e908db515 commit d222889396ea45cd4547fa92f25dd28e908db515 Author: Alan Cox AuthorDate: 2026-11-21 19:53:09 +0000 Commit: Alan Cox CommitDate: 2026-11-22 17:08:26 +0000 arm64 pmap: Sync the icache in pmap_enter_largepage() Unlike pmap_enter(), don't test PGA_ICACHE_SYNCED, because large pages are unmanaged. While here, assert that va is aligned to the page size, as amd64 does, and that the pmap is stage 1, which the new code assumes. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D61897 --- sys/arm64/arm64/pmap.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index e64d5a345f30..b65921d736e4 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -5532,15 +5532,18 @@ static int pmap_enter_largepage(pmap_t pmap, vm_offset_t va, pt_entry_t pte, int flags, int psind) { - pd_entry_t *l0p, *l1p, *l2p, *l3p, newpte, origpte, *tl3p; + pd_entry_t *l0p, *l1p, *l2p, *l3p, newpte, origpte, *ptep; vm_page_t mp; PMAP_LOCK_ASSERT(pmap, MA_OWNED); + PMAP_ASSERT_STAGE1(pmap); KASSERT(psind > 0 && psind < MAXPAGESIZES, ("psind %d unexpected", psind)); KASSERT((PTE_TO_PHYS(pte) & (pagesizes[psind] - 1)) == 0, ("unaligned phys address %#lx pte %#lx psind %d", PTE_TO_PHYS(pte), pte, psind)); + KASSERT((va & (pagesizes[psind] - 1)) == 0, + ("unaligned va %#lx psind %d", va, psind)); restart: newpte = pte; @@ -5579,7 +5582,7 @@ restart: (origpte & ATTR_DESCR_VALID) == 0, ("va %#lx changing 1G phys page l1 %#lx newpte %#lx", va, origpte, newpte)); - pmap_store(l1p, newpte); + ptep = l1p; } else if (psind == 2) { KASSERT(pagesizes[psind] == L2_SIZE, ("pagesizes[%d] != L2_SIZE", psind)); @@ -5610,7 +5613,7 @@ restart: PTE_TO_PHYS(origpte) == PTE_TO_PHYS(newpte)), ("va %#lx changing 2M phys page l2 %#lx newpte %#lx", va, origpte, newpte)); - pmap_store(l2p, newpte); + ptep = l2p; } else /* (psind == 1) */ { KASSERT(pagesizes[psind] == L3C_SIZE, ("pagesizes[%d] != L3C_SIZE", psind)); @@ -5628,21 +5631,38 @@ restart: mp->ref_count += L3C_ENTRIES - 1; l3p = VM_PAGE_TO_DMAP(mp); l3p = &l3p[pmap_l3_index(va)]; + origpte = pmap_load(l3p); } else { l3p = pmap_l2_to_l3(l2p, va); - if ((pmap_load(l3p) & ATTR_DESCR_VALID) == 0) { + origpte = pmap_load(l3p); + if ((origpte & ATTR_DESCR_VALID) == 0) { mp = PTE_TO_VM_PAGE(pmap_load(l2p)); mp->ref_count += L3C_ENTRIES; } } - for (tl3p = l3p; tl3p < &l3p[L3C_ENTRIES]; tl3p++) { - origpte = pmap_load(tl3p); + ptep = l3p; + } + + /* + * Conditionally sync the icache. See pmap_enter() for details. Large + * pages are unmanaged, so PGA_ICACHE_SYNCED is never set on them. + */ + if ((newpte & ATTR_S1_UXN) == 0 && + ((origpte & ATTR_DESCR_VALID) == 0 || + (origpte & ATTR_S1_UXN) != 0) && + (newpte & ATTR_S1_IDX_MASK) == ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK)) + cpu_icache_sync_range(PHYS_TO_DMAP(PTE_TO_PHYS(newpte)), + pagesizes[psind]); + + if (psind == 1) { + for (l3p = ptep; l3p < &ptep[L3C_ENTRIES]; l3p++) { + origpte = pmap_load(l3p); KASSERT((origpte & ATTR_DESCR_VALID) == 0 || ((origpte & ATTR_CONTIGUOUS) != 0 && PTE_TO_PHYS(origpte) == PTE_TO_PHYS(newpte)), ("va %#lx changing 64K phys page l3 %#lx newpte %#lx", va, origpte, newpte)); - pmap_store(tl3p, newpte); + pmap_store(l3p, newpte); newpte += L3_SIZE; } /* @@ -5650,7 +5670,8 @@ restart: * detect wiring-only changes. */ newpte -= L3_SIZE; - } + } else + pmap_store(ptep, newpte); /* * A page fault does not automatically invalidate the TLB entry for a