From nobody Mon Sep 25 11:00:52 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 4RvKfs1kqVz4vNDf; Mon, 25 Sep 2023 11:00: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 4RvKfs1Bzmz3MBd; Mon, 25 Sep 2023 11:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695639653; 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=+7kmc2RhDLsDrlXitXbF9Hc2SjGLcUKs2bti8XsBvdc=; b=qGVkUrN97+70BsozfCzUDYCmlwZ1+MZS38TbuOZHO2nJJspMSk3dBg4UYaMLRCPbJYa1Xl UjEUBbRtHmvBg4TXcUyQrZBnQ0hXYr79PF2fafanL11HJI4PgPhkwzzjO3iyaZif1SX6hE Q1MzziCXiKxRZcnp3EjBkuat1hIBz3qOX7+lu4wr2JQJOgZ2twqT85tUmOD4DfU8hKQRMY EunkPRZWGlGuJP2k0PX1E5nRJoWhcjMJGvlOIS3X7XQP9zJrvgvk1FRxQkN+xrhpic+/1q CPGy6uuqoU5ZBGyKWgDYPacw0PXEoS0D7N5cI6McxX5QNf0Y4z5FTH/ZbPPwZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695639653; a=rsa-sha256; cv=none; b=MvthpNdJVKXLqFHHiTvDpFScntRrhM98+lret4QAr3sTha0N+er3oko3FAsbTXtS3UG5Tq QCKgLFJWfN2Kt35vOS+O/G4q1lLZcCK/hht81Tla19BZH5XUCgty4DKnIFdMyp3ETqJ6x+ DypcEUOlX+0YxSJ/fYFvxmKa+qumyeurogeXMN4Xc2ymcetNTzltiYaWrZyyWessOIKZWE YbrRLtZfRLCdMljmGaNOycXpwuVwBxmeS+a9qmM6lP1szRUuCGKFxu/aSMYrzrsTi2LPnB KYnxG2fgMNMdbKa50fbUNUd4Ue0hBCy27NK+6chGl5Xy7O2BvQH1PUIsv7iitQ== 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=1695639653; 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=+7kmc2RhDLsDrlXitXbF9Hc2SjGLcUKs2bti8XsBvdc=; b=prB5X9dAICxr8IWdaW76ADuDvEyRTwvVgwl28LZBhbQX8r1tY3bqDA1tsZnSQxcmvyx2eC ULyr2/6L9JUgbaZc99LrImrSxsGHIILr2Qc/2bu6xRcBD60sHxObJffeh1QYydlav9caHr MTBPXO2IHf6rN5yDi6duaXV/zClf6QKD1FsSS8TKaXjjf5EWaoNbSVsyR3+ZJeU9msi8ty d7om7Cz3ByraT8bu7+pIlKeBwMrbN2InYP5GH3ZCCsDVmHPpVG4mK+JCdfV+YtbiBPmtc8 hrhlz/FMMjlulu5rjnRwbkOIjbDhOTB8D9NUkYdD8OyzvQLq6HoEhSDWhyxTIQ== 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 4RvKfr6x9wz1Qd4; Mon, 25 Sep 2023 11:00:52 +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 38PB0qNE052728; Mon, 25 Sep 2023 11:00:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PB0qXY052725; Mon, 25 Sep 2023 11:00:52 GMT (envelope-from git) Date: Mon, 25 Sep 2023 11:00:52 GMT Message-Id: <202309251100.38PB0qXY052725@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: ed2d2423470d - stable/13 - Print registers on an arm64 spinlock data abort 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: ed2d2423470d7bb74db1c9779834ee9c7e5d6486 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ed2d2423470d7bb74db1c9779834ee9c7e5d6486 commit ed2d2423470d7bb74db1c9779834ee9c7e5d6486 Author: Andrew Turner AuthorDate: 2023-05-23 09:21:39 +0000 Commit: Andrew Turner CommitDate: 2023-09-25 08:41:16 +0000 Print registers on an arm64 spinlock data abort When checking if the spinlock count is correct in a data abort we can panic without printing the registers. These are useful to debug the abort, e.g. by giving the fault address register. Reviewed by: kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D40228 (cherry picked from commit 0731b0a9f1f9e3b4ec699ec67b6eb24159fa9b05) --- sys/arm64/arm64/trap.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 10a2138d9625..45a4075507c3 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -299,8 +299,14 @@ data_abort(struct thread *td, struct trapframe *frame, uint64_t esr, pmap_fault(map->pmap, esr, far) == KERN_SUCCESS) return; - KASSERT(td->td_md.md_spinlock_count == 0, - ("data abort with spinlock held")); +#ifdef INVARIANTS + if (td->td_md.md_spinlock_count != 0) { + print_registers(frame); + print_gp_register("far", far); + printf(" esr: %.16lx\n", esr); + panic("data abort with spinlock held"); + } +#endif if (td->td_critnest != 0 || WITNESS_CHECK(WARN_SLEEPOK | WARN_GIANTOK, NULL, "Kernel page fault") != 0) { print_registers(frame);