diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2020-09-02 15:25:53 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-09-04 15:12:52 +0200 |
| commit | 20a6e35a948284b8ab246ed35eefc56d674ad076 (patch) | |
| tree | 51c21cd3cccd525a8c8d26e45d3b7572675a3cdf /arch/x86/kernel/traps.c | |
| parent | c182487da1b5281463f2255d2347885dba219c08 (diff) | |
x86/debug: Move kprobe_debug_handler() into exc_debug_kernel()
Kprobes are on kernel text, and thus only matter for #DB-from-kernel.
Kprobes are ordered before the generic notifier, preserve that order.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Daniel Thompson <daniel.thompson@linaro.org>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: Andy Lutomirski <luto@kernel.org>
Link: https://lore.kernel.org/r/20200902133200.847465360@infradead.org
Diffstat (limited to 'arch/x86/kernel/traps.c')
| -rw-r--r-- | arch/x86/kernel/traps.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 99456428fb98..9cb39d30413d 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -806,12 +806,6 @@ static void handle_debug(struct pt_regs *regs, unsigned long dr6, bool user) /* Store the virtualized DR6 value */ tsk->thread.debugreg6 = dr6; -#ifdef CONFIG_KPROBES - if (kprobe_debug_handler(regs)) { - return; - } -#endif - if (notify_die(DIE_DEBUG, "debug", regs, (long)&dr6, 0, SIGTRAP) == NOTIFY_STOP) { return; @@ -877,8 +871,12 @@ static __always_inline void exc_debug_kernel(struct pt_regs *regs, if ((dr6 & DR_STEP) && is_sysenter_singlestep(regs)) dr6 &= ~DR_STEP; + if (kprobe_debug_handler(regs)) + goto out; + handle_debug(regs, dr6, false); +out: instrumentation_end(); idtentry_exit_nmi(regs, irq_state); |