From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935034AbdHYV62 (ORCPT ); Fri, 25 Aug 2017 17:58:28 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:43061 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934959AbdHYV6Z (ORCPT ); Fri, 25 Aug 2017 17:58:25 -0400 Message-Id: <20170825214943.697285587@linutronix.de> User-Agent: quilt/0.63-1 Date: Fri, 25 Aug 2017 23:47:32 +0200 From: Thomas Gleixner To: LKML Cc: Ingo Molnar , Peter Anvin , Peter Zijlstra , Andy Lutomirski , Borislav Petkov , Steven Rostedt , Paolo Bonzini Subject: [patch V2 44/44] x86/idt: Hide set_intr_gate() References: <20170825214648.264521964@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=x86-idt--Hide-set_intr_gate.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org set_intr_gate() is an internal function of the IDT code. The only user left is the KVM code which replaces the pagefault handler eventually. Provide an explicit update_intr_gate() function and make set_intr_gate() static. While at it replace the magic number 14 in the KVM code with the proper trap define. Signed-off-by: Thomas Gleixner Acked-by: Paolo Bonzini --- arch/x86/include/asm/desc.h | 2 +- arch/x86/kernel/idt.c | 33 ++++++++++++++++++++------------- arch/x86/kernel/kvm.c | 2 +- 3 files changed, 22 insertions(+), 15 deletions(-) --- a/arch/x86/include/asm/desc.h +++ b/arch/x86/include/asm/desc.h @@ -390,7 +390,7 @@ static inline void set_desc_limit(struct desc->limit1 = (limit >> 16) & 0xf; } -void set_intr_gate(unsigned int n, const void *addr); +void update_intr_gate(unsigned int n, const void *addr); void alloc_intr_gate(unsigned int n, const void *addr); extern unsigned long used_vectors[]; --- a/arch/x86/kernel/idt.c +++ b/arch/x86/kernel/idt.c @@ -225,6 +225,22 @@ idt_setup_from_table(gate_desc *idt, con } } +static void set_intr_gate(unsigned int n, const void *addr) +{ + struct idt_data data; + + BUG_ON(n > 0xFF); + + memset(&data, 0, sizeof(data)); + data.vector = n; + data.addr = addr; + data.segment = __KERNEL_CS; + data.bits.type = GATE_INTERRUPT; + data.bits.p = 1; + + idt_setup_from_table(idt_table, &data, 1, false); +} + /** * idt_setup_early_traps - Initialize the idt table with early traps * @@ -334,20 +350,11 @@ void idt_invalidate(void *addr) load_idt(&idt); } -void set_intr_gate(unsigned int n, const void *addr) +void __init update_intr_gate(unsigned int n, const void *addr) { - struct idt_data data; - - BUG_ON(n > 0xFF); - - memset(&data, 0, sizeof(data)); - data.vector = n; - data.addr = addr; - data.segment = __KERNEL_CS; - data.bits.type = GATE_INTERRUPT; - data.bits.p = 1; - - idt_setup_from_table(idt_table, &data, 1, false); + if (WARN_ON_ONCE(test_bit(n, used_vectors))) + return; + set_intr_gate(n, addr); } void alloc_intr_gate(unsigned int n, const void *addr) --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -455,7 +455,7 @@ static int kvm_cpu_down_prepare(unsigned static void __init kvm_apf_trap_init(void) { - set_intr_gate(14, async_page_fault); + update_intr_gate(X86_TRAP_PF, async_page_fault); } void __init kvm_guest_init(void)