Commit a879a88e authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: SVM: Compute dest based on sender's x2APIC status for AVIC kick 



Compute the destination from ICRH using the sender's x2APIC status, not
each (potential) target's x2APIC status.

Fixes: c514d3a3 ("KVM: SVM: Update avic_kick_target_vcpus to support 32-bit APIC ID")
Cc: Li RongQing <lirongqing@baidu.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarLi RongQing <lirongqing@baidu.com>
Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20230106011306.85230-13-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f628a34a

arch/x86/kvm/svm/avic.c

+1 −7
Original line number Diff line number Diff line
@@ -429,6 +429,7 @@ static int avic_kick_target_vcpus_fast(struct kvm *kvm, struct kvm_lapic *source 
static void avic_kick_target_vcpus(struct kvm *kvm, struct kvm_lapic *source,

				   u32 icrl, u32 icrh, u32 index)

{

	u32 dest = apic_x2apic_mode(source) ? icrh : GET_XAPIC_DEST_FIELD(icrh);

	unsigned long i;

	struct kvm_vcpu *vcpu;
@@ -444,13 +445,6 @@ static void avic_kick_target_vcpus(struct kvm *kvm, struct kvm_lapic *source, 
	 * since entered the guest will have processed pending IRQs at VMRUN.

	 */

	kvm_for_each_vcpu(i, vcpu, kvm) {

		u32 dest;



		if (apic_x2apic_mode(vcpu->arch.apic))

			dest = icrh;

		else

			dest = GET_XAPIC_DEST_FIELD(icrh);



		if (kvm_apic_match_dest(vcpu, source, icrl & APIC_SHORT_MASK,

					dest, icrl & APIC_DEST_MASK)) {

			vcpu->arch.apic->irr_pending = true;