lock validator: clean up IRQ entry/exit
Subsystems (2)
PATCH 1/1 lock validator: clean up IRQ entry/exit
Subject: lock validator: clean up IRQ entry/exit
From: Ingo Molnar <[email protected]>
preparation for the resurrection of handling NMIs under the lock validator:
- introduce __irq_exit() as a no-softirqs variant of IRQ exit
- make NMI exit use __irq_exit()
- make the locking API self-tests use irq_enter/__irq_exit.
Signed-off-by Ingo Molnar <[email protected]>
--- include/linux/hardirq.h | 23 ++++++++++++++++------- lib/locking-selftest.c | 4 ++-- 2 files changed, 18 insertions(+), 9 deletions(-)
include/linux/hardirq.h +16 -7
@@ -86,13 +86,6 @@ extern void synchronize_irq(unsigned int# define synchronize_irq (irq) barrier()#endif -#define nmi_enter () irq_enter() -#define nmi_exit () \ - do { \ - sub_preempt_count(HARDIRQ_OFFSET); \ - trace_hardirq_exit(); \ - } while (0) -struct task_struct ;#ifndef CONFIG_VIRT_CPU_ACCOUNTING
@@ -114,6 +107,22 @@ static inline void account_system_vtime(trace_hardirq_enter (); \ } while (0) +/* +* Exit irq context without processing softirqs: + */ +#define __irq_exit () \ + do { \ + trace_hardirq_exit(); \ + account_system_vtime(current); \ + sub_preempt_count(HARDIRQ_OFFSET); \ + } while (0) + +/* +* Exit irq context and process softirqs if needed: +*/ extern void irq_exit (void ); +#define nmi_enter () irq_enter() +#define nmi_exit () __irq_exit() +#endif /* LINUX_HARDIRQ_H */
lib/locking-selftest.c +2 -2
@@ -144,11 +144,11 @@ static void init_shared_types(void)#define HARDIRQ_ENTER () \ local_irq_disable(); \ - nmi_enter(); \ + irq_enter(); \ WARN_ON(!in_irq());#define HARDIRQ_EXIT () \ - nmi_exit(); \ + __irq_exit(); \ local_irq_enable();#define SOFTIRQ_DISABLE local_bh_disable