From nobody Thu Sep 4 17:41:41 2025 X-Original-To: dev-commits-src-main@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 4cHmxf1rMfz66TMy; Thu, 04 Sep 2025 17:41:42 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHmxf13lnz3Cp4; Thu, 04 Sep 2025 17:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757007702; 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=Wu2HMrGXZY8XMqvYA9OG+/UlxAct6tp3TGkFsntnK50=; b=Z83qQjiFGZgMn3Dh5hjqtWv+yA6SP126BZlBrFZI3GONkHbQnRRhRgp+DvZ4VoJkKEEwgh b1SqaiFQrzOgIjkQDaOvwTAjL/tywh42SGJaGdrZ99me7dfxfu7a48VkSeTqDDF2NUpnFP VA0zip0k7zoWOnng5uzG7UCE5eqSl8VnQ4OCmhOLm2yQUtOYmGzDYaMNVHiP/SxzE0RbRB 0x3ngAwP1n/8Omcomrg3q4Tf7iaW+UQFi46N/DMrBGCsmQ7zjTsXBsidiVQr4s3pF9U8ln fN3K0pBsBMYvExBm4dI4+5zh9Dg/RQ8RHGLODOD8cnPGB8Q5rbaaIAgFebEf0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757007702; 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=Wu2HMrGXZY8XMqvYA9OG+/UlxAct6tp3TGkFsntnK50=; b=biJqlkArnly245Frydu5S3wARRhH8aFT4XK418snOa5iZpFkD9rJHlsHzwqvUoPhRzQwqn gMPIEb8L9fidrhkpaGKDZL8sK5gyXND8NcyvDtiiEsX4vrB9Cg4Ofn5HgggRLdLIPyr9QE 46kOhV84zZ5X2w86UeNqZNRoO9wlVs1qH7GIKRBn5ZwqVOYoBQE/JJRG3FUSsj6oM1gEGC FRLlktrreKa4hP9uLcnXG2SCRWTbFJ0M4Op5yjJO0LSEqiicsaNGB0q5tJYUYetfRKoMfc cwcSE4Kex3iRjp4Tu7hlwYKDUCyPExl2PgfGMyQGM0yeXm6i68poDw/sjgEawQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757007702; a=rsa-sha256; cv=none; b=yWETaYl7bf9Yfp7YZrY8BfWidK9uKsDYZaz6UUAXwcySRHzdHIq/Yfe8U7uIMTQyHvWXss XPYFqQCG1Z2DJy57dhYkzpYNMFGiBfs+kzO96f5A/CU9jeVgI2pcVbOAjVtMA6YTACIXNm Q7ofxTSNMDhBauj3kZWEtt46Qiq5i17xSDYYPxT1CPRo2o6ltqCoR38zX6pIiIQaBXSdkh qrrbvMm4I+hqGQVskfepf4Xo8gkofJC6cXyT7cpzwCV3xC8Sx1gKU45adsYGqo/6qlq+TW jwWjIW7doqRI985wEgLigXZs5hJwfKtZcrBxMjw4tS2ievQhnzAIIMmh8+GrUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cHmxf0N3Xz1BjK; Thu, 04 Sep 2025 17:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 584HfflB074089; Thu, 4 Sep 2025 17:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584HffrV074086; Thu, 4 Sep 2025 17:41:41 GMT (envelope-from git) Date: Thu, 4 Sep 2025 17:41:41 GMT Message-Id: <202509041741.584HffrV074086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 8df4dc90952b - main - arm64: Create a TLBI invalidate for the kernel List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8df4dc90952be7afee36e3cc80c1a76e2c66fbac Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=8df4dc90952be7afee36e3cc80c1a76e2c66fbac commit 8df4dc90952be7afee36e3cc80c1a76e2c66fbac Author: Andrew Turner AuthorDate: 2025-09-04 17:24:07 +0000 Commit: Andrew Turner CommitDate: 2025-09-04 17:24:07 +0000 arm64: Create a TLBI invalidate for the kernel Add pmap_s1_invalidate_all_kernel to remove the need to check for the kernel_pmap when it's passed in. While here replace pmap calls to cpu_tlb_flushID with pmap_s1_invalidate_all_kernel as they are identical. Reviewed by: kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52183 --- sys/arm64/arm64/pmap.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 48b62442e68f..af156727d9d2 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -201,6 +201,8 @@ __exclusive_cache_line static struct pmap_large_md_page pv_dummy_large; #define pv_dummy pv_dummy_large.pv_page __read_mostly static struct pmap_large_md_page *pv_table; +static __inline void pmap_s1_invalidate_all_kernel(void); + static struct pmap_large_md_page * _pa_to_pmdp(vm_paddr_t pa) { @@ -1297,7 +1299,7 @@ pmap_bootstrap_dmap(vm_size_t kernlen) } } - cpu_tlb_flushID(); + pmap_s1_invalidate_all_kernel(); bs_state.dmap_valid = true; @@ -1399,7 +1401,7 @@ pmap_bootstrap(void) /* And the l3 tables for the early devmap */ pmap_bootstrap_l3(VM_MAX_KERNEL_ADDRESS - (PMAP_MAPDEV_EARLY_SIZE)); - cpu_tlb_flushID(); + pmap_s1_invalidate_all_kernel(); #define alloc_pages(var, np) \ (var) = bs_state.freemempos; \ @@ -1961,6 +1963,15 @@ pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, pmap_s2_invalidate_range(pmap, sva, eva, final_only); } +static __inline void +pmap_s1_invalidate_all_kernel(void) +{ + dsb(ishst); + __asm __volatile("tlbi vmalle1is"); + dsb(ish); + isb(); +} + /* * Invalidates all cached intermediate- and final-level TLB entries for the * given virtual address space. @@ -7965,7 +7976,7 @@ pmap_mapbios(vm_paddr_t pa, vm_size_t size) pa += L2_SIZE; } if ((old_l2e & ATTR_DESCR_VALID) != 0) - pmap_s1_invalidate_all(kernel_pmap); + pmap_s1_invalidate_all_kernel(); else { /* * Because the old entries were invalid and the new @@ -8056,7 +8067,7 @@ pmap_unmapbios(void *p, vm_size_t size) } } if (preinit_map) { - pmap_s1_invalidate_all(kernel_pmap); + pmap_s1_invalidate_all_kernel(); return; }