From nobody Tue Aug 4 10:39: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 4hDqmG3Cg8z6n0t7 for ; Tue, 04 Aug 2026 10:39: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDqmG17nxz3gdG for ; Tue, 04 Aug 2026 10:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785839966; 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=344a0dJIEeFuEAOJYPLFeQonRQGX08MAG1bhkx2s4Vk=; b=hFFC4K4nxeglFEmu3GwuDJh/NpBr+4oyugNmCl2UJsnpZqP1sgMTgIpOCiaBHYIPFuGnLf oCBZM0BrjwEKAn+t7byynXY8H8CfjGDBL7j5nvsi4iJZUAgMwcUUX3ki9jFnfm4MlIsUJ0 kQSUMtTTAWklniMuxKjnaWHnPNgFWwGeFLz3t/J7gzZhEt/27wlorp0tXEo82xC/N+NG3h oEOHNyKGXtzXR4Gj4l/fDZQ5G9wYTVDaWzwastT5QQe3Q5Tu5qgl0M54L9B2ubzTaaNks7 R9+dzM/gbJbRVXePzWwxcOcdBuYY+fdPmLChV09XS/A5sGhVUGteTvE2Xxw5+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785839966; a=rsa-sha256; cv=none; b=Gmo0cnT76L9bMvMiv9EQNGbZonlswBULYVGZ2Fe49zPm0pO+qVr6d7Yh9EGsKcn+oD8q2p YJq6/aBJw7uEtJ093XPBrcMnN58w8+4IPyaAK5MJKEOFrigvKL3y91DMSWm8jPMQPVFKqY LUgB9h7XEp/MLV6MtKoLiE0rdrJw+6TQMErM04AMnhffJQ+L4BuViwanQUw/VPGYVAS57g /lqptjr2C9wVo3FXdDpRXW0OcwXAymVZGp6oGim+AC0WIrMYU7UizPusSxXThijDM95btD bnsygkSd/rvc5DB2qsojmFDuguNWWdVftuy+FIh2/KCUebKqIo2/1clai0bkFQ== 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=1785839966; 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=344a0dJIEeFuEAOJYPLFeQonRQGX08MAG1bhkx2s4Vk=; b=jj4X+0rUZI0cXvpJbnxTfTMUv0tELzWFwasG9xgYIoYpdKcIS3NBjq3OTbeI3YadQBakfx AopnKUpoG1/jtziPhyUEPo+pZ8owaL8TbWPGFTRm5POMs1z5JF0IbDgTwaVnyJ//9Zx7jg N6o/YT4RHgs0cycWqfGGvep+aTtrFHGsSQXZ3UqLOkOno0UVzkCNDNv8PNj44EoCUoSykC GIYIsQLTtBEok9DgxfC/utwwKr+qdp1w04U2WCA9yCxLSx44wfSYTUaM/6EpJRBVnyCErz O52AIJMUQTmx1cNI6Hm62st+aFLWydDjRXvaOPCLdsskWaEO0XUP4p+dnRqfGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDqmF6lvjzkSt for ; Tue, 04 Aug 2026 10:39:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4503d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 04 Aug 2026 10:39:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Houchard Subject: git: 35d56f200e94 - stable/14 - arm64: Use the fault handler when one is provided 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 List-Id: 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: cognet X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35d56f200e94336d5f3baac7f124fbe93f82a98e Auto-Submitted: auto-generated Date: Tue, 04 Aug 2026 10:39:25 +0000 Message-Id: <6a71c15d.4503d.43461753@gitrepo.freebsd.org> The branch stable/14 has been updated by cognet: URL: https://cgit.FreeBSD.org/src/commit/?id=35d56f200e94336d5f3baac7f124fbe93f82a98e commit 35d56f200e94336d5f3baac7f124fbe93f82a98e Author: Olivier Houchard AuthorDate: 2026-07-23 23:47:21 +0000 Commit: Olivier Houchard CommitDate: 2026-08-04 10:28:40 +0000 arm64: Use the fault handler when one is provided In align_abort() and tag_check_abort(), if we got a fault while in kernel, do not panic if a fault handler has been provided. We may get such a fault when trying to read or write userland data, it can at least happen with _umtx_op() if an unaligned pointer is provided. Instead, just let the fault handler deal with it. MFC After: 1 week Approved by: andrew Differential Revision: https://reviews.freebsd.org/D58426 (cherry picked from commit c6f5d8fb269fd67a8206420b4e7d67a93bc80733) Signed-off-by: Olivier Houchard (cherry picked from commit 60dd46db19f473af7aa505c0d8dcf9bb69847019) Signed-off-by: Olivier Houchard --- sys/arm64/arm64/trap.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 9f792332a931..6292522ae67b 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -212,6 +212,17 @@ align_abort(struct thread *td, struct trapframe *frame, uint64_t esr, uint64_t far, int lower) { if (!lower) { + /* + * Accessing unaligned memory may fault when using atomics. + * Make sure we don't panic if we're doing an unaligned + * access to userland memory, as can happen with _umtx_op() + */ + if (td->td_intr_nesting_level == 0 && + td->td_pcb->pcb_onfault != 0) { + frame->tf_elr = td->td_pcb->pcb_onfault; + return; + } + print_registers(frame); print_gp_register("far", far); printf(" esr: 0x%.16lx\n", esr);