|
@@ -229,6 +229,22 @@ static int kvm_timer_update_state(struct kvm_vcpu *vcpu)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+/* Schedule the background timer for the emulated timer. */
|
|
|
+static void kvm_timer_emulate(struct kvm_vcpu *vcpu,
|
|
|
+ struct arch_timer_context *timer_ctx)
|
|
|
+{
|
|
|
+ struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
|
|
|
+
|
|
|
+ if (kvm_timer_should_fire(timer_ctx))
|
|
|
+ return;
|
|
|
+
|
|
|
+ if (!kvm_timer_irq_can_fire(timer_ctx))
|
|
|
+ return;
|
|
|
+
|
|
|
+ /* The timer has not yet expired, schedule a background timer */
|
|
|
+ timer_arm(timer, kvm_timer_compute_delta(timer_ctx));
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* Schedule the background timer before calling kvm_vcpu_block, so that this
|
|
|
* thread is removed from its waitqueue and made runnable when there's a timer
|
|
@@ -286,6 +302,9 @@ void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu)
|
|
|
if (kvm_timer_update_state(vcpu))
|
|
|
return;
|
|
|
|
|
|
+ /* Set the background timer for the physical timer emulation. */
|
|
|
+ kvm_timer_emulate(vcpu, vcpu_ptimer(vcpu));
|
|
|
+
|
|
|
/*
|
|
|
* If we enter the guest with the virtual input level to the VGIC
|
|
|
* asserted, then we have already told the VGIC what we need to, and
|
|
@@ -348,7 +367,11 @@ void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu)
|
|
|
{
|
|
|
struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
|
|
|
|
|
|
- BUG_ON(timer_is_armed(timer));
|
|
|
+ /*
|
|
|
+ * This is to cancel the background timer for the physical timer
|
|
|
+ * emulation if it is set.
|
|
|
+ */
|
|
|
+ timer_disarm(timer);
|
|
|
|
|
|
/*
|
|
|
* The guest could have modified the timer registers or the timer
|