From nobody Thu Dec 18 18:40:48 2025 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 4dXKHN4Z8Hz6LWZF for ; Thu, 18 Dec 2025 18:40:48 +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 4dXKHN3sB7z4D4m for ; Thu, 18 Dec 2025 18:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766083248; 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=nLhtg46MXYyIPR9Zt09uCzLwvtp077YDxpXM6CmeXyk=; b=YyiwA/YxBxw/ZBxUD62JfSuUT/eyXjI+u7jPX2gtLejx4k1XhJOtjggh1gFRYxR+Lf/lbk 1iFu/I/i329ViKW/26/0YIV3LV/8chKDZZUJ8rFVC6+kOsdNw3PeT1sZ66jNI5o/bJ50J9 wKWNTkqMhGrZ8d2j4KDq6OzROmOG5KjyItagqohTnpCRShxGvM2EIXYfndspPaJd/w1sqs tDbnXPodbhctPqHTO9Hu10GuKs2zSgAv37wbhm00e+Hc18zTi9L9KJ5d9NgrqhrjKogNVu AsyLCYAHI7ddcr1KZuNDYBx10OFzRYnDks+fSOzsB6EHaZe71dEyWiqULfJTIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766083248; 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=nLhtg46MXYyIPR9Zt09uCzLwvtp077YDxpXM6CmeXyk=; b=NCLi5SaIOU8J7+gIih/Ovs/fnfdLLv9sZOXeKPpHeyTbrFBhRakqE0fO57CWA0RBPvkgwJ iM4UhYzq7Ac9sHQHO0DekuCUo+ey0iR0PEQ1vIwFZIC1+7NLNNo8BPrsyQnSunFRElIIsW QQ3mFA/Sp+2GarjBPbZMa5XxTBEsf4lQM2LU28EHoT7denKPHmnD3D+KSQu5W0L2IDQaZ7 ZZK13bdzl/53dxPXrgWs0WqH6QSud7z0gP/iIXL5L/sNq+zvAWBPM9I0fn8Ywefj8kXVIz HkwCANBUf16iySCncTYSieb3TDZxdmQIhJEI9jL1dFcLifMUaQrKaoB8xdOyig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766083248; a=rsa-sha256; cv=none; b=Ne/nYJVjsvGcCxLtWQMkAmWIwVOWk37C4W1WqPNw04TEEL4OUtjoft5sLxElDP1JQADZSA Jc7yxe1tkVcm1dxv1X0kFolr+eAo9/GvoGWRWNBoRYSb44ycHZ5sGOJw1EnOWPPSkggJrJ 4qeIVyO0WPtvfNM0HPQWPINkQJALO5ro355u61gdJcLu42MHXV1JsIv2wMN57nxmaHLbun 9sAN8zNFxDMbCCibGD1hgpaIfloMIUn1dqkR5SEhlAOY/v1FZWjbffOLR4ruiGrBwWiRMj OwCIO60gR8svQkgYsnwEH5QJhwxK8dQwAV4L3llKQ7QylyhWjyTFPXf+HEmg1A== 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 4dXKHN39NzzqKl for ; Thu, 18 Dec 2025 18:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 319b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 18:40:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 186154414173 - stable/15 - aarch64: Clarify the initial adjustments to sp for kernel exception entry 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 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/15 X-Git-Reftype: branch X-Git-Commit: 186154414173eac06a2bbde4628cdecda520f22c Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 18:40:48 +0000 Message-Id: <69444ab0.319b6.674101ec@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=186154414173eac06a2bbde4628cdecda520f22c commit 186154414173eac06a2bbde4628cdecda520f22c Author: John Baldwin AuthorDate: 2025-09-16 11:21:39 +0000 Commit: John Baldwin CommitDate: 2025-12-18 18:24:15 +0000 aarch64: Clarify the initial adjustments to sp for kernel exception entry The first store-pair instruction in save_registers_head decrements the stack pointer to create room for most of the trapframe (and the redzone area for nested exceptions). However, the expression was a bit non-intuitive as it was using an expression without a leading negative sign to adjust the stack pointer. Rewrite the expression so that it is more clearly a negative adjustment to the stack pointer. Suggested by: andrew Reviewed by: andrew Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D52514 (cherry picked from commit 7314f78b240bdbf2bcec07e3d5a475e37941bb6b) --- sys/arm64/arm64/exception.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/exception.S b/sys/arm64/arm64/exception.S index 13095def8b00..6e673fbe5a43 100644 --- a/sys/arm64/arm64/exception.S +++ b/sys/arm64/arm64/exception.S @@ -43,9 +43,9 @@ .macro save_registers_head el .if \el == 1 mov x18, sp - stp x0, x1, [sp, #(TF_X - TF_SIZE - 128)]! + stp x0, x1, [sp, #-(TF_SIZE - TF_X + 128)]! .else - stp x0, x1, [sp, #(TF_X - TF_SIZE)]! + stp x0, x1, [sp, #-(TF_SIZE - TF_X)]! .endif stp x2, x3, [sp, #(2 * 8)] stp x4, x5, [sp, #(4 * 8)]