From nobody Wed May 10 12:06:53 2023 X-Original-To: dev-commits-src-main@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 4QGYfj5DNbz49pDH; Wed, 10 May 2023 12:06:53 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGYfj4kGZz3HXH; Wed, 10 May 2023 12:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683720413; 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=2Nu5v920j0+qtyx31i9zjwVGXgHLTC0urS2AlDq/JSs=; b=Wh9PjKhzvzu/FCDwAstfKP+IZoWXKyls7X2E/xqCY1Fu0G4z9R+P4Kd3ghg9FEpwGKzZv6 o1XNJ/qR0BRPTDGyspvygyY07pvO7blgmWQppinFD9589puC59rwo/3tQypoCgjkHuS4xr C5MP7gNcvdTGyNs2RDjZ7XtqHIs1mhQHVkW1viTbhNQk9d27lUUghIqNdbLXCYDWsOzeFD ZwAHtmv+jHSEVXXd0Gkc4jIKTce2MaDvlZIT7iMnneoPhsqo1FpU+V9WPgefnjdLrnH4O/ nWJ6YbaCRUAO0jbzgX/ZMsbhzX3I6gtsvdDzGZs8BXqsMWwhuh3DnSktk8HbLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683720413; 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=2Nu5v920j0+qtyx31i9zjwVGXgHLTC0urS2AlDq/JSs=; b=mnehwjjFPQTMVQ1q9ZitKP30qsz/Yt8fTx5jEQ7mDrFsWgCU+8UW/oy5dZpfZW9kcG3cQH 2giJNHjBYGGQpUc+t1vl0ZrzdbdVMEOb8ESlIGsI+4mEV1owRYWMCFV589eCvDXCAbdZsf 4N2HYmNykiYmF3AodBIqBBMu+arkNgayZaNH4+HzIvllHsQ9b5f1Nz6wmA92nSx+jXMCLx zLe6OKAfpCq6nwDooXoFSghU7Nt5IWItbDP4FTBy9/RiAK7/S/DpSQunyepPbLgxZIBIKE UBjr0U9z+kxbPhwEHFZFGN5tHLPuWq2fj+i9wpBQlLBzUScGYgAYxHE5rP18Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683720413; a=rsa-sha256; cv=none; b=SOcu0Lko5z/alqYiavY7fq2aLxZ6jHO3gChIWjHf2As8X5HEMRBqweBaldTh24anZesVix XAQdvYnQOqq3/pQUMq26N5++VGi+3SEwS2LUkGpERTKxXSHw8zqz+VzKIFoJUGwKgIYN/4 q5cwP9d+9AlZXOYNAyv+TYaoBZhg9MlMuZ44TxJq4WGh4i4P6Q36g3PMlpGCrbUG0sv7qK sq5NI9UImrJ4l32uhyd4TjbWSTzC4haI1Qaiqf6GzKbvXg3VM+6EjRgP1I+NrMPN5sxtoe HEhvnU6tOsw7ONYtw7X/++trN9DYNZn0+Mcjs6Iu4+SnrrOd2M1G0jjtgI9w3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGYfj3gTCz18gY; Wed, 10 May 2023 12:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34AC6rFo056960; Wed, 10 May 2023 12:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34AC6r1L056959; Wed, 10 May 2023 12:06:53 GMT (envelope-from git) Date: Wed, 10 May 2023 12:06:53 GMT Message-Id: <202305101206.34AC6r1L056959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 2b8c4137d497 - main - arm64: fix stack unwinding past exception handlers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b8c4137d49762587c946a67840df0bfd1ee2f2f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2b8c4137d49762587c946a67840df0bfd1ee2f2f commit 2b8c4137d49762587c946a67840df0bfd1ee2f2f Author: Zachary Leaf AuthorDate: 2023-05-09 16:04:44 +0000 Commit: Andrew Turner CommitDate: 2023-05-10 11:54:54 +0000 arm64: fix stack unwinding past exception handlers Commit 281402e0a563 ("arm64: Shave off two instructions in exceptions") removed the instruction that set the frame pointer (x29) as it appeared to be unused. The frame pointer is used in arm64/db_trace.c:db_stack_trace_cmd() when unwinding state, and hence still needs to be set. Add back the instruction to save_registers to properly update frame pointer. Reported by: andrew Sponsored by: Arm Ltd --- sys/arm64/arm64/exception.S | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm64/arm64/exception.S b/sys/arm64/arm64/exception.S index c82b8307ab17..a568d1264b53 100644 --- a/sys/arm64/arm64/exception.S +++ b/sys/arm64/arm64/exception.S @@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$"); .endm .macro save_registers el + add x29, sp, #(TF_SIZE) .if \el == 0 #if defined(PERTHREAD_SSP) /* Load the SSP canary to sp_el0 */