Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0052191 authored by Yang Zhang's avatar Yang Zhang Committed by Paolo Bonzini
Browse files

kvm: vmx: check apicv is active before using VT-d posted interrupt 



VT-d posted interrupt is relying on the CPU side's posted interrupt.
Need to check whether VCPU's APICv is active before enabing VT-d
posted interrupt.

Fixes: d62caabb
Cc: stable@vger.kernel.org
Signed-off-by: default avatarYang Zhang <yang.zhang.wz@gmail.com>
Signed-off-by: default avatarShengge Ding <shengge.dsg@alibaba-inc.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent caf1ff26

arch/x86/kvm/vmx.c

+10 −5
Original line number Diff line number Diff line
@@ -2072,7 +2072,8 @@ static void vmx_vcpu_pi_load(struct kvm_vcpu *vcpu, int cpu) 
	unsigned int dest;



	if (!kvm_arch_has_assigned_device(vcpu->kvm) ||

		!irq_remapping_cap(IRQ_POSTING_CAP))

		!irq_remapping_cap(IRQ_POSTING_CAP)  ||

		!kvm_vcpu_apicv_active(vcpu))

		return;



	do {
@@ -2180,7 +2181,8 @@ static void vmx_vcpu_pi_put(struct kvm_vcpu *vcpu) 
	struct pi_desc *pi_desc = vcpu_to_pi_desc(vcpu);



	if (!kvm_arch_has_assigned_device(vcpu->kvm) ||

		!irq_remapping_cap(IRQ_POSTING_CAP))

		!irq_remapping_cap(IRQ_POSTING_CAP)  ||

		!kvm_vcpu_apicv_active(vcpu))

		return;



	/* Set SN when the vCPU is preempted */
@@ -10714,7 +10716,8 @@ static int vmx_pre_block(struct kvm_vcpu *vcpu) 
	struct pi_desc *pi_desc = vcpu_to_pi_desc(vcpu);



	if (!kvm_arch_has_assigned_device(vcpu->kvm) ||

		!irq_remapping_cap(IRQ_POSTING_CAP))

		!irq_remapping_cap(IRQ_POSTING_CAP)  ||

		!kvm_vcpu_apicv_active(vcpu))

		return 0;



	vcpu->pre_pcpu = vcpu->cpu;
@@ -10780,7 +10783,8 @@ static void vmx_post_block(struct kvm_vcpu *vcpu) 
	unsigned long flags;



	if (!kvm_arch_has_assigned_device(vcpu->kvm) ||

		!irq_remapping_cap(IRQ_POSTING_CAP))

		!irq_remapping_cap(IRQ_POSTING_CAP)  ||

		!kvm_vcpu_apicv_active(vcpu))

		return;



	do {
@@ -10833,7 +10837,8 @@ static int vmx_update_pi_irte(struct kvm *kvm, unsigned int host_irq, 
	int idx, ret = -EINVAL;



	if (!kvm_arch_has_assigned_device(kvm) ||

		!irq_remapping_cap(IRQ_POSTING_CAP))

		!irq_remapping_cap(IRQ_POSTING_CAP) ||

		!kvm_vcpu_apicv_active(kvm->vcpus[0]))

		return 0;



	idx = srcu_read_lock(&kvm->irq_srcu);