|
@@ -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);
|