The bottom half masking APIs have become interestingly confusing with all these flavours:
local_bh_enable() _local_bh_enable() local_bh_enable_ip() __local_bh_enable_ip() _local_bh_enable() is an exception here because it's the only version that won't execute do_softirq() in the end. Clarify this straight in the name. It may help reviewers who are already familiar with functions such as preempt_enable_no_resched(). Reviewed-by: David S. Miller <da...@davemloft.net> Signed-off-by: Frederic Weisbecker <frede...@kernel.org> Cc: Mauro Carvalho Chehab <mchehab+sams...@kernel.org> Cc: Joel Fernandes <j...@joelfernandes.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Pavan Kondeti <pkond...@codeaurora.org> Cc: Paul E . McKenney <paul...@linux.vnet.ibm.com> Cc: David S . Miller <da...@davemloft.net> Cc: Ingo Molnar <mi...@kernel.org> Cc: Sebastian Andrzej Siewior <bige...@linutronix.de> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> --- arch/s390/lib/delay.c | 2 +- drivers/s390/char/sclp.c | 2 +- drivers/s390/cio/cio.c | 2 +- include/linux/bottom_half.h | 2 +- kernel/softirq.c | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c index d4aa10795605..3f83ee9446b7 100644 --- a/arch/s390/lib/delay.c +++ b/arch/s390/lib/delay.c @@ -91,7 +91,7 @@ void __udelay(unsigned long long usecs) if (raw_irqs_disabled_flags(flags)) { local_bh_disable(); __udelay_disabled(usecs); - _local_bh_enable(); + local_bh_enable_no_softirq(); goto out; } __udelay_enabled(usecs); diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c index e9aa71cdfc44..6c6b7456b368 100644 --- a/drivers/s390/char/sclp.c +++ b/drivers/s390/char/sclp.c @@ -572,7 +572,7 @@ sclp_sync_wait(void) local_irq_disable(); __ctl_load(cr0, 0, 0); if (!irq_context) - _local_bh_enable(); + local_bh_enable_no_softirq(); local_tick_enable(old_tick); local_irq_restore(flags); } diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c index de744ca158fd..e3fb83b3c6c1 100644 --- a/drivers/s390/cio/cio.c +++ b/drivers/s390/cio/cio.c @@ -607,7 +607,7 @@ void cio_tsch(struct subchannel *sch) inc_irq_stat(IRQIO_CIO); if (!irq_context) { irq_exit(); - _local_bh_enable(); + local_bh_enable_no_softirq(); } } diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h index a19519f4241d..a104f815efcf 100644 --- a/include/linux/bottom_half.h +++ b/include/linux/bottom_half.h @@ -19,7 +19,7 @@ static inline void local_bh_disable(void) __local_bh_disable_ip(_THIS_IP_, SOFTIRQ_DISABLE_OFFSET); } -extern void _local_bh_enable(void); +extern void local_bh_enable_no_softirq(void); extern void __local_bh_enable_ip(unsigned long ip, unsigned int cnt); static inline void local_bh_enable_ip(unsigned long ip) diff --git a/kernel/softirq.c b/kernel/softirq.c index 5f167fc43ab9..d305b4c8d1a7 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -139,7 +139,7 @@ void __local_bh_disable_ip(unsigned long ip, unsigned int cnt) EXPORT_SYMBOL(__local_bh_disable_ip); #endif /* CONFIG_TRACE_IRQFLAGS */ -static void __local_bh_enable(unsigned int cnt) +static void __local_bh_enable_no_softirq(unsigned int cnt) { lockdep_assert_irqs_disabled(); @@ -156,12 +156,12 @@ static void __local_bh_enable(unsigned int cnt) * Special-case - softirqs can safely be enabled by __do_softirq(), * without processing still-pending softirqs: */ -void _local_bh_enable(void) +void local_bh_enable_no_softirq(void) { WARN_ON_ONCE(in_irq()); - __local_bh_enable(SOFTIRQ_DISABLE_OFFSET); + __local_bh_enable_no_softirq(SOFTIRQ_DISABLE_OFFSET); } -EXPORT_SYMBOL(_local_bh_enable); +EXPORT_SYMBOL(local_bh_enable_no_softirq); void __local_bh_enable_ip(unsigned long ip, unsigned int cnt) { @@ -316,7 +316,7 @@ asmlinkage __visible void __softirq_entry __do_softirq(void) lockdep_softirq_end(in_hardirq); account_irq_exit_time(current); - __local_bh_enable(SOFTIRQ_OFFSET); + __local_bh_enable_no_softirq(SOFTIRQ_OFFSET); WARN_ON_ONCE(in_interrupt()); current_restore_flags(old_flags, PF_MEMALLOC); } @@ -352,7 +352,7 @@ void irq_enter(void) */ local_bh_disable(); tick_irq_enter(); - _local_bh_enable(); + local_bh_enable_no_softirq(); } __irq_enter(); -- 2.21.0