1 files changed, 27 insertions, 18 deletions

diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index 4cf9b91e6c9b..772bf74ac2e9 100644
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@ -307,8 +307,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
 
 int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)
 {
-        return kvm_timer_should_fire(vcpu_vtimer(vcpu)) ||
-               kvm_timer_should_fire(vcpu_ptimer(vcpu));
+        return kvm_timer_is_pending(vcpu);
 }
 
 void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu)
@@ -354,18 +353,18 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
         vcpu->arch.host_cpu_context = this_cpu_ptr(kvm_host_cpu_state);
 
         kvm_arm_set_running_vcpu(vcpu);
-
         kvm_vgic_load(vcpu);
+        kvm_timer_vcpu_load(vcpu);
 }
 
 void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
 {
+        kvm_timer_vcpu_put(vcpu);
         kvm_vgic_put(vcpu);
 
         vcpu->cpu = -1;
 
         kvm_arm_set_running_vcpu(NULL);
-        kvm_timer_vcpu_put(vcpu);
 }
 
 static void vcpu_power_off(struct kvm_vcpu *vcpu)
@@ -657,11 +656,10 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
 
                 kvm_pmu_flush_hwstate(vcpu);
 
-                kvm_timer_flush_hwstate(vcpu);
-                kvm_vgic_flush_hwstate(vcpu);
-
                 local_irq_disable();
 
+                kvm_vgic_flush_hwstate(vcpu);
+
                 /*
                  * If we have a singal pending, or need to notify a userspace
                  * irqchip about timer or PMU level changes, then we exit (and
@@ -686,10 +684,10 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
                 if (ret <= 0 || need_new_vmid_gen(vcpu->kvm) ||
                     kvm_request_pending(vcpu)) {
                         vcpu->mode = OUTSIDE_GUEST_MODE;
-                        local_irq_enable();
                         kvm_pmu_sync_hwstate(vcpu);
                         kvm_timer_sync_hwstate(vcpu);
                         kvm_vgic_sync_hwstate(vcpu);
+                        local_irq_enable();
                         preempt_enable();
                         continue;
                 }
@@ -713,6 +711,27 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
                 kvm_arm_clear_debug(vcpu);
 
                 /*
+                 * We must sync the PMU state before the vgic state so
+                 * that the vgic can properly sample the updated state of the
+                 * interrupt line.
+                 */
+                kvm_pmu_sync_hwstate(vcpu);
+
+                /*
+                 * Sync the vgic state before syncing the timer state because
+                 * the timer code needs to know if the virtual timer
+                 * interrupts are active.
+                 */
+                kvm_vgic_sync_hwstate(vcpu);
+
+                /*
+                 * Sync the timer hardware state before enabling interrupts as
+                 * we don't want vtimer interrupts to race with syncing the
+                 * timer virtual interrupt state.
+                 */
+                kvm_timer_sync_hwstate(vcpu);
+
+                /*
                  * We may have taken a host interrupt in HYP mode (ie
                  * while executing the guest). This interrupt is still
                  * pending, as we haven't serviced it yet!
@@ -735,16 +754,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
                 guest_exit();
                 trace_kvm_exit(ret, kvm_vcpu_trap_get_class(vcpu), *vcpu_pc(vcpu));
 
-                /*
-                 * We must sync the PMU and timer state before the vgic state so
-                 * that the vgic can properly sample the updated state of the
-                 * interrupt line.
-                 */
-                kvm_pmu_sync_hwstate(vcpu);
-                kvm_timer_sync_hwstate(vcpu);
-
-                kvm_vgic_sync_hwstate(vcpu);
-
                 preempt_enable();
 
                 ret = handle_exit(vcpu, run, ret);