From nobody Tue Oct 7 08:41:57 2025 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 4cgqPf15syz69n7Q; Tue, 07 Oct 2025 08:41:58 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgqPd6cgjz3wtB; Tue, 07 Oct 2025 08:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759826518; 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=uEG9O6LY4wPYudmrjw2cPxxbfJwFO25rjpgQ7mj6BPo=; b=QmcwwWlWF77JtCbQxBe1SkUx7aN13aoM+xQNpQwWnY5+8JGKaQ5n9hREwplPRXbZ/wEI5J kKV6cvyXlgpaaIKAmIwx5MwlLtJ3i1BdLj22alWrgfKDgbdCGNgs81wn+DWYARocp8qcqf GjnJToLh7q9RQGtAmELnXOsaPnD3sSkEY+bMYxC/xN1LQmuCTJHAgR42jjjWPxX7e5nuUL xZVu7JUnsj2WuUz1R/jUzVIeMgyhwhhbEFnt7MMoMeAeFEFn1rFldmGUBsyjBa8RdTYkq2 tvg9LjVJ/w/j5u1Gm4y6AHIXO04zv59cXxEBQyx9vNz3RNLmXtaumSKneTkR+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759826517; 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=uEG9O6LY4wPYudmrjw2cPxxbfJwFO25rjpgQ7mj6BPo=; b=RSGRsNPAxQSpE85BlKlfYjmJ2eefECbDGiNAHpiVAo75r8mGlxH+UMEM4Vujihopxk+OfS P9Ok4jbabqvVYRCxi/G34ANkjSzUIYrta/U/KMli+ad3wHlgy8Gn923FsyKyGHL/NvuKww MMg2dBOww0MO2+0+61St4WcQr4ildPgO4AX7sf7nwx8F9wZse2qsjXywM3OPBtDavhfg4B oEiVjbW3llO+AQTr6ogVAD2BN6yN8YXGKs1E1+o+qRWh/IaqGb3dUSTqufNWBtT7dJk/fb L/J6V1NCLX26qxZC8OR0CobEy8+QOiCBniCwmToehBSD00sCtnb6G3PLVhXr1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759826517; a=rsa-sha256; cv=none; b=OFuaCIspGOaGSlay1G7xCvAODbZAd0votw+TwH2a4Gn3mllmryJ9fIgUgJzpvg3wpIMNjb xRhXd9ZVjo2v7ymuN9/JtJW7jWBbYBAzVD6XleQT2n8iYk+X3EQ74ZnQM8M32PZcK6DjiJ R0M8LzFmf6w4C5THa1DBn+kT2/khgJONHSxdaRu8nXbmF44+N9MnZGumHETeUKQV8sk1we x/5ZT4WoWhWfyc41oKZVt25JLsLj9qgyzCA4VSUgOTziXiQ9Mv96UaJHm+Mss7pHYJPzjK MI0KL5EA2ZTh0hPsLOZct5XcJq7RcaWAaB3JKnT6R7QLoE149jMCl/Y36/ZTYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgqPd63X1zfBs; Tue, 07 Oct 2025 08:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5978fvpG006186; Tue, 7 Oct 2025 08:41:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5978fvwv006183; Tue, 7 Oct 2025 08:41:57 GMT (envelope-from git) Date: Tue, 7 Oct 2025 08:41:57 GMT Message-Id: <202510070841.5978fvwv006183@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: 534aec00976c - main - arm64/vmm: Handle debug exits 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 534aec00976c18c4c4b485b2fade9d5f33de89c8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=534aec00976c18c4c4b485b2fade9d5f33de89c8 commit 534aec00976c18c4c4b485b2fade9d5f33de89c8 Author: Andrew Turner AuthorDate: 2025-10-07 08:26:00 +0000 Commit: Andrew Turner CommitDate: 2025-10-07 08:27:15 +0000 arm64/vmm: Handle debug exits This is enough to boot FreeBSD again. PR: 290044 Reported by: Siva Mahadevan Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52931 --- sys/arm64/vmm/arm64.h | 1 + sys/arm64/vmm/vmm.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/sys/arm64/vmm/arm64.h b/sys/arm64/vmm/arm64.h index 334b795832a3..f9b74aef7188 100644 --- a/sys/arm64/vmm/arm64.h +++ b/sys/arm64/vmm/arm64.h @@ -119,6 +119,7 @@ struct hypctx { struct vgic_v3_regs vgic_v3_regs; struct vgic_v3_cpu *vgic_cpu; bool has_exception; + bool dbg_oslock; }; struct hyp { diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index 1dcefa1489e9..a551a2807183 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -651,6 +651,33 @@ vmm_reg_wi(struct vcpu *vcpu, uint64_t wval, void *arg) return (0); } +static int +vmm_write_oslar_el1(struct vcpu *vcpu, uint64_t wval, void *arg) +{ + struct hypctx *hypctx; + + hypctx = vcpu_get_cookie(vcpu); + /* All other fields are RES0 & we don't do anything with this */ + /* TODO: Disable access to other debug state when locked */ + hypctx->dbg_oslock = (wval & OSLAR_OSLK) == OSLAR_OSLK; + return (0); +} + +static int +vmm_read_oslsr_el1(struct vcpu *vcpu, uint64_t *rval, void *arg) +{ + struct hypctx *hypctx; + uint64_t val; + + hypctx = vcpu_get_cookie(vcpu); + val = OSLSR_OSLM_1; + if (hypctx->dbg_oslock) + val |= OSLSR_OSLK; + *rval = val; + + return (0); +} + static const struct vmm_special_reg vmm_special_regs[] = { #define SPECIAL_REG(_reg, _read, _write) \ { \ @@ -707,6 +734,13 @@ static const struct vmm_special_reg vmm_special_regs[] = { SPECIAL_REG(CNTP_TVAL_EL0, vtimer_phys_tval_read, vtimer_phys_tval_write), SPECIAL_REG(CNTPCT_EL0, vtimer_phys_cnt_read, vtimer_phys_cnt_write), + + /* Debug registers */ + SPECIAL_REG(DBGPRCR_EL1, vmm_reg_raz, vmm_reg_wi), + SPECIAL_REG(OSDLR_EL1, vmm_reg_raz, vmm_reg_wi), + /* TODO: Exceptions on invalid access */ + SPECIAL_REG(OSLAR_EL1, vmm_reg_raz, vmm_write_oslar_el1), + SPECIAL_REG(OSLSR_EL1, vmm_read_oslsr_el1, vmm_reg_wi), #undef SPECIAL_REG };