From nobody Fri Mar 31 10:50:35 2023 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 4Pnxs760Rkz42Jcl; Fri, 31 Mar 2023 10:50:35 +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 4Pnxs75YlPz3N7W; Fri, 31 Mar 2023 10:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680259835; 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=AXzbM6xD7VfDu9feWWBHC7BwRERpTLYpo+jm1mx+sRI=; b=joJ4NEGDmxecNJNuKWInFWJuncp8zElx3OVow5VXSkSwsm2BRREtkd0FZUU4qaNH6I7GI5 aG+WGdJWnjE6jcuNYHfzEeDyX5vJWAJCuIB4yoEend48FLyfV1piG4m+ea3RH90EqYdMDM T08m7ZML8B7gTK21Ae64c1PDfycrEsuai3zNknxv1FjGBYkSAp7arfK1AgwWZ3C4s2VgeZ vg5QXXMvvNIhdd90dz1qyVKUIy74lR11mzQcrUjnhxDrFvAL7bR+34xvwEhLdvStYrn7xy IW19jIG/S5gUYnomg/irFvm9QKK2qNnAideiB6tZO0ghUipXOWwxwML80n2ITQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680259835; 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=AXzbM6xD7VfDu9feWWBHC7BwRERpTLYpo+jm1mx+sRI=; b=MtQHRl5gbSi978fkUwBP4pECXeKSdeTGSD7VI9+0h4DX/9pppDFeMG5A5qqgu9QI03hYWb SHLi2FexKqgFQJcEOs8HE6UbyaVgRmqH3sp98HqsLTsifUcWoRMZSpGpOm0AWalBDvxuN3 rXorMHuerUzRf8c3Bwd+HzVloUBZrxJ7GDE/yB6apnM2qpPH67x3+dIjNg0fOziJIgzCtE TnA0P+8rAQMhn5fht012eFH4v2GhpwPljXfjSqo6jgR/wvDlfBPQvRsljzuPvOjG32Sakm /dwvyuvnw4oSa3gUZ31A6wfi63y1oQbxxgQ15aJm26vxnASBDCnSPyTgWEmUZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680259835; a=rsa-sha256; cv=none; b=jQeXdqRyadrM2JqbmSJQdO7tCY7YAPI/+Ms5E/RT6F8vRae9a4fbYxhj1YFo8Z+4pZ4vu+ N+/lwRm4kf9BqJa542VoYVu9MyFkWZbCrdpY4ey++AAH9pxW85zfoUWI2qy7SPGwXqzj4u fUkG6uxTTa3IS8TC2nF5yDAMkmiQEv/0wWlOdHNyNiON9L7/bgJ8NQTvdJaCpTMb41XKYJ gbWGPSFB/eDNqgZziyty33khiL3SzuiSj/wU8a0NgQNrlFArQS+BEE4dMZyg0XO8iMCDX8 7Hzf+Kq7v19yZxe0VnzPmHj7sA/NWuyI7/ESqrG8xFgtr72HbDJFFy7JQsT2kQ== 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 4Pnxs74d8RzrHC; Fri, 31 Mar 2023 10:50:35 +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 32VAoZhV082787; Fri, 31 Mar 2023 10:50:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VAoZ09082786; Fri, 31 Mar 2023 10:50:35 GMT (envelope-from git) Date: Fri, 31 Mar 2023 10:50:35 GMT Message-Id: <202303311050.32VAoZ09082786@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: 3a0cc6fe61ea - main - Handle the arm64 unknown exception separately 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 3a0cc6fe61ea29334c17dfb71bf24ba9e604ab4c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3a0cc6fe61ea29334c17dfb71bf24ba9e604ab4c commit 3a0cc6fe61ea29334c17dfb71bf24ba9e604ab4c Author: Andrew Turner AuthorDate: 2023-03-31 09:15:45 +0000 Commit: Andrew Turner CommitDate: 2023-03-31 09:15:45 +0000 Handle the arm64 unknown exception separately Rather than falling through to the default case handle the unknown exception with its own panic message. As ESR_EL1 is zero for this exception stop printing it. Sponsored by: Arm Ltd --- sys/arm64/arm64/trap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 367a31cbe1de..0ee1bed0c35a 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -549,9 +549,11 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) case EXCP_UNKNOWN: if (undef_insn(1, frame)) break; - printf("Undefined instruction: %08x\n", + print_registers(frame); + print_gp_register("far", far); + panic("Undefined instruction: %08x", *(uint32_t *)frame->tf_elr); - /* FALLTHROUGH */ + break; default: print_registers(frame); print_gp_register("far", far);