diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-02-25 23:16:19 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-06-11 15:14:47 +0200 |
| commit | 866ae2ccee4ac092fea14f18d537205e14c5a904 (patch) | |
| tree | 48ba0d2dc338707ecdd01b2de70bc1ff23c785b1 /arch/x86/kernel | |
| parent | 49893c5cb281f8691dcbe53e6f85a963f47a4b9b (diff) | |
| download | linux-866ae2ccee4ac092fea14f18d537205e14c5a904.tar.gz linux-866ae2ccee4ac092fea14f18d537205e14c5a904.tar.bz2 linux-866ae2ccee4ac092fea14f18d537205e14c5a904.zip | |
x86/entry: Convert Device not available exception to IDTENTRY
Convert #NM to IDTENTRY:
- Implement the C entry point with DEFINE_IDTENTRY
- Emit the ASM stub with DECLARE_IDTENTRY
- Remove the ASM idtentry in 64bit
- Remove the open coded ASM entry code in 32bit
- Fixup the XEN/PV code
- Remove the old prototypes
- Remove the RCU warning as the new entry macro ensures correctness
No functional change.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Acked-by: Andy Lutomirski <luto@kernel.org>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200505134905.056243863@linutronix.de
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/idt.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/traps.c | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/arch/x86/kernel/idt.c b/arch/x86/kernel/idt.c index 8b48f54aeff6..cdc2d8bbd338 100644 --- a/arch/x86/kernel/idt.c +++ b/arch/x86/kernel/idt.c @@ -77,7 +77,7 @@ static const __initconst struct idt_data def_idts[] = { INTG(X86_TRAP_NMI, nmi), INTG(X86_TRAP_BR, asm_exc_bounds), INTG(X86_TRAP_UD, asm_exc_invalid_op), - INTG(X86_TRAP_NM, device_not_available), + INTG(X86_TRAP_NM, asm_exc_device_not_available), INTG(X86_TRAP_OLD_MF, coprocessor_segment_overrun), INTG(X86_TRAP_TS, invalid_TSS), INTG(X86_TRAP_NP, segment_not_present), diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 71ac43dc036a..b8af5eb6a929 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -882,13 +882,10 @@ do_spurious_interrupt_bug(struct pt_regs *regs, long error_code) */ } -dotraplinkage void -do_device_not_available(struct pt_regs *regs, long error_code) +DEFINE_IDTENTRY(exc_device_not_available) { unsigned long cr0 = read_cr0(); - RCU_LOCKDEP_WARN(!rcu_is_watching(), "entry code didn't wake RCU"); - #ifdef CONFIG_MATH_EMULATION if (!boot_cpu_has(X86_FEATURE_FPU) && (cr0 & X86_CR0_EM)) { struct math_emu_info info = { }; @@ -913,10 +910,9 @@ do_device_not_available(struct pt_regs *regs, long error_code) * to kill the task than getting stuck in a never-ending * loop of #NM faults. */ - die("unexpected #NM exception", regs, error_code); + die("unexpected #NM exception", regs, 0); } } -NOKPROBE_SYMBOL(do_device_not_available); #ifdef CONFIG_X86_32 dotraplinkage void do_iret_error(struct pt_regs *regs, long error_code) |