Commit 30811174 authored Feb 08, 2022 by Paolo Bonzini

KVM: SVM: set IRR in svm_deliver_interrupt

SVM has to set IRR for both the AVIC and the software-LAPIC case,
so pull it up to the common function that handles both configurations.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 0a5f7842

arch/x86/kvm/svm/avic.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -668,8 +668,6 @@ int svm_deliver_avic_intr(struct kvm_vcpu *vcpu, int vec)
		if (!vcpu->arch.apicv_active)
		return -1;

		kvm_lapic_set_irr(vec, vcpu->arch.apic);

		/*
		* Pairs with the smp_mb_*() after setting vcpu->guest_mode in
		* vcpu_enter_guest() to ensure the write to the vIRR is ordered before

arch/x86/kvm/svm/svm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3304,8 +3304,8 @@ static void svm_deliver_interrupt(struct kvm_lapic *apic, int delivery_mode,
		{
		struct kvm_vcpu *vcpu = apic->vcpu;

		if (svm_deliver_avic_intr(vcpu, vector)) {
		kvm_lapic_set_irr(vector, apic);
		if (svm_deliver_avic_intr(vcpu, vector)) {
		kvm_make_request(KVM_REQ_EVENT, vcpu);
		kvm_vcpu_kick(vcpu);
		} else {