Commit f61e869d authored by Dmitry Vyukov's avatar Dmitry Vyukov Committed by Linus Torvalds

kcov: simplify interrupt check

in_interrupt() semantics are confusing and wrong for most users as it
also returns true when bh is disabled.  Thus we open coded a proper
check for interrupts in __sanitizer_cov_trace_pc() with a lengthy
explanatory comment.

Use the new in_task() predicate instead.

Link: default avatarDmitry Vyukov <>
Cc: Kefeng Wang <>
Cc: James Morse <>
Cc: Alexander Popov <>
Cc: Andrey Konovalov <>
Cc: Hillf Danton <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 8c733420
......@@ -60,15 +60,8 @@ void notrace __sanitizer_cov_trace_pc(void)
* We are interested in code coverage as a function of a syscall inputs,
* so we ignore code executed in interrupts.
* The checks for whether we are in an interrupt are open-coded, because
* 1. We can't use in_interrupt() here, since it also returns true
* when we are inside local_bh_disable() section.
* 2. We don't want to use (in_irq() | in_serving_softirq() | in_nmi()),
* since that leads to slower generated code (three separate tests,
* one for each of the flags).
if (!t || (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_OFFSET
if (!t || !in_task())
mode = READ_ONCE(t->kcov_mode);
if (mode == KCOV_MODE_TRACE) {
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment