Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-microblaze.git] / arch / x86 / kvm / hyperv.c

diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 41d2a53..232a86a 100644 (file)
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -88,6 +88,10 @@ static bool synic_has_vector_auto_eoi(struct kvm_vcpu_hv_synic *synic,
 static void synic_update_vector(struct kvm_vcpu_hv_synic *synic,
                                int vector)
 {
+       struct kvm_vcpu *vcpu = hv_synic_to_vcpu(synic);
+       struct kvm_hv *hv = to_kvm_hv(vcpu->kvm);
+       int auto_eoi_old, auto_eoi_new;
+
        if (vector < HV_SYNIC_FIRST_VALID_VECTOR)
                return;
 
@@ -96,10 +100,30 @@ static void synic_update_vector(struct kvm_vcpu_hv_synic *synic,
        else
                __clear_bit(vector, synic->vec_bitmap);
 
+       auto_eoi_old = bitmap_weight(synic->auto_eoi_bitmap, 256);
+
        if (synic_has_vector_auto_eoi(synic, vector))
                __set_bit(vector, synic->auto_eoi_bitmap);
        else
                __clear_bit(vector, synic->auto_eoi_bitmap);
+
+       auto_eoi_new = bitmap_weight(synic->auto_eoi_bitmap, 256);
+
+       if (!!auto_eoi_old == !!auto_eoi_new)
+               return;
+
+       mutex_lock(&vcpu->kvm->arch.apicv_update_lock);
+
+       if (auto_eoi_new)
+               hv->synic_auto_eoi_used++;
+       else
+               hv->synic_auto_eoi_used--;
+
+       __kvm_request_apicv_update(vcpu->kvm,
+                                  !hv->synic_auto_eoi_used,
+                                  APICV_INHIBIT_REASON_HYPERV);
+
+       mutex_unlock(&vcpu->kvm->arch.apicv_update_lock);
 }
 
 static int synic_set_sint(struct kvm_vcpu_hv_synic *synic, int sint,
@@ -933,12 +957,6 @@ int kvm_hv_activate_synic(struct kvm_vcpu *vcpu, bool dont_zero_synic_pages)
 
        synic = to_hv_synic(vcpu);
 
-       /*
-        * Hyper-V SynIC auto EOI SINT's are
-        * not compatible with APICV, so request
-        * to deactivate APICV permanently.
-        */
-       kvm_request_apicv_update(vcpu->kvm, false, APICV_INHIBIT_REASON_HYPERV);
        synic->active = true;
        synic->dont_zero_synic_pages = dont_zero_synic_pages;
        synic->control = HV_SYNIC_CONTROL_ENABLE;
@@ -2476,6 +2494,8 @@ int kvm_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid,
                                ent->eax |= HV_X64_ENLIGHTENED_VMCS_RECOMMENDED;
                        if (!cpu_smt_possible())
                                ent->eax |= HV_X64_NO_NONARCH_CORESHARING;
+
+                       ent->eax |= HV_DEPRECATING_AEOI_RECOMMENDED;
                        /*
                         * Default number of spinlock retry attempts, matches
                         * HyperV 2016.