Commit c57cd3c8 authored Jan 29, 2019 by Suthikulpanit, Suravee Committed by Paolo Bonzini Feb 20, 2019

svm: Fix improper check when deactivate AVIC



The function svm_refresh_apicv_exec_ctrl() always returning prematurely
as kvm_vcpu_apicv_active() always return false when calling from
the function arch/x86/kvm/x86.c:kvm_vcpu_deactivate_apicv().
This is because the apicv_active is set to false just before calling
refresh_apicv_exec_ctrl().

Also, we need to mark VMCB_AVIC bit as dirty instead of VMCB_INTR.

So, fix svm_refresh_apicv_exec_ctrl() to properly deactivate AVIC.

Fixes: 67034bb9 ('KVM: SVM: Add irqchip_split() checks before enabling AVIC')
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent f7589cca

arch/x86/kvm/svm.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -5122,11 +5122,11 @@ static void svm_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu)
		struct vcpu_svm *svm = to_svm(vcpu);
		struct vmcb *vmcb = svm->vmcb;

		if (!kvm_vcpu_apicv_active(&svm->vcpu))
		return;

		if (kvm_vcpu_apicv_active(vcpu))
		vmcb->control.int_ctl \|= AVIC_ENABLE_MASK;
		else
		vmcb->control.int_ctl &= ~AVIC_ENABLE_MASK;
		mark_dirty(vmcb, VMCB_INTR);
		mark_dirty(vmcb, VMCB_AVIC);
		}

		static void svm_load_eoi_exitmap(struct kvm_vcpu vcpu, u64 eoi_exit_bitmap)

Admin message