From 823daba7f094b4de7e4bf1d01890ee8716f9b6d9 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 3 Jan 2025 17:17:38 +0000 Subject: [PATCH] x86/traps: Convert pv_trap_init() to being an initcall With most of pv_trap_init() being done at build time, opening of NMI_SOFTIRQ can be a regular initcall, simplifying trap_init(). No functional change. Signed-off-by: Andrew Cooper --- xen/arch/x86/include/asm/pv/traps.h | 4 ---- xen/arch/x86/pv/traps.c | 4 +++- xen/arch/x86/traps.c | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/include/asm/pv/traps.h b/xen/arch/x86/include/asm/pv/traps.h index 404f5b169c..8c31d5a793 100644 --- a/xen/arch/x86/include/asm/pv/traps.h +++ b/xen/arch/x86/include/asm/pv/traps.h @@ -14,8 +14,6 @@ #include -void pv_trap_init(void); - int pv_raise_nmi(struct vcpu *v); int pv_emulate_privileged_op(struct cpu_user_regs *regs); @@ -32,8 +30,6 @@ static inline bool pv_trap_callback_registered(const struct vcpu *v, #include -static inline void pv_trap_init(void) {} - static inline int pv_raise_nmi(struct vcpu *v) { return -EOPNOTSUPP; } static inline int pv_emulate_privileged_op(struct cpu_user_regs *regs) { return 0; } diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index 932800555b..b627a47e26 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -141,10 +141,12 @@ static void cf_check nmi_softirq(void) *v_ptr = NULL; } -void __init pv_trap_init(void) +static int __init pv_trap_init(void) { open_softirq(NMI_SOFTIRQ, nmi_softirq); + return 0; } +__initcall(pv_trap_init); /* * Deliver NMI to PV guest. Return 0 on success. diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index fcab8b770c..e4ffc9843c 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1926,8 +1926,6 @@ void __init trap_init(void) /* Replace early pagefault with real pagefault handler. */ _update_gate_addr_lower(&bsp_idt[X86_EXC_PF], entry_PF); - pv_trap_init(); - init_ler(); /* Cache {,compat_}gdt_l1e now that physically relocation is done. */ -- 2.39.5