Since introduction of in_serving_softirq() in 75e1056 we can differentiate
between bh being serviced and bh being disabled. This fix avoids crashing
if exiting thread has disabled bh, but not in fact is serving any. Still,
we will get the warning that exiting thread is in atomic context.
Signed-off-by: Alexander Gordeev <[email protected]>
---
include/linux/hardirq.h | 4 ++++
kernel/exit.c | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index bb7f309..ece9fd2 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -82,11 +82,15 @@
* Are we in a softirq context? Interrupt context?
* in_softirq - Are we currently processing softirq or have bh disabled?
* in_serving_softirq - Are we currently processing softirq?
+ * in_serving_interrupt - Are we currently processing softirq, nmi or
+ * hardware interrupt?
*/
#define in_irq() (hardirq_count())
#define in_softirq() (softirq_count())
#define in_interrupt() (irq_count())
#define in_serving_softirq() (softirq_count() & SOFTIRQ_OFFSET)
+#define in_serving_interrupt() (preempt_count() & (HARDIRQ_MASK \
+ | SOFTIRQ_OFFSET | NMI_MASK))
/*
* Are we in NMI context?
diff --git a/kernel/exit.c b/kernel/exit.c
index 4b4042f..4968d77 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -896,7 +896,7 @@ void do_exit(long code)
WARN_ON(blk_needs_flush_plug(tsk));
- if (unlikely(in_interrupt()))
+ if (unlikely(in_serving_interrupt()))
panic("Aiee, killing interrupt handler!");
if (unlikely(!tsk->pid))
panic("Attempted to kill the idle task!");
--
1.7.7.6