From nobody Tue Aug 4 10:38:41 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 4hDqlP64Ncz6n0rZ for ; Tue, 04 Aug 2026 10:38:41 +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 4hDqlP5Rl4z3g69 for ; Tue, 04 Aug 2026 10:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785839921; 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=5UFyTwaJH3YEcbeVb8lt/5d9EazAvDBOe0ywBK9BH9M=; b=ZVP/smTTjaLTU3vijN0vKBhVsL0z+XWhgEKXzADBLJpTs5Im7cRMUo3NYuF5yQwBhL4WAL W/6q4a0ArWnsSH5NKqoZEi2S3ckAjxaAa1iI7/74BxVGSRVCL8Y27UIrmoeDYFCdcTIEzW yWCMa6YAxg4G7NjLKR07Wb9tTWHEmsh7oD3RvIatn2xUGVIuatu2dmEQQEv4PAMKN0D6mY Cb/kYpPRc3g9YFsSpOmdFiFTSUyIHAzwurySvJ+AVuQxC2Vi4TqwZ+txZKZfjYn5EMjoxo YisL124Fm/ttRwjQP+gLjr9VqawenwWNVovaLD4DX+9r8C44OYNlc31pKFUf4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785839921; a=rsa-sha256; cv=none; b=sVtM6tc+x/5LDaVNYi47ztcP6n54AmrszSXWH8pnrO1JqxTvj8K2RzSK7mY/ZNgrufYDT3 3++3wsXflm0/JPGm5eztRKMvzJ/fEPJJNA8B+MEFNjt4TRdOzhUYUCw3dj40XLYShS+Igy Ijcj7aCyYDKPBjpLetb6y2H0aLTwc609L7n0aCNFvXAqw+exiFGe3lu3mMSBthoIhnbkd+ AifsvnPzZWF5zacBIitHHxQuFLUZZ+pzXa54ZAALM6R3i0lnMRqt/zRk3k6t6WhuYsu/bk lL7kHs5iSFuXNTquAf8ghH6+puiOALTS4mzNPEd2KjPQTJ2zKkKhF5xsC31Jew== 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=1785839921; 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=5UFyTwaJH3YEcbeVb8lt/5d9EazAvDBOe0ywBK9BH9M=; b=IbuLo0jZF64CHSFokKCJn1XYNDXys4ebRhlVUU/xmkUJOlSgh/WaFRgU3Zh7208FqLgKXH dojkYEDIHbbxvCvrrXWtXl5/8WaXGjztqCNA1AIm/JYeXbP3c3doTY0rN9N4vKZ1e1h0Vy f4W5ByTBomGndXDs3uS4d4JGhXhoNbyp5QZk05ZXyNn+VycwR4ZhJg7VZZFXHShuW4nrpw Me3ybxokFb3VLwNC3xfz7k4qz4x4jYl5S+zwdNPBn2qUYNEWdSxhgZ/LoOixu6KEw25gUU p0NllamV/Uxp875XSi3NGvzrWcwKPT6XVQwFojQKxuiGoRLCKi6U1XvDj6Mxgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDqlP3tl4zkFm for ; Tue, 04 Aug 2026 10:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45fc0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 04 Aug 2026 10:38:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Houchard Subject: git: 60dd46db19f4 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 60dd46db19f473af7aa505c0d8dcf9bb69847019 Auto-Submitted: auto-generated Date: Tue, 04 Aug 2026 10:38:41 +0000 Message-Id: <6a71c131.45fc0.4083d4a8@gitrepo.freebsd.org> The branch stable/15 has been updated by cognet: URL: https://cgit.FreeBSD.org/src/commit/?id=60dd46db19f473af7aa505c0d8dcf9bb69847019 commit 60dd46db19f473af7aa505c0d8dcf9bb69847019 Author: Olivier Houchard AuthorDate: 2026-07-23 23:47:21 +0000 Commit: Olivier Houchard CommitDate: 2026-08-04 10:27:09 +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 --- 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 867e5c57f8e5..ffd2d360f4a1 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -214,6 +214,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);