From nobody Thu Sep 17 09:56:06 2026 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 4hlrjz1gz7z6sn3B for ; Thu, 17 Sep 2026 09:56:07 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hlrjy57bhz3Qgb for ; Thu, 17 Sep 2026 09:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789638966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XUZloB3wZ2REGJAvSJ8KIbA/pyPuQkmyDclgd0VofwQ=; b=Gahv5IMOXKsPpbp75PU8ycIsqZC1I4GaXhp08ram59PVsCYAoeZMZiJ+rrnvGm8BPao0F8 diQ4OmSmPc7IsUKIMhM2FTECL5+cNcqER8AZjNO3kZudJ3c9XxI8j3wQH8PiH176awGw/R pq+m23aUDsqc1WpnIgMLQL/Hpl99kPgmAbSvwqwKRPkRyx+FOhPydMEFZKulLNlgCvoPIx R4ZnG6daYB7Mzu6RNUnTSQ7vKkYpTKrAYxvUb+R1z649hN6dxSO0WF8jsybpwdmIb0GjsH rWiKHbT+noOj3h1QkeNmAXOLcVa1BDFPym5yS6m8qkj0/K+PWQ9zzRkrhgaegw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789638966; b=KRELOjdZjLdUhdRQJ5d2T7LDcIvgz5tpv07G2tiRyEbQdcLKgVTVmhi2tmfoX9BZxUHptu oR6JG9jCDAXucRMVfvY5XsO0/4ROlvT6rATrqQBA/v6pxPac69z+z0asIanczK1dtHboQ9 sN2EqKnScKkzTzH0nsx0fkd3HDK+Dp6KTgb3VxrLQRJOtqpuc6eOKT1LWr19JBlLgz3tii uqrO/UQ9USXUgfABx9BXCZ0IAHknI228ZS3dq5fGrNiBpuuUmObKvH+R5JMI7Y/5avceNc LdqUTCmxOfU33KUeV2NgIUV9IvlIV9ERQgLUtnc5++3nvmvosiclU5GzYFZg5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789638966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XUZloB3wZ2REGJAvSJ8KIbA/pyPuQkmyDclgd0VofwQ=; b=CV9TtknGAusRsuDovo2K6mK03DIvHMIUEH1oCuZj9+UIfZdI5Y9Owc1HCdOyd1srhoXGwd g5GO0QrAoNDPA47MU1IktMl6ZLfm41JP2X7hj299TKrAclnNOLqrPLZG6Bmi/a5LJAMIwd tJ79y/pXnj9dqVGrkBdEL5OKjZEEH3mIUcPW32YosrJ8REqwYnlszr2xi/KC3Ht0B/R4Oa gDyxgzzKziyCci/vB0Rf/t8jTPyN9crBq+kqO76TcxAX9r7LGu4xXEYMUsv/EsP05pTGRx 6sDrQU3OcmaG+XiwawFsNn/9zE9Q/Bpc2Hen5jV8blZuU9ye1lVbf3eF3bW+Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hlrjy3vbVzRfn for ; Thu, 17 Sep 2026 09:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42aff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 17 Sep 2026 09:56:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Kajetan Puchalski From: Andrew Turner Subject: git: 67242cc4284e - main - arm64/vmm: vtimer: Read CNTPCT_EL0 through a dedicated macro 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 67242cc4284e44936068945d9960c8f1fef136c1 Auto-Submitted: auto-generated Date: Thu, 17 Sep 2026 09:56:06 +0000 Message-Id: <6aabb936.42aff.409d939f@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=67242cc4284e44936068945d9960c8f1fef136c1 commit 67242cc4284e44936068945d9960c8f1fef136c1 Author: Kajetan Puchalski AuthorDate: 2026-05-12 16:12:04 +0000 Commit: Andrew Turner CommitDate: 2026-09-17 09:20:22 +0000 arm64/vmm: vtimer: Read CNTPCT_EL0 through a dedicated macro CNTPCT_EL0 needs to be read after an ISB in order to ensure a consistent value irrespective of speculative execution. Make existing reads of CNTPCT_EL0 use a new dedicated accessor macro that expands to the correct instruction sequence. Signed-off-by: Kajetan Puchalski Reviewed by: andrew Sponsored by: Arm Ltd Pull Request: https://github.com/freebsd/freebsd-src/pull/2423 --- sys/arm64/include/_armreg.h | 7 +++++++ sys/arm64/vmm/io/vtimer.c | 14 +++++++------- sys/arm64/vmm/vmm_arm64.c | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/sys/arm64/include/_armreg.h b/sys/arm64/include/_armreg.h index 0ade9e6168c9..e00a2b2033af 100644 --- a/sys/arm64/include/_armreg.h +++ b/sys/arm64/include/_armreg.h @@ -80,6 +80,13 @@ _val; \ }) +/* TODO: Use CNTPCTSS when FEAT_ECV is available */ +#define READ_CNTPCT() \ +({ uint64_t _val; \ + __asm __volatile("isb\nmrs %0, cntpct_el0" : "=&r" (_val));\ + _val; \ +}) + #define UL(x) UINT64_C(x) #endif /* !_MACHINE__ARMREG_H_ */ diff --git a/sys/arm64/vmm/io/vtimer.c b/sys/arm64/vmm/io/vtimer.c index 509e52947524..00767d3b59b5 100644 --- a/sys/arm64/vmm/io/vtimer.c +++ b/sys/arm64/vmm/io/vtimer.c @@ -96,7 +96,7 @@ vtimer_virtual_timer_intr(void *arg) goto out; } - cntpct_el0 = READ_SPECIALREG(cntpct_el0) - + cntpct_el0 = READ_CNTPCT() - hypctx_read_sys_reg(hypctx, HOST_CNTVOFF_EL2); if (hypctx->vtimer_cpu.virt_timer.cntx_cval_el0 < cntpct_el0) vgic_inject_irq(hypctx->hyp, vcpu_vcpuid(hypctx->vcpu), @@ -279,7 +279,7 @@ vtimer_sync_hwstate(struct hypctx *hypctx) { uint64_t cntpct_el0; - cntpct_el0 = READ_SPECIALREG(cntpct_el0) - + cntpct_el0 = READ_CNTPCT() - hypctx_read_sys_reg(hypctx, HOST_CNTVOFF_EL2); vtime_sync_timer(hypctx, &hypctx->vtimer_cpu.virt_timer, cntpct_el0); /* If FEAT_ECV_POFF is in use then we need to sync the physical timer */ @@ -321,7 +321,7 @@ vtimer_schedule_irq(struct hypctx *hypctx, bool phys) timer = &hypctx->vtimer_cpu.phys_timer; else timer = &hypctx->vtimer_cpu.virt_timer; - cntpct_el0 = READ_SPECIALREG(cntpct_el0) - + cntpct_el0 = READ_CNTPCT() - hypctx_read_sys_reg(hypctx, HOST_CNTVOFF_EL2); if (timer->cntx_cval_el0 < cntpct_el0) { /* Timer set in the past, trigger interrupt */ @@ -379,7 +379,7 @@ vtimer_phys_ctl_read(struct vcpu *vcpu, uint64_t *rval, void *arg) hypctx = vcpu_get_cookie(vcpu); vtimer_cpu = &hypctx->vtimer_cpu; - cntpct_el0 = READ_SPECIALREG(cntpct_el0) - hypctx_read_sys_reg(hypctx, HOST_CNTVOFF_EL2); + cntpct_el0 = READ_CNTPCT() - hypctx_read_sys_reg(hypctx, HOST_CNTVOFF_EL2); if (vtimer_cpu->phys_timer.cntx_cval_el0 < cntpct_el0) /* Timer condition met */ *rval = vtimer_cpu->phys_timer.cntx_ctl_el0 | CNTP_CTL_ISTATUS; @@ -422,7 +422,7 @@ vtimer_phys_cnt_read(struct vcpu *vcpu, uint64_t *rval, void *arg) struct hypctx *hypctx; hypctx = vcpu_get_cookie(vcpu); - *rval = READ_SPECIALREG(cntpct_el0) - hypctx_read_sys_reg(hypctx, HOST_CNTVOFF_EL2); + *rval = READ_CNTPCT() - hypctx_read_sys_reg(hypctx, HOST_CNTVOFF_EL2); return (0); } @@ -484,7 +484,7 @@ vtimer_phys_tval_read(struct vcpu *vcpu, uint64_t *rval, void *arg) */ *rval = (uint32_t)RES1; } else { - cntpct_el0 = READ_SPECIALREG(cntpct_el0) - + cntpct_el0 = READ_CNTPCT() - hypctx_read_sys_reg(hypctx, HOST_CNTVOFF_EL2); *rval = vtimer_cpu->phys_timer.cntx_cval_el0 - cntpct_el0; } @@ -502,7 +502,7 @@ vtimer_phys_tval_write(struct vcpu *vcpu, uint64_t wval, void *arg) hypctx = vcpu_get_cookie(vcpu); vtimer_cpu = &hypctx->vtimer_cpu; - cntpct_el0 = READ_SPECIALREG(cntpct_el0) - hypctx_read_sys_reg(hypctx, HOST_CNTVOFF_EL2); + cntpct_el0 = READ_CNTPCT() - hypctx_read_sys_reg(hypctx, HOST_CNTVOFF_EL2); vtimer_cpu->phys_timer.cntx_cval_el0 = (int32_t)wval + cntpct_el0; vtimer_remove_irq(hypctx, vcpu); diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c index e2d667575706..8b405b49fc84 100644 --- a/sys/arm64/vmm/vmm_arm64.c +++ b/sys/arm64/vmm/vmm_arm64.c @@ -542,7 +542,7 @@ vmmops_init(struct vm *vm, pmap_t pmap) if (ID_AA64MMFR1_HCX_VAL(idreg) >= ID_AA64MMFR1_HCX_IMPL) hyp->feats |= HYP_FEAT_HCX; - hyp->cntvoff_el2 = READ_SPECIALREG(cntpct_el0); + hyp->cntvoff_el2 = READ_CNTPCT(); vgic_vminit(hyp); if (!in_vhe())