Fold avic_set_pi_irte_mode() into avic_refresh_apicv_exec_ctrl() in
anticipation of moving the __avic_vcpu_{load,put}() calls into the
critical section, and because having a one-off helper with a name that's
easily confused with avic_pi_update_irte() is unnecessary.
No functional change intended.
Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
---
arch/x86/kvm/svm/avic.c | 48 ++++++++++++++++++-----------------------
1 file changed, 21 insertions(+), 27 deletions(-)
diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c
index d567d62463ac..0425cc374a79 100644
--- a/arch/x86/kvm/svm/avic.c
+++ b/arch/x86/kvm/svm/avic.c
@@ -737,32 +737,6 @@ void avic_apicv_post_state_restore(struct kvm_vcpu *vcpu)
avic_handle_ldr_update(vcpu);
}
-static void avic_set_pi_irte_mode(struct kvm_vcpu *vcpu, bool activate)
-{
- int apic_id = kvm_cpu_get_apicid(vcpu->cpu);
- unsigned long flags;
- struct amd_svm_iommu_ir *ir;
- struct vcpu_svm *svm = to_svm(vcpu);
-
- /*
- * Here, we go through the per-vcpu ir_list to update all existing
- * interrupt remapping table entry targeting this vcpu.
- */
- spin_lock_irqsave(&svm->ir_list_lock, flags);
-
- if (list_empty(&svm->ir_list))
- goto out;
-
- list_for_each_entry(ir, &svm->ir_list, node) {
- if (activate)
- WARN_ON_ONCE(amd_iommu_activate_guest_mode(ir->data, apic_id));
- else
- WARN_ON_ONCE(amd_iommu_deactivate_guest_mode(ir->data));
- }
-out:
- spin_unlock_irqrestore(&svm->ir_list_lock, flags);
-}
-
static void svm_ir_list_del(struct kvm_kernel_irqfd *irqfd)
{
struct kvm_vcpu *vcpu = irqfd->irq_bypass_vcpu;
@@ -998,6 +972,10 @@ void avic_refresh_virtual_apic_mode(struct kvm_vcpu *vcpu)
void avic_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu)
{
bool activated = kvm_vcpu_apicv_active(vcpu);
+ int apic_id = kvm_cpu_get_apicid(vcpu->cpu);
+ struct vcpu_svm *svm = to_svm(vcpu);
+ struct amd_svm_iommu_ir *ir;
+ unsigned long flags;
if (!enable_apicv)
return;
@@ -1009,7 +987,23 @@ void avic_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu)
else
avic_vcpu_put(vcpu);
- avic_set_pi_irte_mode(vcpu, activated);
+ /*
+ * Here, we go through the per-vcpu ir_list to update all existing
+ * interrupt remapping table entry targeting this vcpu.
+ */
+ spin_lock_irqsave(&svm->ir_list_lock, flags);
+
+ if (list_empty(&svm->ir_list))
+ goto out;
+
+ list_for_each_entry(ir, &svm->ir_list, node) {
+ if (activated)
+ WARN_ON_ONCE(amd_iommu_activate_guest_mode(ir->data, apic_id));
+ else
+ WARN_ON_ONCE(amd_iommu_deactivate_guest_mode(ir->data));
+ }
+out:
+ spin_unlock_irqrestore(&svm->ir_list_lock, flags);
}
void avic_vcpu_blocking(struct kvm_vcpu *vcpu)
--
2.49.0.504.g3bcea36a83-goog
