From nobody Thu Mar 5 15:14:20 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 4fRY3k2F8Mz6TBQH for ; Thu, 05 Mar 2026 15:14: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fRY3j6d6jz3Zyh for ; Thu, 05 Mar 2026 15:14:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772723665; 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=u9yyFK9PRdo0ppkSsv6hcR6gfPuzNIpsipQehHydPZI=; b=MunBoN553wOh0y+sHLMhRWcXjv2RWRsW5vEu0qHFn26kuP5Y/vpJnvRSvxbBdfDfKH+uSI UPsIa8hGyBjzYBOmiT/i21isK2RmoWB2WI6OkyVaMGWuylf313ALIfLmINGLSHySSomFZo Rt2Lx377oApqWkIIrVxz9nSGvASEmAFS7qIZay7gQ6WsSCNOMXpkyQJzLqWNKDVN95qnKq 8MeTt5Tga4qbPeo6CqoI8dMRc9TfIL8y2RW3aWnFgwe5EAt3SRCafPoalqoQclyBH1MZ3B ifWQCrAEOSlK15/9/FHbfbqgeAHsc3qt4zWA5AvzqCjCCeFLSBnZJk97TnJW4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772723665; a=rsa-sha256; cv=none; b=HQ91te/ge9Ci4eVZxLEAsJPuwIaHGHSpB0XWBI38+Hhm3K42nEpmUp+gHmp7ukk3TjQGxf kSVEr6hwcRq29w8QRV/xJlH+dxz9W9q932BJiENYjNvRxZj6l2RhaIpcj6sUEzwzYGoBKa 4K1imrJaeH9r3ChfGFbR0dqPxkEIgsj6cwx+37Z1MEFxmKbBiEv+W06WYd+6Q7TzC6FEV6 bsYlUbiLN5xFwmg+K5HfNNdu9XlY6qO5GNSmg7g1NdkTT03C7WZ88EldV1vq36TgdLqAw2 ebeupcRJAOBhcqDwlncRZP2ys6H5eLupvwdhOrEaYPLGA11Yc/pkOnDcjpX4Pw== 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=1772723665; 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=u9yyFK9PRdo0ppkSsv6hcR6gfPuzNIpsipQehHydPZI=; b=EC6y7i8C+j5ELdSIjA/MA3HZMCqLSpCAG4hezkP1SIYXF9w35ko64agRt3QJnK+0KLQkIs hjtSKjj5VtLJxdIJZhvtmAOE8DiNU6qJs7s/gUqS36c6+JKgQhXJJcc6MIEBX4CfQl1Vni afRcdQ6kyQ39ttB0bnUfKXTU132CFQjGBtKZXSLgKfBSzudRPtfndn8bVN3D6fZtswKjcc HOeNPB77tNUdyp/3g9hr4QRGYyDiYTJnUcdId1YPHYQNob9tDc3bzmVwv0BjWJkEIA4WZ2 pScbe8LLPQwXSecy5iQTw4IHFIDq0WEvTNDitDQaUF49hSecl+Rz7i5Q8/Qy8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fRY3j676hzhpx for ; Thu, 05 Mar 2026 15:14:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31814 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Mar 2026 15:14:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 570b8b25753c - main - arm64: Use a canonical address when TBI is enabled 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 570b8b25753c2be7657f0e906cb5a89c7f35b56e Auto-Submitted: auto-generated Date: Thu, 05 Mar 2026 15:14:20 +0000 Message-Id: <69a99dcc.31814.fa2f629@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=570b8b25753c2be7657f0e906cb5a89c7f35b56e commit 570b8b25753c2be7657f0e906cb5a89c7f35b56e Author: Andrew Turner AuthorDate: 2026-03-05 14:27:37 +0000 Commit: Andrew Turner CommitDate: 2026-03-05 15:13:30 +0000 arm64: Use a canonical address when TBI is enabled When Top Byte Ignore (TBI) is enabled in a processor we need to pass a canonical address to the vm subsystem. Reviewed by: alc, kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55619 --- sys/arm64/arm64/trap.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index b3c68fa4826f..3ce0b29f0b82 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -262,6 +262,7 @@ data_abort(struct thread *td, struct trapframe *frame, uint64_t esr, { struct vm_map *map; struct pcb *pcb; + vm_offset_t fault_va; vm_prot_t ftype; int error, sig, ucode; #ifdef KDB @@ -282,8 +283,11 @@ data_abort(struct thread *td, struct trapframe *frame, uint64_t esr, } #endif + fault_va = far; if (lower) { map = &td->td_proc->p_vmspace->vm_map; + if ((td->td_proc->p_md.md_tcr & TCR_TBI0) != 0) + fault_va = ADDR_MAKE_CANONICAL(far); } else if (!ADDR_IS_CANONICAL(far)) { /* We received a TBI/PAC/etc. fault from the kernel */ error = KERN_INVALID_ADDRESS; @@ -338,7 +342,7 @@ data_abort(struct thread *td, struct trapframe *frame, uint64_t esr, * or pmap_fault() will recurse on that lock. */ if ((lower || map == kernel_map || pcb->pcb_onfault != 0) && - pmap_fault(map->pmap, esr, far) == KERN_SUCCESS) + pmap_fault(map->pmap, esr, fault_va) == KERN_SUCCESS) return; #ifdef INVARIANTS @@ -379,7 +383,8 @@ data_abort(struct thread *td, struct trapframe *frame, uint64_t esr, } /* Fault in the page. */ - error = vm_fault_trap(map, far, ftype, VM_FAULT_NORMAL, &sig, &ucode); + error = vm_fault_trap(map, fault_va, ftype, VM_FAULT_NORMAL, &sig, + &ucode); if (error != KERN_SUCCESS) { if (lower) { call_trapsignal(td, sig, ucode, (void *)far,