Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / arch / x86 / kvm / lapic.c

diff --git a/kernel/arch/x86/kvm/lapic.c b/kernel/arch/x86/kvm/lapic.c
index 701f912..6cd4f4b 100644 (file)
--- a/kernel/arch/x86/kvm/lapic.c
+++ b/kernel/arch/x86/kvm/lapic.c
@@ -1294,41 +1294,52 @@ bool kvm_lapic_hv_timer_in_use(struct kvm_vcpu *vcpu)
 }
 EXPORT_SYMBOL_GPL(kvm_lapic_hv_timer_in_use);
 
+static void cancel_hv_tscdeadline(struct kvm_lapic *apic)
+{
+       kvm_x86_ops->cancel_hv_timer(apic->vcpu);
+       apic->lapic_timer.hv_timer_in_use = false;
+}
+
 void kvm_lapic_expired_hv_timer(struct kvm_vcpu *vcpu)
 {
        struct kvm_lapic *apic = vcpu->arch.apic;
 
        WARN_ON(!apic->lapic_timer.hv_timer_in_use);
        WARN_ON(swait_active(&vcpu->wq));
-       kvm_x86_ops->cancel_hv_timer(vcpu);
-       apic->lapic_timer.hv_timer_in_use = false;
+       cancel_hv_tscdeadline(apic);
        apic_timer_expired(apic);
 }
 EXPORT_SYMBOL_GPL(kvm_lapic_expired_hv_timer);
 
+static bool start_hv_tscdeadline(struct kvm_lapic *apic)
+{
+       u64 tscdeadline = apic->lapic_timer.tscdeadline;
+
+       if (atomic_read(&apic->lapic_timer.pending) ||
+               kvm_x86_ops->set_hv_timer(apic->vcpu, tscdeadline)) {
+               if (apic->lapic_timer.hv_timer_in_use)
+                       cancel_hv_tscdeadline(apic);
+       } else {
+               apic->lapic_timer.hv_timer_in_use = true;
+               hrtimer_cancel(&apic->lapic_timer.timer);
+
+               /* In case the sw timer triggered in the window */
+               if (atomic_read(&apic->lapic_timer.pending))
+                       cancel_hv_tscdeadline(apic);
+       }
+       trace_kvm_hv_timer_state(apic->vcpu->vcpu_id,
+                       apic->lapic_timer.hv_timer_in_use);
+       return apic->lapic_timer.hv_timer_in_use;
+}
+
 void kvm_lapic_switch_to_hv_timer(struct kvm_vcpu *vcpu)
 {
        struct kvm_lapic *apic = vcpu->arch.apic;
 
        WARN_ON(apic->lapic_timer.hv_timer_in_use);
 
-       if (apic_lvtt_tscdeadline(apic) &&
-           !atomic_read(&apic->lapic_timer.pending)) {
-               u64 tscdeadline = apic->lapic_timer.tscdeadline;
-
-               if (!kvm_x86_ops->set_hv_timer(vcpu, tscdeadline)) {
-                       apic->lapic_timer.hv_timer_in_use = true;
-                       hrtimer_cancel(&apic->lapic_timer.timer);
-
-                       /* In case the sw timer triggered in the window */
-                       if (atomic_read(&apic->lapic_timer.pending)) {
-                               apic->lapic_timer.hv_timer_in_use = false;
-                               kvm_x86_ops->cancel_hv_timer(apic->vcpu);
-                       }
-               }
-               trace_kvm_hv_timer_state(vcpu->vcpu_id,
-                               apic->lapic_timer.hv_timer_in_use);
-       }
+       if (apic_lvtt_tscdeadline(apic))
+               start_hv_tscdeadline(apic);
 }
 EXPORT_SYMBOL_GPL(kvm_lapic_switch_to_hv_timer);
 
@@ -1340,8 +1351,7 @@ void kvm_lapic_switch_to_sw_timer(struct kvm_vcpu *vcpu)
        if (!apic->lapic_timer.hv_timer_in_use)
                return;
 
-       kvm_x86_ops->cancel_hv_timer(vcpu);
-       apic->lapic_timer.hv_timer_in_use = false;
+       cancel_hv_tscdeadline(apic);
 
        if (atomic_read(&apic->lapic_timer.pending))
                return;
@@ -1396,15 +1406,7 @@ static void start_apic_timer(struct kvm_lapic *apic)
                           ktime_to_ns(ktime_add_ns(now,
                                        apic->lapic_timer.period)));
        } else if (apic_lvtt_tscdeadline(apic)) {
-               /* lapic timer in tsc deadline mode */
-               u64 tscdeadline = apic->lapic_timer.tscdeadline;
-
-               if (kvm_x86_ops->set_hv_timer &&
-                   !kvm_x86_ops->set_hv_timer(apic->vcpu, tscdeadline)) {
-                       apic->lapic_timer.hv_timer_in_use = true;
-                       trace_kvm_hv_timer_state(apic->vcpu->vcpu_id,
-                                       apic->lapic_timer.hv_timer_in_use);
-               } else
+               if (!(kvm_x86_ops->set_hv_timer && start_hv_tscdeadline(apic)))
                        start_sw_tscdeadline(apic);
        }
 }
@@ -2264,3 +2266,9 @@ void kvm_lapic_init(void)
        jump_label_rate_limit(&apic_hw_disabled, HZ);
        jump_label_rate_limit(&apic_sw_disabled, HZ);
 }
+
+void kvm_lapic_exit(void)
+{
+       static_key_deferred_flush(&apic_hw_disabled);
+       static_key_deferred_flush(&apic_sw_disabled);
+}