42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From e4b4f2fba2b81120beca06cd1c49f37ceb8bd9c2 Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Fri, 16 Jun 2017 19:03:16 +0200
|
|
Subject: [PATCH 123/264] net/core: use local_bh_disable() in netif_rx_ni()
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.37-rt19.tar.xz
|
|
|
|
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
|
|
required.
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
net/core/dev.c | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/net/core/dev.c b/net/core/dev.c
|
|
index 3362d8897058..b8208b940b5d 100644
|
|
--- a/net/core/dev.c
|
|
+++ b/net/core/dev.c
|
|
@@ -4526,11 +4526,9 @@ int netif_rx_ni(struct sk_buff *skb)
|
|
|
|
trace_netif_rx_ni_entry(skb);
|
|
|
|
- preempt_disable();
|
|
+ local_bh_disable();
|
|
err = netif_rx_internal(skb);
|
|
- if (local_softirq_pending())
|
|
- do_softirq();
|
|
- preempt_enable();
|
|
+ local_bh_enable();
|
|
|
|
return err;
|
|
}
|
|
--
|
|
2.20.1
|
|
|