Revert "bond: take rcu lock in netpoll_send_skb_on_dev"
authorDavid S. Miller <davem@davemloft.net>
Fri, 19 Oct 2018 17:45:08 +0000 (10:45 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Oct 2018 17:45:08 +0000 (10:45 -0700)
This reverts commit 6fe9487892b32cb1c8b8b0d552ed7222a527fe30.

It is causing more serious regressions than the RCU warning
it is fixing.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/netpoll.c

index de1d1ba92f2de39292987e1408db0c2b821c4b6d..3ae899805f8b674b4ffb7d791330f836d38eff7d 100644 (file)
@@ -312,7 +312,6 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
        /* It is up to the caller to keep npinfo alive. */
        struct netpoll_info *npinfo;
 
        /* It is up to the caller to keep npinfo alive. */
        struct netpoll_info *npinfo;
 
-       rcu_read_lock_bh();
        lockdep_assert_irqs_disabled();
 
        npinfo = rcu_dereference_bh(np->dev->npinfo);
        lockdep_assert_irqs_disabled();
 
        npinfo = rcu_dereference_bh(np->dev->npinfo);
@@ -357,7 +356,6 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
                skb_queue_tail(&npinfo->txq, skb);
                schedule_delayed_work(&npinfo->tx_work,0);
        }
                skb_queue_tail(&npinfo->txq, skb);
                schedule_delayed_work(&npinfo->tx_work,0);
        }
-       rcu_read_unlock_bh();
 }
 EXPORT_SYMBOL(netpoll_send_skb_on_dev);
 
 }
 EXPORT_SYMBOL(netpoll_send_skb_on_dev);