From nobody Mon Feb 9 18:04:25 2026 X-Original-To: dev-commits-src-branches@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 4f8syy2dykz6Rnlr for ; Mon, 09 Feb 2026 18:04:26 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8syy08D6z3tsy for ; Mon, 09 Feb 2026 18:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770660266; 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=g/s7i7YM6bS1m3bjUjKHveYkGtK0tV0fGhGPodhdjBQ=; b=FpU2rQzfFXvXYRCkTDdtS5MvuQiyLlwe6mBNlb95IGyp4oxEHJUalAnL672M/mATfOcZre Vw5Usuya4Orimgym0UW0qcltX6pEOzQlwINUtGxGt/BmA6oEt8bMD2vy7Otbq5yLd1ozig 8ivWTYvwhkEtMlioja3tXML9ltvZV3daM+KYmGODGe9OHeVf0TANBuGrdm5x98tK4YgCQh Ts+cvfbqdW1eUdIK00l+NR0a48LyW2x5uEx0NTrvCOzAgplkkB4XNcVIG5eU5F86YylaXq W9DyjvxpsnKj7clzCN8an0OitVrqpsR8Gn4dJHdRAKaHaQg8kTpEJcxSJrXLLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770660266; a=rsa-sha256; cv=none; b=txXCw83xnWiWoxTXOXpQaR/H37THgSFJMng3vXoQgJcjdqDjKOZdOVfisij8IzIQ2omI+7 JDN0ntrgO/GD4FQGUqsBEWsnTeBedzvUTVW1vGP+352teXrqwhlDR4gyCTd17aYozDykzi sWOkCrx6HFWPZlVVBAGPRhaOvht1JJFdIUCcEa4B3FN3BKwEFip6ufvEqsVs0HJiMegkeO CrGfUujiJVecDFM+ODb9okylClCjj8AXCA1YJrlTz+uvMle3zDeAqkoMZTwmnE/op1Jdwu mQ7Eh4w5IiLCvw1U4BCLLrJ/zGg7G3gbX8yEflAw6m2GM7YeDfzEH16m/JAD5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770660266; 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=g/s7i7YM6bS1m3bjUjKHveYkGtK0tV0fGhGPodhdjBQ=; b=DzebWLR3rvJVx6MoMHcIWeWvXtcGPLco57VRDTBKyicNk9gjbPPCTQF3P3WE9tSfNSTzeX fgb8wC/08vITQG1U/En7pSx4tcvy2V85v3dKv/CRjByWftnhEDTdbVgs9NimhZSeIQFZbX QOd1zi4tqEln4IhZZRZpVA49fHeWNlK6ypMTtSYDOhIEgDRQ8LwA/YDFIt/veyyLUP08C1 k9M+BKRrX4dDea014dHuCSstbPd/Fs3A9IxpRy+kHU5e/8ggCvmY46jlhKVP8r3PWJNpnY z8MSRSnwmR7xhe+mWvdNsWj1k/TjYWdTftY20uS2a/6ZD9JQ7PgHCVtq/7jnOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8syx6pWwzkG3 for ; Mon, 09 Feb 2026 18:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2779a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 18:04:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2ca0b727d0f2 - stable/15 - arm64/vmm: Simplify vmmpmap_remove() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 2ca0b727d0f2b3e8e0071a3d4f5a8d1142a4cea7 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 18:04:25 +0000 Message-Id: <698a21a9.2779a.751dcc6@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2ca0b727d0f2b3e8e0071a3d4f5a8d1142a4cea7 commit 2ca0b727d0f2b3e8e0071a3d4f5a8d1142a4cea7 Author: Mark Johnston AuthorDate: 2026-01-26 21:05:43 +0000 Commit: Mark Johnston CommitDate: 2026-02-09 18:03:43 +0000 arm64/vmm: Simplify vmmpmap_remove() This function handles invalid intermediate PTP entries, but there's no reason for this: the passed range should be mapped. In particular, we assert that all L3 entries encountered are mapped. So let's simplify the code a bit. No functional change intended. Reviewed by: andrew MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54738 (cherry picked from commit 31e5decb18a6633f5137848b5734310b41fc3bdc) --- sys/arm64/vmm/vmm_mmu.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/sys/arm64/vmm/vmm_mmu.c b/sys/arm64/vmm/vmm_mmu.c index 42537254e27b..ab876d4b47b6 100644 --- a/sys/arm64/vmm/vmm_mmu.c +++ b/sys/arm64/vmm/vmm_mmu.c @@ -350,8 +350,8 @@ vmmpmap_remove(vm_offset_t va, vm_size_t size, bool invalidate) ("%s: Mapping is not page-sized", __func__)); if (invalidate) { - l3_list = malloc((size / PAGE_SIZE) * sizeof(l3_list[0]), - M_TEMP, M_WAITOK | M_ZERO); + l3_list = malloc(atop(size) * sizeof(l3_list[0]), M_TEMP, + M_WAITOK | M_ZERO); } sva = va; @@ -359,32 +359,17 @@ vmmpmap_remove(vm_offset_t va, vm_size_t size, bool invalidate) mtx_lock(&vmmpmap_mtx); for (i = 0; va < eva; va = va_next) { l0e = atomic_load_64(&l0[pmap_l0_index(va)]); - if (l0e == 0) { - va_next = (va + L0_SIZE) & ~L0_OFFSET; - if (va_next < va) - va_next = eva; - continue; - } + MPASS(l0e != 0); MPASS((l0e & ATTR_DESCR_MASK) == L0_TABLE); l1 = (pd_entry_t *)PHYS_TO_DMAP(l0e & ~ATTR_MASK); l1e = atomic_load_64(&l1[pmap_l1_index(va)]); - if (l1e == 0) { - va_next = (va + L1_SIZE) & ~L1_OFFSET; - if (va_next < va) - va_next = eva; - continue; - } + MPASS(l1e != 0); MPASS((l1e & ATTR_DESCR_MASK) == L1_TABLE); l2 = (pd_entry_t *)PHYS_TO_DMAP(l1e & ~ATTR_MASK); l2e = atomic_load_64(&l2[pmap_l2_index(va)]); - if (l2e == 0) { - va_next = (va + L2_SIZE) & ~L2_OFFSET; - if (va_next < va) - va_next = eva; - continue; - } + MPASS(l2e != 0); MPASS((l2e & ATTR_DESCR_MASK) == L2_TABLE); l3 = (pd_entry_t *)PHYS_TO_DMAP(l2e & ~ATTR_MASK); @@ -419,7 +404,7 @@ vmmpmap_remove(vm_offset_t va, vm_size_t size, bool invalidate) /* Invalidate the memory from the D-cache */ vmm_call_hyp(HYP_DC_CIVAC, sva, size); - for (i = 0; i < (size / PAGE_SIZE); i++) { + for (i = 0; i < atop(size); i++) { atomic_store_64(l3_list[i], 0); }