Subject: net/core: use local_bh_disable() in netif_rx_ni()
From: Sebastian Andrzej Siewior <>
Date: Fri Jun 16 19:03:16 2017 +0200

From: Sebastian Andrzej Siewior <>

In 2004 netif_rx_ni() gained a preempt_disable() section around
netif_rx() and its do_softirq() + testing for it. The do_softirq() part
is required because netif_rx() raises the softirq but does not invoke
it. The preempt_disable() is required to remain on the same CPU which added the
skb to the per-CPU list.
All this can be avoided be putting this into a local_bh_disable()ed
section. The local_bh_enable() part will invoke do_softirq() if

Signed-off-by: Sebastian Andrzej Siewior <>
Signed-off-by: Thomas Gleixner <>

 net/core/dev.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
@ net/core/dev.c:4946 @ int netif_rx_ni(struct sk_buff *skb)
-	preempt_disable();
+	local_bh_disable();
 	err = netif_rx_internal(skb);
-	if (local_softirq_pending())
-		do_softirq();
-	preempt_enable();
+	local_bh_enable();
 	return err;