x86/traps: Disentangle the 32-bit and 64-bit doublefault code
Subsystems (3)
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 93efbde2c331004d8053f04b4bf0ca3e630b474a Gitweb: https://git.kernel.org/tip/93efbde2c331004d8053f04b4bf0ca3e630b474a Author: Andy Lutomirski <[email protected]> AuthorDate: Wed, 20 Nov 2019 22:12:38 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Tue, 26 Nov 2019 21:53:34 +01:00
x86/traps: Disentangle the 32-bit and 64-bit doublefault code
The 64-bit doublefault handler is much nicer than the 32-bit one. As a first step toward unifying them, make the 64-bit handler self-contained. This should have no effect no functional effect except in the odd case of x86_64 with CONFIG_DOUBLEFAULT=n in which case it will change the logging a bit.
This also gets rid of CONFIG_DOUBLEFAULT configurability on 64-bit kernels. It didn't do anything useful -- CONFIG_DOUBLEFAULT=n didn't actually disable doublefault handling on x86_64.
--- arch/x86/Kconfig.debug | 2 +- arch/x86/include/asm/processor.h | 1 - arch/x86/kernel/doublefault.c | 11 ----------- arch/x86/kernel/traps.c | 12 +++--------- 4 files changed, 4 insertions(+), 22 deletions(-)
arch/x86/Kconfig.debug +1 -1
@@ -117,7 +117,7 @@ config DEBUG_WX config DOUBLEFAULT default y - bool "Enable doublefault exception handler" if EXPERT + bool "Enable doublefault exception handler" if EXPERT && X86_32 ---help--- This option allows trapping of rare doublefault exceptions that would otherwise cause a system to silently reboot. Disabling this
arch/x86/include/asm/processor.h +0 -1
@@ -997,7 +997,6 @@ bool xen_set_default_idle(void);#endif void stop_this_cpu (void *dummy); -void df_debug (struct pt_regs *regs,long error_code);void microcode_check (void );enum l1tf_mitigations {
arch/x86/kernel/doublefault.c +0 -11
@@ -72,15 +72,4 @@ struct x86_hw_tss doublefault_tss __cacheline_aligned = { .__cr3 = __pa_nodebug(swapper_pg_dir), }; -/* dummy for do_double_fault() call */ -void df_debug (struct pt_regs *regs,long error_code) {} - -#else /* !CONFIG_X86_32 */ - -void df_debug (struct pt_regs *regs,long error_code) -{ -pr_emerg ("PANIC: double fault, error_code: 0x%lx\n" , error_code); -show_regs (regs); -panic ("Machine halted." ); -}#endif
arch/x86/kernel/traps.c +3 -9
@@ -411,15 +411,9 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code, unsignhandle_stack_overflow ("kernel stack overflow (double-fault)" , regs, cr2);#endif -#ifdef CONFIG_DOUBLEFAULT -df_debug (regs, error_code); -#endif -/* -* This is always a kernel trap and never fixable (and thus must -* never return). -*/ -for (;;) - die(str, regs, error_code); +pr_emerg ("PANIC: double fault, error_code: 0x%lx\n" , error_code); +show_regs (regs); + panic("Machine halted."); }#endif
Borislav Petkov
maintainerRFC PATCH 1/1 x86: Remove CONFIG_DOUBLEFAULT
Quoted 39 lines · On Wed, Nov 27, 2019 at 08:19:29AM -0000, tip-bot2 for Andy Lutomirski wrote:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 93efbde2c331004d8053f04b4bf0ca3e630b474a Gitweb: https://git.kernel.org/tip/93efbde2c331004d8053f04b4bf0ca3e630b474a Author: Andy Lutomirski <[email protected]> AuthorDate: Wed, 20 Nov 2019 22:12:38 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Tue, 26 Nov 2019 21:53:34 +01:00x86/traps: Disentangle the 32-bit and 64-bit doublefault code
The 64-bit doublefault handler is much nicer than the 32-bit one. As a first step toward unifying them, make the 64-bit handler self-contained. This should have no effect no functional effect except in the odd case of
x86_64withCONFIG_DOUBLEFAULT=nin which case it will change the logging a bit.This also gets rid of
CONFIG_DOUBLEFAULTconfigurability on 64-bit kernels. It didn't do anything useful --CONFIG_DOUBLEFAULT=ndidn't actually disable doublefault handling onx86_64.Signed-off-by Andy Lutomirski <[email protected]>Cc Borislav Petkov <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Linus Torvalds <[email protected]>Signed-off-by Ingo Molnar <[email protected]>--- arch/x86/Kconfig.debug | 2 +- arch/x86/include/asm/processor.h | 1 - arch/x86/kernel/doublefault.c | 11 ----------- arch/x86/kernel/traps.c | 12 +++--------- 4 files changed, 4 insertions(+), 22 deletions(-)arch/x86/Kconfig.debug +0
-0
arch/x86/Kconfig.debug config DEBUG_WX · line 120
Quoted 5 lines
arch/x86/Kconfig.debug +1
-1@@ -117,7 +117,7 @@ config DEBUG_WX config DOUBLEFAULT default y - bool "Enable doublefault exception handler" if EXPERT + bool "Enable doublefault exception handler" if EXPERT && X86_32
Yeah, how about we simplify the whole df code even more. It is clearly much better to always have a registered #DF handler so let's get rid of that silly config option.
Only compile-tested.
---
From: Borislav Petkov <[email protected]>
Date: Wed, 27 Nov 2019 19:12:29 +0100
Subject: [RFC PATCH] x86: Remove CONFIG_DOUBLEFAULT
... and make it unconditional.
--- arch/x86/Kconfig.debug | 9 --------- arch/x86/entry/entry_32.S | 2 -- arch/x86/include/asm/doublefault.h | 6 ++---- arch/x86/include/asm/traps.h | 2 -- arch/x86/kernel/Makefile | 4 +--- arch/x86/kernel/dumpstack_32.c | 4 ---- arch/x86/kernel/traps.c | 2 -- arch/x86/mm/cpu_entry_area.c | 4 +--- 8 files changed, 4 insertions(+), 29 deletions(-)
arch/x86/Kconfig.debug +0 -9
@@ -115,15 +115,6 @@ config DEBUG_WX If in doubt, say "Y". -config DOUBLEFAULT - default y - bool "Enable doublefault exception handler" if EXPERT && X86_32 - ---help--- - This option allows trapping of rare doublefault exceptions that - would otherwise cause a system to silently reboot. Disabling this - option saves about 4k and might cause you much additional grey - hair. - config DEBUG_TLBFLUSH bool "Set upper limit of TLB entries to flush one-by-one" depends on DEBUG_KERNEL
arch/x86/entry/entry_32.S +0 -2
@@ -1536,7 +1536,6 @@ SYM_CODE_START(debug) jmp common_exception SYM_CODE_END(debug) -#ifdef CONFIG_DOUBLEFAULT SYM_CODE_START(double_fault) 1: /*
@@ -1576,7 +1575,6 @@ SYM_CODE_START(double_fault) hlt jmp 1b SYM_CODE_END(double_fault) -#endif /* * NMI is doubly nasty. It can happen on the first instruction of
arch/x86/include/asm/doublefault.h +2 -4
@@ -2,12 +2,10 @@#ifndef _ASM_X86_DOUBLEFAULT_H#define _ASM_X86_DOUBLEFAULT_H -#if defined(CONFIG_X86_32 ) && defined(CONFIG_DOUBLEFAULT ) +#ifdef CONFIG_X86_32 extern void doublefault_init_cpu_tss (void );#else -static inline void doublefault_init_cpu_tss (void ) -{ -} +static inline void doublefault_init_cpu_tss (void ) { }#endif #endif /* _ASM_X86_DOUBLEFAULT_H */
arch/x86/include/asm/traps.h +0 -2
@@ -69,9 +69,7 @@ dotraplinkage void do_overflow(struct pt_regs *regs, long error_code); dotraplinkage void do_bounds(struct pt_regs *regs, long error_code); dotraplinkage void do_invalid_op(struct pt_regs *regs, long error_code); dotraplinkage void do_device_not_available(struct pt_regs *regs, long error_code); -#if defined(CONFIG_X86_64 ) || defined(CONFIG_DOUBLEFAULT ) dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code, unsigned long cr2); -#endif dotraplinkage void do_coprocessor_segment_overrun(struct pt_regs *regs, long error_code); dotraplinkage void do_invalid_TSS(struct pt_regs *regs, long error_code); dotraplinkage void do_segment_not_present(struct pt_regs *regs, long error_code);
arch/x86/kernel/Makefile +1 -3
@@ -104,9 +104,7 @@ obj-$(CONFIG_KEXEC_FILE) += kexec-bzimage64.o obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o obj-y += kprobes/ obj-$(CONFIG_MODULES) += module.o -ifeq ($(CONFIG_X86_32),y) -obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o -endif +obj-$(CONFIG_X86_32) += doublefault_32.o obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_VM86) += vm86_32.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
arch/x86/kernel/dumpstack_32.c +0 -4
@@ -87,7 +87,6 @@ static bool in_softirq_stack(unsigned long *stack, struct stack_info *info)static bool in_doublefault_stack (unsigned long *stack,struct stack_info *info) { -#ifdef CONFIG_DOUBLEFAULT struct cpu_entry_area *cea =get_cpu_entry_area (raw_smp_processor_id ());struct doublefault_stack *ss = &cea->doublefault_stack;
@@ -103,9 +102,6 @@ static bool in_doublefault_stack(unsigned long *stack, struct stack_info *info) info->next_sp = (unsigned long *)this_cpu_read (cpu_tss_rw.x86_tss.sp);return true; -#else -return false; -#endif }
arch/x86/kernel/traps.c +0 -2
@@ -306,7 +306,6 @@ __visible void __noreturn handle_stack_overflow(const char *message, }#endif -#if defined(CONFIG_X86_64 ) || defined(CONFIG_DOUBLEFAULT )/* * Runs on an IST stack for x86_64 and on a special task stack for x86_32. *
@@ -430,7 +429,6 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code, unsigndie ("double fault" , regs, error_code);panic ("Machine halted." ); } -#endif dotraplinkage void do_bounds(struct pt_regs *regs, long error_code) {
arch/x86/mm/cpu_entry_area.c +1 -3
@@ -17,7 +17,7 @@ static DEFINE_PER_CPU_PAGE_ALIGNED(struct exception_stacks, exception_stacks); DEFINE_PER_CPU(struct cea_exception_stacks*, cea_exception_stacks);#endif -#if defined(CONFIG_X86_32 ) && defined(CONFIG_DOUBLEFAULT ) +#ifdef CONFIG_X86_32 DECLARE_PER_CPU_PAGE_ALIGNED(struct doublefault_stack, doublefault_stack);#endif
@@ -114,12 +114,10 @@ static void __init percpu_setup_exception_stacks(unsigned int cpu)#else static inline void percpu_setup_exception_stacks (unsigned int cpu) { -#ifdef CONFIG_DOUBLEFAULT struct cpu_entry_area *cea =get_cpu_entry_area (cpu);cea_map_percpu_pages (&cea->doublefault_stack, &per_cpu (doublefault_stack, cpu),1 ,PAGE_KERNEL ); -#endif }#endif
Signature · 7 lines
2.21.0
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette