Skip to content

Commit 4a267aa

Browse files
Alexandru EliseiMarc Zyngier
authored andcommitted
KVM: arm64: Treat emulated TVAL TimerValue as a signed 32-bit integer
According to the ARM ARM, registers CNT{P,V}_TVAL_EL0 have bits [63:32] RES0 [1]. When reading the register, the value is truncated to the least significant 32 bits [2], and on writes, TimerValue is treated as a signed 32-bit integer [1, 2]. When the guest behaves correctly and writes 32-bit values, treating TVAL as an unsigned 64 bit register works as expected. However, things start to break down when the guest writes larger values, because (u64)0x1_ffff_ffff = 8589934591. but (s32)0x1_ffff_ffff = -1, and the former will cause the timer interrupt to be asserted in the future, but the latter will cause it to be asserted now. Let's treat TVAL as a signed 32-bit register on writes, to match the behaviour described in the architecture, and the behaviour experimentally exhibited by the virtual timer on a non-vhe host. [1] Arm DDI 0487E.a, section D13.8.18 [2] Arm DDI 0487E.a, section D11.2.4 Signed-off-by: Alexandru Elisei <[email protected]> [maz: replaced the read-side mask with lower_32_bits] Signed-off-by: Marc Zyngier <[email protected]> Fixes: 8fa7616 ("KVM: arm/arm64: arch_timer: Fix CNTP_TVAL calculation") Link: https://lore.kernel.org/r/[email protected]
1 parent c01d6a1 commit 4a267aa

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

virt/kvm/arm/arch_timer.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,7 @@ static u64 kvm_arm_timer_read(struct kvm_vcpu *vcpu,
805805
switch (treg) {
806806
case TIMER_REG_TVAL:
807807
val = timer->cnt_cval - kvm_phys_timer_read() + timer->cntvoff;
808+
val &= lower_32_bits(val);
808809
break;
809810

810811
case TIMER_REG_CTL:
@@ -850,7 +851,7 @@ static void kvm_arm_timer_write(struct kvm_vcpu *vcpu,
850851
{
851852
switch (treg) {
852853
case TIMER_REG_TVAL:
853-
timer->cnt_cval = kvm_phys_timer_read() - timer->cntvoff + val;
854+
timer->cnt_cval = kvm_phys_timer_read() - timer->cntvoff + (s32)val;
854855
break;
855856

856857
case TIMER_REG_CTL:

0 commit comments

Comments
 (0)