From nobody Tue Jul 28 10:19:45 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 4h8Wfw0gMyz6mXNp for ; Tue, 28 Jul 2026 10:19:52 +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 4h8Wfv3sbcz3lCP for ; Tue, 28 Jul 2026 10:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785233991; 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=n+YpXA+bjrgUYJrQHhss/w40ejzRLtUKCz7zNvWErpY=; b=aekm4ZZUCOVflw515lVjMVYym6dUYm3cs+yA05CGvfqrEbH6FmhH94s2TjUhVX3NWy9QQy uLeX3wMbhpnjqNffhhpokAx+xJLt/CaMNXdrFuJ7z8pZPDovmGqGmvmxLxwv1VsPDg5JHG 0iYI3ox7YrB3OVH0tZOBHyvZ0S2kqmPwRdmmZ6b4OhiDc4Ipl4DM+t8f4LEuSNwwgpAmkJ UHZPF6I+F+EZ1K8AOt/ISfWNfFPrzcIhMHa6u4Mskw1c6IigZC5Gs0m+oI744vcLfwFRe5 LfDQhyRZHw8B72KDlnKi7e5ZWSu1eR6Yf1zOhJZJRnzPUBzITyRB+e6tPIH5DQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785233991; a=rsa-sha256; cv=none; b=lhXsXLbpN8KP57zE9x9tIb0H3Zsdofr7rjQeu4IDc5uuiTqadZAMkLBWF5WhY97AofnX+U kBvljV2yTXK00sIx6bDmd0jReCc95whUye34gVBhf1KAYsF27b4CtDTjHfsF+B1CdTRVWI b8Py+b/zzbCcNUjwOMzjTjFuwswzZQ4+S+ZQpVuHh2XGDPm/LP4vyIGHqz6hIvhZ747Dcu qQ43XfEoCn/kya4/ZThf4McX6QicTEORkTXfEeq+XWT8AH0NrH4evo4S3SYioOD76RsLer KxPiTl1CALtHAYRENK0lFyrZcm1OAp7J1HIA2hQZy1BCLHTJj1UwVOug8KTrIw== 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=1785233991; 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=n+YpXA+bjrgUYJrQHhss/w40ejzRLtUKCz7zNvWErpY=; b=FWfAU1EdHLNhTQQUmQp3CLEJSYuFMH3e6DlY+bnj97Jn5lwi1hyR7WMwB67A2EDghZnevD 3kWWwLqBJFCa/0oSdjY9WIuXJjSBp0DqA9p+2l9/5RY5AdguhP4SewLy6XsvfzeEeAQtY6 rTWICmYZ4VVQQJlHYkEu3PN5RshXi73OACa0sdAaGXirPJyr9oDHpnfdkz4/Mx7UIZcjcb Byfm5rDgamr5kzcnel9YhFUvRT/cmhzCpSdOjCDlRS/CVQD29kiFV/+the2po2LJ+9/hUT MexEOKs2DuqOVpxWIcdsl0m1pzx9zkqQLUqiPhim9Sy/iQKOGK3cdbWDTBOyKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8Wfv28c4zbGB for ; Tue, 28 Jul 2026 10:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20d93 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Jul 2026 10:19:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Houchard Subject: git: c6f5d8fb269f - main - arm64: Use the fault handler when one is provided 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 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/main X-Git-Reftype: branch X-Git-Commit: c6f5d8fb269fd67a8206420b4e7d67a93bc80733 Auto-Submitted: auto-generated Date: Tue, 28 Jul 2026 10:19:45 +0000 Message-Id: <6a688241.20d93.6a28e6e@gitrepo.freebsd.org> The branch main has been updated by cognet: URL: https://cgit.FreeBSD.org/src/commit/?id=c6f5d8fb269fd67a8206420b4e7d67a93bc80733 commit c6f5d8fb269fd67a8206420b4e7d67a93bc80733 Author: Olivier Houchard AuthorDate: 2026-07-23 23:47:21 +0000 Commit: Olivier Houchard CommitDate: 2026-07-28 10:08:56 +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 --- sys/arm64/arm64/trap.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 3afeb34abd5f..e688b9cb76a3 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -217,6 +217,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); @@ -262,6 +273,14 @@ tag_check_abort(struct thread *td, struct trapframe *frame, uint64_t esr, * at EL0 and a kernel panic if at EL1. */ if (!lower) { + /* + * If we have a fault handler, let it decide what to do. + */ + 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);