]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
arm64: Force the use of CNTVCT_EL0 in __delay()
authorMarc Zyngier <maz@kernel.org>
Fri, 13 Feb 2026 14:16:19 +0000 (14:16 +0000)
committerWill Deacon <will@kernel.org>
Thu, 19 Feb 2026 12:32:54 +0000 (12:32 +0000)
commit29cc0f3aa7c64d3b3cb9d94c0a0984ba6717bf72
treea249c5a81a6ee9729a2a097f405936cf69230c57
parent36c0de02575ce59dfd879eb4ef63d53a68bbf9ce
arm64: Force the use of CNTVCT_EL0 in __delay()

Quentin forwards a report from Hyesoo Yu, describing an interesting
problem with the use of WFxT in __delay() when a vcpu is loaded and
that KVM is *not* in VHE mode (either nVHE or hVHE).

In this case, CNTVOFF_EL2 is set to a non-zero value to reflect the
state of the guest virtual counter. At the same time, __delay() is
using get_cycles() to read the counter value, which is indirected to
reading CNTPCT_EL0.

The core of the issue is that WFxT is using the *virtual* counter,
while the kernel is using the physical counter, and that the offset
introduces a really bad discrepancy between the two.

Fix this by forcing the use of CNTVCT_EL0, making __delay() consistent
irrespective of the value of CNTVOFF_EL2.

Reported-by: Hyesoo Yu <hyesoo.yu@samsung.com>
Reported-by: Quentin Perret <qperret@google.com>
Reviewed-by: Quentin Perret <qperret@google.com>
Fixes: 7d26b0516a0d ("arm64: Use WFxT for __delay() when possible")
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/ktosachvft2cgqd5qkukn275ugmhy6xrhxur4zqpdxlfr3qh5h@o3zrfnsq63od
Cc: stable@vger.kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/lib/delay.c