]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: arm64: selftests: Fix xVAL init in arch_timer_edge_cases
authorSebastian Ott <sebott@redhat.com>
Thu, 5 Jun 2025 10:36:12 +0000 (12:36 +0200)
committerMarc Zyngier <maz@kernel.org>
Thu, 5 Jun 2025 13:28:01 +0000 (14:28 +0100)
arch_timer_edge_cases hits the following assertion in < 10% of the test runs:

==== Test Assertion Failure ====
  arm64/arch_timer_edge_cases.c:490: timer_get_cntct(timer) >= DEF_CNT + (timer_get_cntfrq() * (uint64_t)(delta_2_ms) / 1000)
  pid=17110 tid=17110 errno=4 - Interrupted system call
     1  0x0000000000404ec7: test_run at arch_timer_edge_cases.c:945
     2  0x0000000000401fa3: main at arch_timer_edge_cases.c:1074
     3  0x0000ffffa774b587: ?? ??:0
     4  0x0000ffffa774b65f: ?? ??:0
     5  0x000000000040206f: _start at ??:?
  timer_get_cntct(timer) >= DEF_CNT + msec_to_cycles(delta_2_ms)

Enabling the timer without proper xval initialization in set_tval_irq()
resulted in an early interrupt during timer reprogramming. Make sure
to set the xval before setting the enable bit.

Signed-off-by: Sebastian Ott <sebott@redhat.com>
Link: https://lore.kernel.org/r/20250605103613.14544-4-sebott@redhat.com
Signed-off-by: Marc Zyngier <maz@kernel.org>
tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c

index a813b4c6c8172d1328661a15c8352bb9d0c2e44a..be8bbedc933b31bac01779afa2f0612d55bb7971 100644 (file)
@@ -191,8 +191,8 @@ static void set_tval_irq(enum arch_timer timer, uint64_t tval_cycles,
 {
        atomic_set(&shared_data.handled, 0);
        atomic_set(&shared_data.spurious, 0);
-       timer_set_ctl(timer, ctl);
        timer_set_tval(timer, tval_cycles);
+       timer_set_ctl(timer, ctl);
 }
 
 static void set_xval_irq(enum arch_timer timer, uint64_t xval, uint32_t ctl,