KVM: x86: VMX: set irr_pending in kvm_apic_update_irr

Maxim Levitsky · bonzini · commit cff540ebef38 · 2023-07-29T11:05:24.000-04:00
When the APICv is inhibited, the irr_pending optimization is used.

Therefore, when kvm_apic_update_irr sets bits in the IRR,
it must set irr_pending to true as well.

Signed-off-by: Maxim Levitsky &lt;mlevitsk@redhat.com&gt;
Message-Id: &lt;20230726135945.260841-3-mlevitsk@redhat.com&gt;
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
@@ -666,8 +666,11 @@ EXPORT_SYMBOL_GPL(__kvm_apic_update_irr);
 bool kvm_apic_update_irr(struct kvm_vcpu *vcpu, u32 *pir, int *max_irr)
 {
 	struct kvm_lapic *apic = vcpu->arch.apic;
+	bool irr_updated = __kvm_apic_update_irr(pir, apic->regs, max_irr);
 
-	return __kvm_apic_update_irr(pir, apic->regs, max_irr);
+	if (unlikely(!apic->apicv_active && irr_updated))
+		apic->irr_pending = true;
+	return irr_updated;
 }
 EXPORT_SYMBOL_GPL(kvm_apic_update_irr);
 

Original file line number	Diff line number	Diff line change
`@@ -666,8 +666,11 @@ EXPORT_SYMBOL_GPL(__kvm_apic_update_irr);`
`666`	`666`	`bool kvm_apic_update_irr(struct kvm_vcpu vcpu, u32 pir, int *max_irr)`
`667`	`667`	`{`
`668`	`668`	`struct kvm_lapic *apic = vcpu->arch.apic;`
	`669`	`+ bool irr_updated = __kvm_apic_update_irr(pir, apic->regs, max_irr);`
`669`	`670`
`670`		`- return __kvm_apic_update_irr(pir, apic->regs, max_irr);`
	`671`	`+ if (unlikely(!apic->apicv_active && irr_updated))`
	`672`	`+ apic->irr_pending = true;`
	`673`	`+ return irr_updated;`
`671`	`674`	`}`
`672`	`675`	`EXPORT_SYMBOL_GPL(kvm_apic_update_irr);`
`673`	`676`