From nobody Mon Jan 26 22:05:08 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 4f0Mz939jdz6PhF5 for ; Mon, 26 Jan 2026 22:05:09 +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 4f0Mz90J3Yz3Gmx for ; Mon, 26 Jan 2026 22:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769465109; 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=Grdl+NCaaK3EZ4tMj73JSSYQLOMQ1WCzrnPtujSmRI0=; b=DKBC+OK7k3yazSB1qtg2oxom/UWtA5WB5IesiCfUCMGRoinoJ6ouR+ruanqXqppxucP7b8 jNc9LZzeWnQeBz0SwzS/v431n7vmb/cHp3nSFnuAaoLC9I6JYZNXtgQ6R8hYcEcUBvvPw6 Ogff/k9TSgIEFYxaOxwZNoea+h2JHSI3NoxreZD7zD097eSebazipw+3X1Jy9zrxg8zP7U o8FAbkeF0+xmxvN4e36S+mMq5mj9pYN71sGwi5jhj0OZ9NpBVsh0kPg5iUyCFE9eIyfY6q IeTbGbUa3T18CKfDN3Gegn4eBze1wSkww+2+Yt1pyYpcAgUtzwGguDzTdw1sNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769465109; 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=Grdl+NCaaK3EZ4tMj73JSSYQLOMQ1WCzrnPtujSmRI0=; b=QuJVChshHBMc4r4nu1HCB3obr+KlOfuNbTtL+6Bbww+2dQGSGmqujuRtNqEV7FlRc5vwaE 5pEJDGBAipUoG+QQpp41NUWCDJYqp8kssNLCgudvGLyPOXqol93ayD+LY3qxwBd3u+YAK8 mjxyUgkMxs1TMWq76mN9lIHMRmFokkJlp7qAMTqDPs8VDhIzyTKZYwpk17Q2lDFlBNaQdl 8k22izKxZTflEijte+T9h/ZlrKGyQ+4V/x+msJO6gQWao306cb3tPbzPhVJnyN+caCeTj5 eYrX/nC4cpl6Ub9exs6trAXI8EcOm6wOe+tBpyTWEJBC5tvUG4GyU0VPOUbx5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769465109; a=rsa-sha256; cv=none; b=fk1f3btiMKVcgNE3zjnEZ+hUHByoSD1XlFT3DTqw3/XbdQFLpxOvKkZYyZYaj3n3YTqyzn K3eU/KUqJpAYIh1X4yDQPYpxY/pdvclZOoQWSCbb/dgnCqEuRZ7wX1OR45kK+oivhTf5ad 9/MYLN9zjFmvx1/pxzl1iNfbFTAfFFfYpmXATqxRoRw/ENq1nH0PGwRDhNgYjFWe13o/cA +LZMiTWNQ+KGIR+Vuea903ww4qIbslbhtKnw5i+mmPQhwEYdsLf07/BZ7HrINyApveAfaA mJ/QmvSIohmoVaLfdJCTiMow58nY2fwlJUGMGuW8hVDScaNuvkBYc6K46p9OTg== 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 4f0Mz86jygzfqc for ; Mon, 26 Jan 2026 22:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36dd4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 22:05:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 31e5decb18a6 - main - arm64/vmm: Simplify vmmpmap_remove() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31e5decb18a6633f5137848b5734310b41fc3bdc Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 22:05:08 +0000 Message-Id: <6977e514.36dd4.5b6aef0e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=31e5decb18a6633f5137848b5734310b41fc3bdc commit 31e5decb18a6633f5137848b5734310b41fc3bdc Author: Mark Johnston AuthorDate: 2026-01-26 21:05:43 +0000 Commit: Mark Johnston CommitDate: 2026-01-26 22:03:51 +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 --- 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); }