net: Revert the softirq will run annotation in ____napi_schedule().
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Mon, 21 Mar 2022 09:22:37 +0000 (10:22 +0100)
committerJakub Kicinski <kuba@kernel.org>
Mon, 21 Mar 2022 19:07:05 +0000 (12:07 -0700)
commit351bdbb6419ca988802882badadc321d384d0254
tree66940d417482952a22c0f526b684a076725d635c
parentca4f3f187b0885906ebac1abbf26545b5c514fba
net: Revert the softirq will run annotation in ____napi_schedule().

The lockdep annotation lockdep_assert_softirq_will_run() expects that
either hard or soft interrupts are disabled because both guaranty that
the "raised" soft-interrupts will be processed once the context is left.

This triggers in flush_smp_call_function_from_idle() but it this case it
explicitly calls do_softirq() in case of pending softirqs.

Revert the "softirq will run" annotation in ____napi_schedule() and move
the check back to __netif_rx() as it was. Keep the IRQ-off assert in
____napi_schedule() because this is always required.

Fixes: fbd9a2ceba5c7 ("net: Add lockdep asserts to ____napi_schedule().")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: Jason A. Donenfeld <Jason@zx2c4.com>
Link: https://lore.kernel.org/r/YjhD3ZKWysyw8rc6@linutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
include/linux/lockdep.h
net/core/dev.c