From nobody Thu Dec 18 18:40:58 2025 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 4dXKHb2R2jz6LWP5 for ; Thu, 18 Dec 2025 18:40:59 +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 4dXKHZ6Smvz4DG1 for ; Thu, 18 Dec 2025 18:40:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766083258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nXdmyZZsmKdDMf6466HxT2NRitdGizlARlQzYDS9d5U=; b=GH/W1wTNsQd3xbShaQsCfNduw+/NjzZdLRTt0lCY+7+NGm0Yzr7Utcg0GCf4ZoiDaQGkyR yx17Iz5lJBlgTr0u9kjxssi5w1GMnkCLZEF6nMl0SSM+yoaBg2YaI7muMUYcculz/GYM2+ HPwPc/TGndxeeovuPqW4Eg8GoOeY0QbMh7kWqWDw3NJak60VrSm+wTehjgrrM1CijKB8yE mqmnIzTPDSibAcQi8KIu+Qlq0KS6yt2K2mJ7OSpui+Dt58OGQv3LymkKxNSTTEMIdqwrmR vkYpXHmRoBrmWRnhqg64wRLUw5ZtvWv3IyD30tzZ/UpKKUJ/3lI5FuQnUEydjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766083258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nXdmyZZsmKdDMf6466HxT2NRitdGizlARlQzYDS9d5U=; b=GLnYUX/7Oj4lt6clzyNqhg2RGo4huOi/YYax106f1ywh3bmckfLOMUD3Ed9llcS8KXwNrY kWvN6XozcbNm3FjmTv+oQS6l5GnDs9xPT/3rK/g2vs283YlRBX+5fEZwcxDt71yWhSVLHH CFOBFZSCg+uLtb80coPTo3n+Hn0fELc+gmpmjcdV0CIA3CC+a929HObCart0HVBwG0lrLL i+qdU5RLqqDBQ0bOrv6m9gxxX9Z8lx4BIr4ZWi/362i8TxKr4mirbkcDY51t74aIF2GP+3 osZu9tof4lU8oL8Xiylle/tUm8sTLv8zQxuv3W4+l7bwfD/e1i4FdWYsp0j7NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766083258; a=rsa-sha256; cv=none; b=yei+eh8MTmDqrXYKUO430xwG6C5Aa2kJrUUI6SdbhMhn1qJTWs9x4ohvbDPJIM3jb/0kTS +bTeqc/UCV9hqMvBLE220l7MgKPUT++0Gkrg8MCr8OPP2UeyMKxJDV60N8jAZdme68y6G8 uZ8F4hKT5zVaQ91M8wD/HPSAqOtVMPxv211KkN6vMla4tvaNtqujPPaxg0GjVYeT+ztuRF a1cjehfBl3B2fkJeduDbLLYRD+38ISi/G4/TCps/f0mhAmc8FbNybPbR98VbC1dwfBdzJY VnHuntN4CNIx0YNzm2Xu7GjHGu8kV0iHmTR0D0DEfMF0frM4qHUDZxqqHuI1MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dXKHZ620wzqn8 for ; Thu, 18 Dec 2025 18:40:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31bd2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 18:40:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konrad Witaszczyk From: John Baldwin Subject: git: d866f1d4f968 - stable/14 - aarch64: Save correct value of x18 on trapframe for nested faults 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d866f1d4f968f8ead4765944d82f4af640815678 Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 18:40:58 +0000 Message-Id: <69444aba.31bd2.4e6e954d@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d866f1d4f968f8ead4765944d82f4af640815678 commit d866f1d4f968f8ead4765944d82f4af640815678 Author: Konrad Witaszczyk AuthorDate: 2025-09-16 11:21:57 +0000 Commit: John Baldwin CommitDate: 2025-12-18 18:25:14 +0000 aarch64: Save correct value of x18 on trapframe for nested faults x18 is overwritten with a temporary copy of the kernel stack pointer when it is saved in the trapframe. This does not matter in terms of function since nested exception return does not restore x18 from the trapframe, but it does mean that examining x18 in a debugger in stack frames above a nested fault outputs the wrong register value. To fix, compute the value of the original stack pointer to save in x18 later after the trapframe has been constructed. Reviewed by: jhb, andrew Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D52472 (cherry picked from commit 99213b3c352cdf568ea7cf5b4dddb1879f16a601) --- sys/arm64/arm64/exception.S | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/exception.S b/sys/arm64/arm64/exception.S index 0457efe77ba8..07223fcb069d 100644 --- a/sys/arm64/arm64/exception.S +++ b/sys/arm64/arm64/exception.S @@ -38,7 +38,6 @@ */ .macro save_registers_head el .if \el == 1 - mov x18, sp stp x0, x1, [sp, #-(TF_SIZE - TF_X + 128)]! .else stp x0, x1, [sp, #-(TF_SIZE - TF_X)]! @@ -57,7 +56,9 @@ stp x24, x25, [sp, #(24 * 8)] stp x26, x27, [sp, #(26 * 8)] stp x28, x29, [sp, #(28 * 8)] -.if \el == 0 +.if \el == 1 + add x18, sp, #(TF_SIZE - TF_X + 128) +.else mrs x18, sp_el0 .endif mrs x10, elr_el1