From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753404AbdH2L11 (ORCPT ); Tue, 29 Aug 2017 07:27:27 -0400 Received: from terminus.zytor.com ([65.50.211.136]:40203 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752377AbdH2L1Y (ORCPT ); Tue, 29 Aug 2017 07:27:24 -0400 Date: Tue, 29 Aug 2017 04:21:40 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: luto@kernel.org, bp@alien8.de, mingo@kernel.org, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, tglx@linutronix.de, dvlasenk@redhat.com, hpa@zytor.com, peterz@infradead.org, torvalds@linux-foundation.org, rostedt@goodmis.org, pbonzini@redhat.com, brgerst@gmail.com Reply-To: jpoimboe@redhat.com, linux-kernel@vger.kernel.org, bp@alien8.de, mingo@kernel.org, luto@kernel.org, brgerst@gmail.com, pbonzini@redhat.com, rostedt@goodmis.org, peterz@infradead.org, torvalds@linux-foundation.org, hpa@zytor.com, dvlasenk@redhat.com, tglx@linutronix.de In-Reply-To: <20170828064959.663008004@linutronix.de> References: <20170828064959.663008004@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/idt: Hide set_intr_gate() Git-Commit-ID: facaa3e3c813848e6b49ee37a42a3688832e63cd X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: facaa3e3c813848e6b49ee37a42a3688832e63cd Gitweb: http://git.kernel.org/tip/facaa3e3c813848e6b49ee37a42a3688832e63cd Author: Thomas Gleixner AuthorDate: Mon, 28 Aug 2017 08:47:59 +0200 Committer: Ingo Molnar CommitDate: Tue, 29 Aug 2017 12:07:29 +0200 x86/idt: Hide set_intr_gate() 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 Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Steven Rostedt Link: http://lkml.kernel.org/r/20170828064959.663008004@linutronix.de Signed-off-by: Ingo Molnar --- 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(-) diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h index 33f84f2..1a2ba36 100644 --- 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_struct *desc, unsigned long limit) 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[]; diff --git a/arch/x86/kernel/idt.c b/arch/x86/kernel/idt.c index b609eac..61b490c 100644 --- a/arch/x86/kernel/idt.c +++ b/arch/x86/kernel/idt.c @@ -225,6 +225,22 @@ idt_setup_from_table(gate_desc *idt, const struct idt_data *t, int size, bool sy } } +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 * @@ -336,20 +352,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) diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 6ed9242..874827b 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -455,7 +455,7 @@ static int kvm_cpu_down_prepare(unsigned int cpu) 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)