Commit 75347bb2 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/traps: Address objtool noinstr complaints in #DB 



The functions invoked from handle_debug() can be instrumented. Tell objtool
about it.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarAlexandre Chartre <alexandre.chartre@oracle.com>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Acked-by: default avatarAndy Lutomirski <luto@kernel.org>
Link: https://lkml.kernel.org/r/20200505135315.380927730@linutronix.de
parent 9347f413

arch/x86/kernel/traps.c

+8 −2
Original line number Diff line number Diff line
@@ -784,14 +784,19 @@ static void noinstr handle_debug(struct pt_regs *regs, unsigned long dr6, 
	/* Store the virtualized DR6 value */

	tsk->thread.debugreg6 = dr6;



	instrumentation_begin();

#ifdef CONFIG_KPROBES

	if (kprobe_debug_handler(regs))

	if (kprobe_debug_handler(regs)) {

		instrumentation_end();

		return;

	}

#endif



	if (notify_die(DIE_DEBUG, "debug", regs, (long)&dr6, 0,

		       SIGTRAP) == NOTIFY_STOP)

		       SIGTRAP) == NOTIFY_STOP) {

		instrumentation_end();

		return;

	}



	/*

	 * Let others (NMI) know that the debug stack is in use
@@ -827,6 +832,7 @@ static void noinstr handle_debug(struct pt_regs *regs, unsigned long dr6, 
out:

	cond_local_irq_disable(regs);

	debug_stack_usage_dec();

	instrumentation_end();

}



static __always_inline void exc_debug_kernel(struct pt_regs *regs,

CRA Git | Maintained and supported by SUSTech CRA and CCSE