From nobody Mon Sep 25 11:00:46 2023 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 4RvKfk5HlLz4vNGh; Mon, 25 Sep 2023 11:00:46 +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 4RvKfk26ddz3Lcp; Mon, 25 Sep 2023 11:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695639646; 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=RakWQJ84KbOat6qt/dPUQQ3jlzUUtFDnm9TW83vJcFI=; b=IMulmUXzqUVAFFNyKRa+g7yEnmUjT8kO8fNTq3xl2/XA1RYjdMmhgl3dQDl4fsBBXIbiuJ AaN1MGqOt87F5BAcZN/mRE8buzhblD15mndOAc/WneQsGCLi3aiqMXCSszI7iNZiVKdpv0 8+5A4N0C1CZ+A6jv+6JXixqa7cE18zkFcaiSBMh8Z5A5QhZN7RJaXuNbPaS1Leno7DAoAr oRGoUvUetUH1xRAzRBrSJ9ZNEmkUfa3cshvtgJG2DHjPW9TCQ2wX1fi1TjSFcgJkq+muAE s5GUvXfQQYcdvp+ClKEz9OBXp/RurogWKq7b6VHn5Wu1usLT2hOigwgz9mRXVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695639646; a=rsa-sha256; cv=none; b=LsrREyhFG98ajXh9R1yfWKMYoABJba5mqh3BMDQZenx9Fu3lhjZX2iU5O/cAyX+XW+mT0M T+WHY0eHqfQ44N2aIelVypvmEa9m0ed4dqZ6IABtBhTdmjzEjQPXOJ8Jj3DVG/0qcv+/V7 wYc+mr5Xubx4Zbj9Qbr9uLkLvPFMi12KF4V26skEO+7akhcKGOZ90u9u7ybOxmET/rH32h zvKCD+EjoE+z40svZFmGzHoJKqRla52EHKZtSsN0h9WxFigH2aoQbjAT6XYnf1UF4alxzL 7KdSivCJzKbCRNUASMK8HEBxLloNhEwcUZY+v3Z4HbiZTFTti0TAVJm2AqfLYQ== 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=1695639646; 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=RakWQJ84KbOat6qt/dPUQQ3jlzUUtFDnm9TW83vJcFI=; b=PDCnrbew9fTWJtPEWAYFQHMWXGTZhtV2Ny4a8lFOeV042Y8B6PfCxi51a+ykc09W1ueI2r 0Kz2X4YkjHtM4MUyMVG2SL3mMFX9j7gAZpUeLBSj3P5B5mTBM9mLdo4jlw15F93FV0ZZIP VN8xHxHisGA1N6NbJ41LpBvcEd2aVmPNQPDDvwOlw+5XehSG7PzyfNgCluxUg6WBEyMltA BKan71lgl0a6VnuZUx3vdFY3gw+RgTyYvU8gqBFd6Qnf5ATjTgwwSn66NhMW9X7FErS4V3 +ocUNgsSUKT+u+tc8xvzBBZ4X3idbL0Rn9TKVq50ty4QfGoqf43zp7SEYA+ZtA== 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 4RvKfk11rwz1QMg; Mon, 25 Sep 2023 11:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38PB0k6Y052459; Mon, 25 Sep 2023 11:00:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PB0kX8052456; Mon, 25 Sep 2023 11:00:46 GMT (envelope-from git) Date: Mon, 25 Sep 2023 11:00:46 GMT Message-Id: <202309251100.38PB0kX8052456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 9cab59fe05b4 - stable/13 - Handle the arm64 unknown exception separately 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9cab59fe05b492b23e10ff9c507511cdaa97bae4 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9cab59fe05b492b23e10ff9c507511cdaa97bae4 commit 9cab59fe05b492b23e10ff9c507511cdaa97bae4 Author: Andrew Turner AuthorDate: 2023-03-31 09:15:45 +0000 Commit: Andrew Turner CommitDate: 2023-09-25 08:41:15 +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 (cherry picked from commit 3a0cc6fe61ea29334c17dfb71bf24ba9e604ab4c) --- sys/arm64/arm64/trap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index bc2136cb9e80..10a2138d9625 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -513,9 +513,12 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) case EXCP_UNKNOWN: if (undef_insn(1, frame)) break; - printf("Undefined instruction: %08x\n", + far = READ_SPECIALREG(far_el1); + 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", READ_SPECIALREG(far_el1));