Merge tag 'powerpc-4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / arch / x86 / kvm / lapic.c

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index e2c1fb8d35cea28af684d4ba76d70a5e2e12e9a5..924ac8ce9d5004f9db4126a81f178c2bf0e6ff40 100644 (file)
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -364,32 +364,41 @@ static u8 count_vectors(void *bitmap)
        return count;
 }
 
-int __kvm_apic_update_irr(u32 *pir, void *regs)
+bool __kvm_apic_update_irr(u32 *pir, void *regs, int *max_irr)
 {
        u32 i, vec;
-       u32 pir_val, irr_val;
-       int max_irr = -1;
+       u32 pir_val, irr_val, prev_irr_val;
+       int max_updated_irr;
+
+       max_updated_irr = -1;
+       *max_irr = -1;
 
        for (i = vec = 0; i <= 7; i++, vec += 32) {
                pir_val = READ_ONCE(pir[i]);
                irr_val = *((u32 *)(regs + APIC_IRR + i * 0x10));
                if (pir_val) {
+                       prev_irr_val = irr_val;
                        irr_val |= xchg(&pir[i], 0);
                        *((u32 *)(regs + APIC_IRR + i * 0x10)) = irr_val;
+                       if (prev_irr_val != irr_val) {
+                               max_updated_irr =
+                                       __fls(irr_val ^ prev_irr_val) + vec;
+                       }
                }
                if (irr_val)
-                       max_irr = __fls(irr_val) + vec;
+                       *max_irr = __fls(irr_val) + vec;
        }
 
-       return max_irr;
+       return ((max_updated_irr != -1) &&
+               (max_updated_irr == *max_irr));
 }
 EXPORT_SYMBOL_GPL(__kvm_apic_update_irr);
 
-int kvm_apic_update_irr(struct kvm_vcpu *vcpu, u32 *pir)
+bool kvm_apic_update_irr(struct kvm_vcpu *vcpu, u32 *pir, int *max_irr)
 {
        struct kvm_lapic *apic = vcpu->arch.apic;
 
-       return __kvm_apic_update_irr(pir, apic->regs);
+       return __kvm_apic_update_irr(pir, apic->regs, max_irr);
 }
 EXPORT_SYMBOL_GPL(kvm_apic_update_irr);
 
@@ -581,7 +590,7 @@ static void pv_eoi_clr_pending(struct kvm_vcpu *vcpu)
 static int apic_has_interrupt_for_ppr(struct kvm_lapic *apic, u32 ppr)
 {
        int highest_irr;
-       if (kvm_x86_ops->sync_pir_to_irr && apic->vcpu->arch.apicv_active)
+       if (apic->vcpu->arch.apicv_active)
                highest_irr = kvm_x86_ops->sync_pir_to_irr(apic->vcpu);
        else
                highest_irr = apic_find_highest_irr(apic);