[PATCH v3 30/62] KVM: SVM: Clean up return handling in avic_pi_update_irte()

Sean Christopherson
2025-06-11T22:47:48Z

Clean up the return paths for avic_pi_update_irte() now that the
refactoring dust has settled.

Opportunistically drop the pr_err() on IRTE update failures. Logging that
a failure occurred without _any_ context is quite useless.

Tested-by: Sairaj Kodilkar <sarunkod@amd.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/x86/kvm/svm/avic.c | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c
index d8d50b8f14bb..a0f3cdd2ea3f 100644
--- a/arch/x86/kvm/svm/avic.c
+++ b/arch/x86/kvm/svm/avic.c
@@ -807,8 +807,6 @@ int avic_pi_update_irte(struct kvm_kernel_irqfd *irqfd, struct kvm *kvm,
unsigned int host_irq, uint32_t guest_irq,
struct kvm_vcpu *vcpu, u32 vector)
{
- int ret = 0;
-
/*
* If the IRQ was affined to a different vCPU, remove the IRTE metadata
* from the *previous* vCPU's list.
@@ -838,8 +836,11 @@ int avic_pi_update_irte(struct kvm_kernel_irqfd *irqfd, struct kvm *kvm,
.is_guest_mode = true,
.vcpu_data = &vcpu_info,
};
+ int ret;

ret = irq_set_vcpu_affinity(host_irq, &pi);
+ if (ret)
+ return ret;

/**
* Here, we successfully setting up vcpu affinity in
@@ -848,20 +849,9 @@ int avic_pi_update_irte(struct kvm_kernel_irqfd *irqfd, struct kvm *kvm,
* we can reference to them directly when we update vcpu
* scheduling information in IOMMU irte.
*/
- if (!ret)
- ret = svm_ir_list_add(to_svm(vcpu), irqfd, &pi);
- } else {
- ret = irq_set_vcpu_affinity(host_irq, NULL);
+ return svm_ir_list_add(to_svm(vcpu), irqfd, &pi);
}
-
- if (ret < 0) {
- pr_err("%s: failed to update PI IRTE\n", __func__);
- goto out;
- }
-
- ret = 0;
-out:
- return ret;
+ return irq_set_vcpu_affinity(host_irq, NULL);
}

static inline int
--
2.50.0.rc1.591.g9c95f17f64-goog