Revert "bond: take rcu lock in netpoll_send_skb_on_dev"

davem330 · davem330 · commit 48995423143a · 2018-10-19T10:45:08.000-07:00
This reverts commit 6fe9487. It is causing more serious regressions than the RCU warning it is fixing. Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
@@ -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;
 
-	rcu_read_lock_bh();
 	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);
 	}
-	rcu_read_unlock_bh();
 }
 EXPORT_SYMBOL(netpoll_send_skb_on_dev);
 

Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,6 @@ void netpoll_send_skb_on_dev(struct netpoll np, struct sk_buff skb,`
`312`	`312`	`/* It is up to the caller to keep npinfo alive. */`
`313`	`313`	`struct netpoll_info *npinfo;`
`314`	`314`
`315`		`- rcu_read_lock_bh();`
`316`	`315`	`lockdep_assert_irqs_disabled();`
`317`	`316`
`318`	`317`	`npinfo = rcu_dereference_bh(np->dev->npinfo);`
`@@ -357,7 +356,6 @@ void netpoll_send_skb_on_dev(struct netpoll np, struct sk_buff skb,`
`357`	`356`	`skb_queue_tail(&npinfo->txq, skb);`
`358`	`357`	`schedule_delayed_work(&npinfo->tx_work,0);`
`359`	`358`	`}`
`360`		`- rcu_read_unlock_bh();`
`361`	`359`	`}`
`362`	`360`	`EXPORT_SYMBOL(netpoll_send_skb_on_dev);`
`363`	`361`