From: tip-bot for Andy Lutomirski <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: boris.ostrovsky@oracle.com, linux-kernel@vger.kernel.org,
akpm@linux-foundation.org, hpa@zytor.com, mingo@kernel.org,
kvm@vger.kernel.org, luto@kernel.org, arjan@linux.intel.com,
tglx@linutronix.de, peterz@infradead.org, pbonzini@redhat.com,
torvalds@linux-foundation.org, bp@alien8.de,
Xen-devel@lists.xen.org
Subject: [tip:x86/asm] x86/head: Move the early NMI fixup into C
Date: Wed, 13 Apr 2016 04:43:44 -0700 [thread overview]
Message-ID: <tip-0d0efc07f3df677d7622bb760f8e2920b5e33f42@git.kernel.org> (raw)
In-Reply-To: <dd068269f8d59fe44e9e43a50d0efd67da65c2b5.1459605520.git.luto@kernel.org>
Commit-ID: 0d0efc07f3df677d7622bb760f8e2920b5e33f42
Gitweb: http://git.kernel.org/tip/0d0efc07f3df677d7622bb760f8e2920b5e33f42
Author: Andy Lutomirski <luto@kernel.org>
AuthorDate: Sat, 2 Apr 2016 07:01:33 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 13 Apr 2016 11:37:44 +0200
x86/head: Move the early NMI fixup into C
C is nicer than asm.
Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: KVM list <kvm@vger.kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: xen-devel <Xen-devel@lists.xen.org>
Link: http://lkml.kernel.org/r/dd068269f8d59fe44e9e43a50d0efd67da65c2b5.1459605520.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/head_32.S | 7 -------
arch/x86/kernel/head_64.S | 6 ------
arch/x86/mm/extable.c | 5 +++++
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 0904536..184291c 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -561,9 +561,6 @@ early_idt_handler_common:
*/
cld
- cmpl $2,(%esp) # X86_TRAP_NMI
- je .Lis_nmi # Ignore NMI
-
cmpl $2,%ss:early_recursion_flag
je hlt_loop
incl %ss:early_recursion_flag
@@ -642,10 +639,6 @@ early_idt_handler_common:
hlt_loop:
hlt
jmp hlt_loop
-
-.Lis_nmi:
- addl $8,%esp /* drop vector number and error code */
- iret
ENDPROC(early_idt_handler_common)
/* This is the default interrupt "handler" :-) */
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 9e8636d..2308437 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -351,9 +351,6 @@ early_idt_handler_common:
*/
cld
- cmpl $2,(%rsp) # X86_TRAP_NMI
- je .Lis_nmi # Ignore NMI
-
cmpl $2,early_recursion_flag(%rip)
jz 1f
incl early_recursion_flag(%rip)
@@ -422,9 +419,6 @@ early_idt_handler_common:
20: /* Exception table entry found or page table generated */
decl early_recursion_flag(%rip)
jmp restore_regs_and_iret
-.Lis_nmi:
- addq $16,%rsp # drop vector number and error code
- INTERRUPT_RETURN
ENDPROC(early_idt_handler_common)
__INITDATA
diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
index 1366e06..4be0419 100644
--- a/arch/x86/mm/extable.c
+++ b/arch/x86/mm/extable.c
@@ -1,5 +1,6 @@
#include <linux/module.h>
#include <asm/uaccess.h>
+#include <asm/traps.h>
typedef bool (*ex_handler_t)(const struct exception_table_entry *,
struct pt_regs *, int);
@@ -89,6 +90,10 @@ int __init early_fixup_exception(struct pt_regs *regs, int trapnr)
unsigned long new_ip;
ex_handler_t handler;
+ /* Ignore early NMIs. */
+ if (trapnr == X86_TRAP_NMI)
+ return 1;
+
e = search_exception_tables(regs->ip);
if (!e)
return 0;
next prev parent reply other threads:[~2016-04-13 11:46 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-02 14:01 [PATCH v5 0/9] Improve non-"safe" MSR access failure handling Andy Lutomirski
2016-04-02 14:01 ` [PATCH v5 1/9] x86/head: Pass a real pt_regs and trapnr to early_fixup_exception Andy Lutomirski
2016-04-13 11:43 ` [tip:x86/asm] x86/head: Pass a real pt_regs and trapnr to early_fixup_exception() tip-bot for Andy Lutomirski
2016-04-02 14:01 ` [PATCH v5 2/9] x86/head: Move the early NMI fixup into C Andy Lutomirski
2016-04-13 11:43 ` tip-bot for Andy Lutomirski [this message]
2016-04-02 14:01 ` [PATCH v5 3/9] x86/head: Move early exception panic code into early_fixup_exception Andy Lutomirski
2016-04-02 18:39 ` Borislav Petkov
2016-04-02 20:13 ` Andy Lutomirski
2016-04-02 20:47 ` Borislav Petkov
2016-04-02 20:58 ` Andy Lutomirski
2016-04-04 11:52 ` Jan Kara
2016-04-04 12:46 ` Peter Zijlstra
2016-04-04 15:32 ` Andy Lutomirski
2016-04-04 15:36 ` Arjan van de Ven
2016-04-04 16:00 ` Peter Zijlstra
2016-04-04 19:38 ` Borislav Petkov
2016-04-04 21:31 ` Andy Lutomirski
2016-04-04 21:40 ` Borislav Petkov
2016-04-13 11:44 ` [tip:x86/asm] x86/head: Move early exception panic code into early_fixup_exception() tip-bot for Andy Lutomirski
2016-04-02 14:01 ` [PATCH v5 4/9] x86/traps: Enable all exception handler callbacks early Andy Lutomirski
2016-04-02 18:52 ` Borislav Petkov
2016-04-02 20:16 ` Andy Lutomirski
2016-04-02 20:52 ` Borislav Petkov
2016-04-03 8:07 ` Borislav Petkov
2016-04-03 13:22 ` Andy Lutomirski
2016-04-03 13:51 ` Linus Torvalds
2016-04-03 13:55 ` Andy Lutomirski
2016-04-03 14:10 ` Borislav Petkov
2016-04-04 15:47 ` Andy Lutomirski
2016-04-03 14:17 ` Linus Torvalds
2016-04-13 11:44 ` [tip:x86/asm] " tip-bot for Andy Lutomirski
2016-04-02 14:01 ` [PATCH v5 5/9] x86/paravirt: Add _safe to the read_msr and write_msr PV hooks Andy Lutomirski
2016-04-03 8:41 ` Borislav Petkov
2016-04-03 13:23 ` Andy Lutomirski
2016-04-03 14:07 ` Borislav Petkov
2016-04-13 11:44 ` [tip:x86/asm] x86/paravirt: Add _safe to the read_ms()r and write_msr() PV callbacks tip-bot for Andy Lutomirski
2016-04-02 14:01 ` [PATCH v5 6/9] x86/msr: Carry on after a non-"safe" MSR access fails Andy Lutomirski
2016-04-13 11:45 ` [tip:x86/asm] " tip-bot for Andy Lutomirski
2016-04-02 14:01 ` [PATCH v5 7/9] x86/paravirt: Add paravirt_{read,write}_msr Andy Lutomirski
2016-04-04 16:33 ` [Xen-devel] [PATCH v5 7/9] x86/paravirt: Add paravirt_{read, write}_msr David Vrabel
2016-04-04 16:40 ` Andy Lutomirski
2016-04-13 11:45 ` [tip:x86/asm] x86/paravirt: Add paravirt_{read,write}_msr() tip-bot for Andy Lutomirski
2016-04-02 14:01 ` [PATCH v5 8/9] x86/paravirt: Make "unsafe" MSR accesses unsafe even if PARAVIRT=y Andy Lutomirski
2016-04-13 11:46 ` [tip:x86/asm] " tip-bot for Andy Lutomirski
2016-04-02 14:01 ` [PATCH v5 9/9] x86/msr: Set the return value to zero when native_rdmsr_safe fails Andy Lutomirski
2016-04-13 11:46 ` [tip:x86/asm] x86/msr: Set the return value to zero when native_rdmsr_safe() fails tip-bot for Andy Lutomirski
2016-04-02 14:24 ` [PATCH v5 0/9] Improve non-"safe" MSR access failure handling Linus Torvalds
2016-04-02 15:13 ` Andy Lutomirski
2016-04-02 15:21 ` Linus Torvalds
2016-04-04 16:23 ` Borislav Petkov
2016-04-05 15:38 ` [Xen-devel] " Boris Ostrovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-0d0efc07f3df677d7622bb760f8e2920b5e33f42@git.kernel.org \
--to=tipbot@zytor.com \
--cc=Xen-devel@lists.xen.org \
--cc=akpm@linux-foundation.org \
--cc=arjan@linux.intel.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).