diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-02-25 23:33:26 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-06-11 15:14:59 +0200 |
| commit | 2bbc68f8373c0631ebf137f376fbea00e8086be7 (patch) | |
| tree | 0cebf75fb72ec79233f04adc8903bda6c7a11f23 /arch/x86/kernel/traps.c | |
| parent | 9f58fdde95c9509a4ded27a6d0035e79294002b4 (diff) | |
| download | linux-2bbc68f8373c0631ebf137f376fbea00e8086be7.tar.bz2 | |
x86/entry: Convert Debug exception to IDTENTRY_DB
Convert #DB to IDTENTRY_ERRORCODE:
- Implement the C entry point with DEFINE_IDTENTRY_DB
- 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
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/20200505135314.900297476@linutronix.de
Diffstat (limited to 'arch/x86/kernel/traps.c')
| -rw-r--r-- | arch/x86/kernel/traps.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index de5120e2fbe1..569408a681b6 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -775,7 +775,7 @@ static __always_inline void debug_exit(unsigned long dr7) * * May run on IST stack. */ -dotraplinkage void do_debug(struct pt_regs *regs, long error_code) +DEFINE_IDTENTRY_DEBUG(exc_debug) { struct task_struct *tsk = current; unsigned long dr6, dr7; @@ -784,7 +784,10 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code) debug_enter(&dr6, &dr7); - nmi_enter(); + if (user_mode(regs)) + idtentry_enter(regs); + else + nmi_enter(); /* * The SDM says "The processor clears the BTF flag when it @@ -821,7 +824,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code) goto exit; #endif - if (notify_die(DIE_DEBUG, "debug", regs, (long)&dr6, error_code, + if (notify_die(DIE_DEBUG, "debug", regs, (long)&dr6, 0, SIGTRAP) == NOTIFY_STOP) goto exit; @@ -835,8 +838,8 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code) cond_local_irq_enable(regs); if (v8086_mode(regs)) { - handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code, - X86_TRAP_DB); + handle_vm86_trap((struct kernel_vm86_regs *) regs, 0, + X86_TRAP_DB); cond_local_irq_disable(regs); debug_stack_usage_dec(); goto exit; @@ -855,15 +858,17 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code) } si_code = get_si_code(tsk->thread.debugreg6); if (tsk->thread.debugreg6 & (DR_STEP | DR_TRAP_BITS) || user_icebp) - send_sigtrap(regs, error_code, si_code); + send_sigtrap(regs, 0, si_code); cond_local_irq_disable(regs); debug_stack_usage_dec(); exit: - nmi_exit(); + if (user_mode(regs)) + idtentry_exit(regs); + else + nmi_exit(); debug_exit(dr7); } -NOKPROBE_SYMBOL(do_debug); /* * Note that we play around with the 'TS' bit in an attempt to get |