[PATCH v2 10/54] KVM: x86: Extract x86_set_kvm_irq_handler() function

Mingwei Zhang
2024-05-06T05:30:46Z

From: Xiong Zhang <xiong.y.zhang@linux.intel.com>

KVM needs to register irq handler for POSTED_INTR_WAKEUP_VECTOR and
KVM_GUEST_PMI_VECTOR, a common function x86_set_kvm_irq_handler() is
extracted to reduce exports function and duplicated code.

Suggested-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Xiong Zhang <xiong.y.zhang@linux.intel.com>
---
arch/x86/include/asm/irq.h | 3 +--
arch/x86/kernel/irq.c | 27 +++++++++++----------------
arch/x86/kvm/vmx/vmx.c | 4 ++--
3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
index 2483f6ef5d4e..050a247b69b4 100644
--- a/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@ -30,8 +30,7 @@ struct irq_desc;
extern void fixup_irqs(void);

#if IS_ENABLED(CONFIG_KVM)
-extern void kvm_set_posted_intr_wakeup_handler(void (*handler)(void));
-void kvm_set_guest_pmi_handler(void (*handler)(void));
+void x86_set_kvm_irq_handler(u8 vector, void (*handler)(void));
#endif

extern void (*x86_platform_ipi_callback)(void);
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 22c10e5c50af..3ada69c50951 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -302,27 +302,22 @@ static void dummy_handler(void) {}
static void (*kvm_posted_intr_wakeup_handler)(void) = dummy_handler;
static void (*kvm_guest_pmi_handler)(void) = dummy_handler;

-void kvm_set_posted_intr_wakeup_handler(void (*handler)(void))
+void x86_set_kvm_irq_handler(u8 vector, void (*handler)(void))
{
- if (handler)
+ if (!handler)
+ handler = dummy_handler;
+
+ if (vector == POSTED_INTR_WAKEUP_VECTOR)
kvm_posted_intr_wakeup_handler = handler;
- else {
- kvm_posted_intr_wakeup_handler = dummy_handler;
- synchronize_rcu();
- }
-}
-EXPORT_SYMBOL_GPL(kvm_set_posted_intr_wakeup_handler);
-
-void kvm_set_guest_pmi_handler(void (*handler)(void))
-{
- if (handler) {
+ else if (vector == KVM_GUEST_PMI_VECTOR)
kvm_guest_pmi_handler = handler;
- } else {
- kvm_guest_pmi_handler = dummy_handler;
+ else
+ WARN_ON_ONCE(1);
+
+ if (handler == dummy_handler)
synchronize_rcu();
- }
}
-EXPORT_SYMBOL_GPL(kvm_set_guest_pmi_handler);
+EXPORT_SYMBOL_GPL(x86_set_kvm_irq_handler);

/*
* Handler for POSTED_INTERRUPT_VECTOR.
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index c37a89eda90f..c2dc68a25a53 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -8214,7 +8214,7 @@ static void vmx_migrate_timers(struct kvm_vcpu *vcpu)

static void vmx_hardware_unsetup(void)
{
- kvm_set_posted_intr_wakeup_handler(NULL);
+ x86_set_kvm_irq_handler(POSTED_INTR_WAKEUP_VECTOR, NULL);

if (nested)
nested_vmx_hardware_unsetup();
@@ -8679,7 +8679,7 @@ static __init int hardware_setup(void)
if (r && nested)
nested_vmx_hardware_unsetup();

- kvm_set_posted_intr_wakeup_handler(pi_wakeup_handler);
+ x86_set_kvm_irq_handler(POSTED_INTR_WAKEUP_VECTOR, pi_wakeup_handler);

return r;
}
--
2.45.0.rc1.225.g2a3ae87e7f-goog