xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/entry: Convert double fault exception to IDTENTRY_DF

Browse Source 
Convert #DF to IDTENTRY_DF
  - Implement the C entry point with DEFINE_IDTENTRY_DF
  - Emit the ASM stub with DECLARE_IDTENTRY_DF on 64bit
  - Remove the ASM idtentry in 64bit
  - Adjust the 32bit shim code
  - Fixup the XEN/PV code
  - Remove the old prototypes

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Andy Lutomirski <luto@kernel.org>
Link: https://lkml.kernel.org/r/20200505135315.583415264@linutronix.de
This commit is contained in:
Thomas Gleixner
2020-02-25 23:33:31 +01:00
parent 6a8dfa8e40
commit c29c775a55
9 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/entry/entry_32.S
View File

@@ -1488,7 +1488,7 @@ ret_to_user:
jmp restore_all_switch_stack jmp restore_all_switch_stack
SYM_CODE_END(handle_exception) SYM_CODE_END(handle_exception)
SYM_CODE_START(double_fault) SYM_CODE_START(asm_exc_double_fault)
1: 1:
/* /*
* This is a task gate handler, not an interrupt gate handler. * This is a task gate handler, not an interrupt gate handler.
@@ -1526,7 +1526,7 @@ SYM_CODE_START(double_fault)
1: 1:
hlt hlt
jmp 1b jmp 1b
SYM_CODE_END(double_fault) SYM_CODE_END(asm_exc_double_fault)
/* /*
* NMI is doubly nasty. It can happen on the first instruction of * NMI is doubly nasty. It can happen on the first instruction of

10
arch/x86/entry/entry_64.S
View File

@@ -680,15 +680,9 @@ SYM_CODE_START(\asmsym)
call paranoid_entry call paranoid_entry
UNWIND_HINT_REGS UNWIND_HINT_REGS
/* Read CR2 early */
GET_CR2_INTO(%r12);
TRACE_IRQS_OFF
movq %rsp, %rdi /* pt_regs pointer into first argument */ movq %rsp, %rdi /* pt_regs pointer into first argument */
movq ORIG_RAX(%rsp), %rsi /* get error code into 2nd argument*/ movq ORIG_RAX(%rsp), %rsi /* get error code into 2nd argument*/
movq $-1, ORIG_RAX(%rsp) /* no syscall to restart */ movq $-1, ORIG_RAX(%rsp) /* no syscall to restart */
movq %r12, %rdx /* Move CR2 into 3rd argument */
call \cfunc call \cfunc
jmp paranoid_exit jmp paranoid_exit
@@ -918,7 +912,7 @@ SYM_INNER_LABEL(native_irq_return_iret, SYM_L_GLOBAL)
/* /*
* This may fault. Non-paranoid faults on return to userspace are * This may fault. Non-paranoid faults on return to userspace are
* handled by fixup_bad_iret. These include #SS, #GP, and #NP. * handled by fixup_bad_iret. These include #SS, #GP, and #NP.
* Double-faults due to espfix64 are handled in do_double_fault. * Double-faults due to espfix64 are handled in exc_double_fault.
* Other faults here are fatal. * Other faults here are fatal.
*/ */
iretq iretq
@@ -1073,8 +1067,6 @@ apicinterrupt IRQ_WORK_VECTOR irq_work_interrupt smp_irq_work_interrupt
idtentry X86_TRAP_PF page_fault do_page_fault has_error_code=1 idtentry X86_TRAP_PF page_fault do_page_fault has_error_code=1
idtentry_df X86_TRAP_DF double_fault do_double_fault
#ifdef CONFIG_XEN_PV #ifdef CONFIG_XEN_PV
idtentry 512 /* dummy */ hypervisor_callback xen_do_hypervisor_callback has_error_code=0 idtentry 512 /* dummy */ hypervisor_callback xen_do_hypervisor_callback has_error_code=0
#endif #endif

3
arch/x86/include/asm/idtentry.h
View File

@@ -368,4 +368,7 @@ DECLARE_IDTENTRY_XEN(X86_TRAP_NMI, nmi);
DECLARE_IDTENTRY_DEBUG(X86_TRAP_DB, exc_debug); DECLARE_IDTENTRY_DEBUG(X86_TRAP_DB, exc_debug);
DECLARE_IDTENTRY_XEN(X86_TRAP_DB, debug); DECLARE_IDTENTRY_XEN(X86_TRAP_DB, debug);
/* #DF */
DECLARE_IDTENTRY_DF(X86_TRAP_DF, exc_double_fault);
#endif #endif

5
arch/x86/include/asm/traps.h
View File

@@ -11,18 +11,13 @@
#define dotraplinkage __visible #define dotraplinkage __visible
#ifdef CONFIG_X86_64
asmlinkage void double_fault(void);
#endif
asmlinkage void page_fault(void); asmlinkage void page_fault(void);
asmlinkage void async_page_fault(void); asmlinkage void async_page_fault(void);
#if defined(CONFIG_X86_64) && defined(CONFIG_XEN_PV) #if defined(CONFIG_X86_64) && defined(CONFIG_XEN_PV)
asmlinkage void xen_double_fault(void);
asmlinkage void xen_page_fault(void); asmlinkage void xen_page_fault(void);
#endif #endif
dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code, unsigned long cr2);
dotraplinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address); dotraplinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64

10
arch/x86/kernel/doublefault_32.c
View File

@@ -10,7 +10,6 @@
#include <asm/desc.h> #include <asm/desc.h>
#include <asm/traps.h> #include <asm/traps.h>
extern void double_fault(void);
#define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM) #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
#define TSS(x) this_cpu_read(cpu_tss_rw.x86_tss.x) #define TSS(x) this_cpu_read(cpu_tss_rw.x86_tss.x)
@@ -21,7 +20,7 @@ static void set_df_gdt_entry(unsigned int cpu);
* Called by double_fault with CR0.TS and EFLAGS.NT cleared. The CPU thinks * Called by double_fault with CR0.TS and EFLAGS.NT cleared. The CPU thinks
* we're running the doublefault task. Cannot return. * we're running the doublefault task. Cannot return.
*/ */
asmlinkage notrace void __noreturn doublefault_shim(void) asmlinkage noinstr void __noreturn doublefault_shim(void)
{ {
unsigned long cr2; unsigned long cr2;
struct pt_regs regs; struct pt_regs regs;
@@ -40,7 +39,7 @@ asmlinkage notrace void __noreturn doublefault_shim(void)
* Fill in pt_regs. A downside of doing this in C is that the unwinder * Fill in pt_regs. A downside of doing this in C is that the unwinder
* won't see it (no ENCODE_FRAME_POINTER), so a nested stack dump * won't see it (no ENCODE_FRAME_POINTER), so a nested stack dump
* won't successfully unwind to the source of the double fault. * won't successfully unwind to the source of the double fault.
* The main dump from do_double_fault() is fine, though, since it * The main dump from exc_double_fault() is fine, though, since it
* uses these regs directly. * uses these regs directly.
* *
* If anyone ever cares, this could be moved to asm. * If anyone ever cares, this could be moved to asm.
@@ -70,7 +69,7 @@ asmlinkage notrace void __noreturn doublefault_shim(void)
regs.cx = TSS(cx); regs.cx = TSS(cx);
regs.bx = TSS(bx); regs.bx = TSS(bx);
do_double_fault(&regs, 0, cr2); exc_double_fault(&regs, 0, cr2);
/* /*
* x86_32 does not save the original CR3 anywhere on a task switch. * x86_32 does not save the original CR3 anywhere on a task switch.
@@ -84,7 +83,6 @@ asmlinkage notrace void __noreturn doublefault_shim(void)
*/ */
panic("cannot return from double fault\n"); panic("cannot return from double fault\n");
} }
NOKPROBE_SYMBOL(doublefault_shim);
DEFINE_PER_CPU_PAGE_ALIGNED(struct doublefault_stack, doublefault_stack) = { DEFINE_PER_CPU_PAGE_ALIGNED(struct doublefault_stack, doublefault_stack) = {
.tss = { .tss = {
@@ -95,7 +93,7 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct doublefault_stack, doublefault_stack) = {
.ldt = 0, .ldt = 0,
.io_bitmap_base = IO_BITMAP_OFFSET_INVALID, .io_bitmap_base = IO_BITMAP_OFFSET_INVALID,
.ip = (unsigned long) double_fault, .ip = (unsigned long) asm_exc_double_fault,
.flags = X86_EFLAGS_FIXED, .flags = X86_EFLAGS_FIXED,
.es = __USER_DS, .es = __USER_DS,
.cs = __KERNEL_CS, .cs = __KERNEL_CS,

4
arch/x86/kernel/idt.c
View File

@@ -91,7 +91,7 @@ static const __initconst struct idt_data def_idts[] = {
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
TSKG(X86_TRAP_DF, GDT_ENTRY_DOUBLEFAULT_TSS), TSKG(X86_TRAP_DF, GDT_ENTRY_DOUBLEFAULT_TSS),
#else #else
INTG(X86_TRAP_DF, double_fault), INTG(X86_TRAP_DF, asm_exc_double_fault),
#endif #endif
INTG(X86_TRAP_DB, asm_exc_debug), INTG(X86_TRAP_DB, asm_exc_debug),
@@ -187,7 +187,7 @@ gate_desc debug_idt_table[IDT_ENTRIES] __page_aligned_bss;
static const __initconst struct idt_data ist_idts[] = { static const __initconst struct idt_data ist_idts[] = {
ISTG(X86_TRAP_DB, asm_exc_debug, IST_INDEX_DB), ISTG(X86_TRAP_DB, asm_exc_debug, IST_INDEX_DB),
ISTG(X86_TRAP_NMI, asm_exc_nmi, IST_INDEX_NMI), ISTG(X86_TRAP_NMI, asm_exc_nmi, IST_INDEX_NMI),
ISTG(X86_TRAP_DF, double_fault, IST_INDEX_DF), ISTG(X86_TRAP_DF, asm_exc_double_fault, IST_INDEX_DF),
#ifdef CONFIG_X86_MCE #ifdef CONFIG_X86_MCE
ISTG(X86_TRAP_MC, asm_exc_machine_check, IST_INDEX_MCE), ISTG(X86_TRAP_MC, asm_exc_machine_check, IST_INDEX_MCE),
#endif #endif

17
arch/x86/kernel/traps.c
View File

@@ -319,12 +319,19 @@ __visible void __noreturn handle_stack_overflow(const char *message,
* from the TSS. Returning is, in principle, okay, but changes to regs will * from the TSS. Returning is, in principle, okay, but changes to regs will
* be lost. If, for some reason, we need to return to a context with modified * be lost. If, for some reason, we need to return to a context with modified
* regs, the shim code could be adjusted to synchronize the registers. * regs, the shim code could be adjusted to synchronize the registers.
*
* The 32bit #DF shim provides CR2 already as an argument. On 64bit it needs
* to be read before doing anything else.
*/ */
dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code, unsigned long cr2) DEFINE_IDTENTRY_DF(exc_double_fault)
{ {
static const char str[] = "double fault"; static const char str[] = "double fault";
struct task_struct *tsk = current; struct task_struct *tsk = current;
#ifdef CONFIG_X86_64
unsigned long address = read_cr2();
#endif
#ifdef CONFIG_X86_ESPFIX64 #ifdef CONFIG_X86_ESPFIX64
extern unsigned char native_irq_return_iret[]; extern unsigned char native_irq_return_iret[];
@@ -381,6 +388,7 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code, unsign
#endif #endif
nmi_enter(); nmi_enter();
instrumentation_begin();
notify_die(DIE_TRAP, str, regs, error_code, X86_TRAP_DF, SIGSEGV); notify_die(DIE_TRAP, str, regs, error_code, X86_TRAP_DF, SIGSEGV);
tsk->thread.error_code = error_code; tsk->thread.error_code = error_code;
@@ -424,13 +432,16 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code, unsign
* stack even if the actual trigger for the double fault was * stack even if the actual trigger for the double fault was
* something else. * something else.
*/ */
if ((unsigned long)task_stack_page(tsk) - 1 - cr2 < PAGE_SIZE) if ((unsigned long)task_stack_page(tsk) - 1 - address < PAGE_SIZE) {
handle_stack_overflow("kernel stack overflow (double-fault)", regs, cr2); handle_stack_overflow("kernel stack overflow (double-fault)",
regs, address);
}
#endif #endif
pr_emerg("PANIC: double fault, error_code: 0x%lx\n", error_code); pr_emerg("PANIC: double fault, error_code: 0x%lx\n", error_code);
die("double fault", regs, error_code); die("double fault", regs, error_code);
panic("Machine halted."); panic("Machine halted.");
instrumentation_end();
} }
DEFINE_IDTENTRY(exc_bounds) DEFINE_IDTENTRY(exc_bounds)

4
arch/x86/xen/enlighten_pv.c
View File

@@ -616,7 +616,7 @@ struct trap_array_entry {
static struct trap_array_entry trap_array[] = { static struct trap_array_entry trap_array[] = {
TRAP_ENTRY_REDIR(exc_debug, exc_xendebug, true ), TRAP_ENTRY_REDIR(exc_debug, exc_xendebug, true ),
{ double_fault, xen_double_fault, true }, TRAP_ENTRY(exc_double_fault, true ),
#ifdef CONFIG_X86_MCE #ifdef CONFIG_X86_MCE
TRAP_ENTRY(exc_machine_check, true ), TRAP_ENTRY(exc_machine_check, true ),
#endif #endif
@@ -651,7 +651,7 @@ static bool __ref get_trap_addr(void **addr, unsigned int ist)
* Replace trap handler addresses by Xen specific ones. * Replace trap handler addresses by Xen specific ones.
* Check for known traps using IST and whitelist them. * Check for known traps using IST and whitelist them.
* The debugger ones are the only ones we care about. * The debugger ones are the only ones we care about.
* Xen will handle faults like double_fault, * so we should never see * Xen will handle faults like double_fault, so we should never see
* them. Warn if there's an unexpected IST-using fault handler. * them. Warn if there's an unexpected IST-using fault handler.
*/ */
for (nr = 0; nr < ARRAY_SIZE(trap_array); nr++) { for (nr = 0; nr < ARRAY_SIZE(trap_array); nr++) {

2
arch/x86/xen/xen-asm_64.S
View File

@@ -37,7 +37,7 @@ xen_pv_trap asm_exc_overflow
xen_pv_trap asm_exc_bounds xen_pv_trap asm_exc_bounds
xen_pv_trap asm_exc_invalid_op xen_pv_trap asm_exc_invalid_op
xen_pv_trap asm_exc_device_not_available xen_pv_trap asm_exc_device_not_available
xen_pv_trap double_fault xen_pv_trap asm_exc_double_fault
xen_pv_trap asm_exc_coproc_segment_overrun xen_pv_trap asm_exc_coproc_segment_overrun
xen_pv_trap asm_exc_invalid_tss xen_pv_trap asm_exc_invalid_tss
xen_pv_trap asm_exc_segment_not_present xen_pv_trap asm_exc_segment_not_present