From nobody Sat Nov 15 17:42:32 2025 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 4d81YN6l4rz6GgRx; Sat, 15 Nov 2025 17:42:32 +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 4d81YN61Y5z3WXs; Sat, 15 Nov 2025 17:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763228552; 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=Likorg4G6KDLJA1lrioUmYAyaIgQtqlE0xmZYQAp5HY=; b=e9fuqrNAcas8RsVNkRiCRcAYgvVNojxjjxQWEXePayGw3upbxmYn/o37PsE5ghakf4UAZP RVNhnsDppdeM64yMEvXq5CfNYRKfPe3s7e9eSVLoE6W8e8WKvvy3WpbiRWhpVDzp5U+SuA 5c5l4UoPsQBOdH+ZCJ2vWtZoDqFORgw/e98anUa+WRm4lgYyFwRuPK46D+x12abBdlNemz X+lhEVK+Ul+zIsrMp0VxKNXDROn/wBkNoRFa9U708hh39o2IeQAwpeVc8iRBO8YScqeFHq 44BhxChkOcp85sUaGcMkUj1amX74aMciK3evZZoGWHPWxKMQTKYNZB+eKEWN8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763228552; 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=Likorg4G6KDLJA1lrioUmYAyaIgQtqlE0xmZYQAp5HY=; b=p+/5w2msuuHxAZEUS/2DILEjhKSpF7dev6ucKIpp5W10AOW2tWoCDxNn74YkoQJEvh2tQA jHgP8l66bqZLPjE4e8oVPahieYSRPUEjSjeeutzJ5U0brs0fOtkQ+OpneNGJz5Dkfgdhvp 6lyNeDlMiqnfCRY3qa7YymOHs7BpoiGPXdDgNptb5EMDx6fLc4yO1nOt6aR2Fs4uCI54As HwQM6D/SwbgJ590JTaXR3I8/Mewlm4Nq7pdZ9x/1QqNhsj65rAAYRelG8U4QDQQmAQuMcg 0sKVBkTWGuFJCEJyx2lSgp37AEGc85TqfoijBAPGYJDyRJTAaEPpwkf75YLrpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763228552; a=rsa-sha256; cv=none; b=H438+9/oU5x3ZyNwnqpAUpAWIzq+zJMj8J/QMkcP5I9F+xd8l0Bkz8voJ9rYTZ/26foEHj qJ+YIzdoy9gOlakPZAkfWQj4GbnbmSiDkp13um1xLThXakdSSUyivSt4sIwtH9DrdHaO3u rY3J5oZIjbZQ2bbWcabKxex2dlnvgRq4Z74duaMlFuupLgHlwiaSEuw89KkR8t3TKHWJQ/ Wo6j7vBuS0gzWKHZziVy4CDQXwshNJsi75itueVrfLioPN6Nc7QsHywLOGPdWBblFBjuRb PwLPEXjf/pXA2mh56IRqORyl7e9yJK7lRE/bM2MeR13NQ9CVpkWLvFzwlKnpkw== 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 4d81YN5czJz12S3; Sat, 15 Nov 2025 17:42:32 +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 5AFHgWp5022480; Sat, 15 Nov 2025 17:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AFHgWkq022477; Sat, 15 Nov 2025 17:42:32 GMT (envelope-from git) Date: Sat, 15 Nov 2025 17:42:32 GMT Message-Id: <202511151742.5AFHgWkq022477@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 295f7255a391 - stable/15 - arm64/vmm: Fix handling of MDCR_EL2.TDE 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 295f7255a3917dd7e176c2fcb1034d629df0ac08 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=295f7255a3917dd7e176c2fcb1034d629df0ac08 commit 295f7255a3917dd7e176c2fcb1034d629df0ac08 Author: Mark Johnston AuthorDate: 2025-11-12 15:19:07 +0000 Commit: Mark Johnston CommitDate: 2025-11-15 17:42:16 +0000 arm64/vmm: Fix handling of MDCR_EL2.TDE TDE (make EL2 the target EL for debug exceptions) is set both when setting guest breakpoints and when single-stepping the guest. In some cases we may configure both capabilities, and when subsequently disabling one of them we need to take care to avoid clearing TDE if the other is still configured. MFC after: 3 days Fixes: 75cb949228bb ("arm64/vmm: Add breakpoint and single-stepping support") Sponsored by: CHERI Research Centre (EPSRC grant UKRI3001) (cherry picked from commit b6f25aca11c98acc49f111f2899ecd4e96c7debd) --- sys/arm64/vmm/vmm_arm64.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c index 5bb038dec2d3..e4deb052d396 100644 --- a/sys/arm64/vmm/vmm_arm64.c +++ b/sys/arm64/vmm/vmm_arm64.c @@ -1356,7 +1356,7 @@ vmmops_setcap(void *vcpui, int num, int val) break; if (val != 0) hypctx->mdcr_el2 |= MDCR_EL2_TDE; - else + else if ((hypctx->setcaps & (1ul << VM_CAP_SS_EXIT)) == 0) hypctx->mdcr_el2 &= ~MDCR_EL2_TDE; break; case VM_CAP_SS_EXIT: @@ -1377,7 +1377,8 @@ vmmops_setcap(void *vcpui, int num, int val) hypctx->mdscr_el1 &= ~MDSCR_SS; hypctx->mdscr_el1 |= hypctx->debug_mdscr; hypctx->debug_mdscr &= ~MDSCR_SS; - hypctx->mdcr_el2 &= ~MDCR_EL2_TDE; + if ((hypctx->setcaps & (1ul << VM_CAP_BRK_EXIT)) == 0) + hypctx->mdcr_el2 &= ~MDCR_EL2_TDE; } break; case VM_CAP_MASK_HWINTR: