From nobody Wed May 24 16:20:20 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 4QRGch2Tn1z4TF1q; Wed, 24 May 2023 16:20:20 +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 4QRGch1pqKz449D; Wed, 24 May 2023 16:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684945220; 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=wAFnTJ0fI27umnlITK4LPvTLk3JVF5sm0kjmYLHMXPw=; b=Jo9oZPblM8QV53v+MouLLFE33m6dn6Xp9QMzjbluxCECQN3RhS11CiU+cke+P+xy6SF+6Y tqHoJnpZzlJodSvKa5yfZLaagCBMapdSXWYXJ6Lg1BgQ69BtBHR8vNOsPyMTNWgbe0dTzc sBE3K917MTEttsFNNvJ85SNciLJ9CXP3FN8A0rcadWx6i0iiMRVdfoZmvxuXJsoqL7g/9h mtKyrJTM2vRKfm6iaasPh8o92YButlHT+HzX0WRN5dXbFM3yBc86b0bONM5yl145q48kD7 eLoZyB2IFSJdz+mGbTGoTYZjhW8eDDif9a6QPmtsk6R4Zy39tikMNcICdMuGIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684945220; 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=wAFnTJ0fI27umnlITK4LPvTLk3JVF5sm0kjmYLHMXPw=; b=iSgMonzv3Yvxz4PUILI8K5uqmy2KFZN8eyYESRFOs+9DY9UlPcJf++ZUU9x3xdulLnHMIq hfmjSH+wn4PckLZrMwB1wjRXVNIe3qXoj2kZTEAzhlO2AZrYdzXhKChwZifl3vit1SjLD9 XjfpehYtjZOuVjpvulV5xXv+5PBWotq7jMYegOgBWIi7PXF+idAAR3sHB7jPKEM74wRqxH RrJWrZAtilHsNg1dI1YDS7sTDivfQSq63FvP1qWYuIyY1Jje0tOuyLnBzyyukxICKTXDYP ZhYBBNlDv8JIYmNEJgbPDbBu7GX4b55L4btD8R/jClKrEGmCBKGajtvsJmjVhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684945220; a=rsa-sha256; cv=none; b=f+bks+hZ6y5b9spETFBN5vq7vZwccje4Tr407h+SRJNB7iyGgedVxTXMD4riODx31s9pAe bhpJruGA2JrylPhk2kbWDDldzS8inyL2i3XeXaf1aNskGP1m7eDNsfUpLZv/KZW5hVlmmI JPKVd3KeNUTAjRo30A8O46AHJtkoXAIz6DR4fsONxfAXEAWUifGiE8361NcWVZ3h+itg6g MJkde1EJluLtAN2LhYgyLivKrl8mowjNww6650Kbp5xN/VJPOyKfpIkv+QbmcsENh60AXB crBtrfKQCMYeU6zh8XPqXpAarV9+9NpZxdQn9ib3LVf4sUTCjVm+xVh8xcQHow== 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 4QRGch0tqgzpsF; Wed, 24 May 2023 16:20:20 +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 34OGKKDA078832; Wed, 24 May 2023 16:20:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34OGKKr5078831; Wed, 24 May 2023 16:20:20 GMT (envelope-from git) Date: Wed, 24 May 2023 16:20:20 GMT Message-Id: <202305241620.34OGKKr5078831@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: 0731b0a9f1f9 - main - Print registers on an arm64 spinlock data abort 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: 0731b0a9f1f9e3b4ec699ec67b6eb24159fa9b05 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0731b0a9f1f9e3b4ec699ec67b6eb24159fa9b05 commit 0731b0a9f1f9e3b4ec699ec67b6eb24159fa9b05 Author: Andrew Turner AuthorDate: 2023-05-23 09:21:39 +0000 Commit: Andrew Turner CommitDate: 2023-05-24 16:20:06 +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 --- 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 95f2bf46e18e..17bda56d806e 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -324,8 +324,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);