Commit 3f4df206 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller

netpoll: Move rx enable/disable into __dev_close_many

Today netpoll_rx_enable and netpoll_rx_disable are called from
dev_close and and __dev_close, and not from dev_close_many.

Move the calls into __dev_close_many so that we have a single call
site to maintain, and so that dev_close_many gains this protection as
well.  Which importantly makes batched network device deletes safe.
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 944e2948
...@@ -1313,6 +1313,9 @@ static int __dev_close_many(struct list_head *head) ...@@ -1313,6 +1313,9 @@ static int __dev_close_many(struct list_head *head)
might_sleep(); might_sleep();
list_for_each_entry(dev, head, close_list) { list_for_each_entry(dev, head, close_list) {
/* Temporarily disable netpoll until the interface is down */
netpoll_rx_disable(dev);
call_netdevice_notifiers(NETDEV_GOING_DOWN, dev); call_netdevice_notifiers(NETDEV_GOING_DOWN, dev);
clear_bit(__LINK_STATE_START, &dev->state); clear_bit(__LINK_STATE_START, &dev->state);
...@@ -1343,6 +1346,7 @@ static int __dev_close_many(struct list_head *head) ...@@ -1343,6 +1346,7 @@ static int __dev_close_many(struct list_head *head)
dev->flags &= ~IFF_UP; dev->flags &= ~IFF_UP;
net_dmaengine_put(); net_dmaengine_put();
netpoll_rx_enable(dev);
} }
return 0; return 0;
...@@ -1353,14 +1357,10 @@ static int __dev_close(struct net_device *dev) ...@@ -1353,14 +1357,10 @@ static int __dev_close(struct net_device *dev)
int retval; int retval;
LIST_HEAD(single); LIST_HEAD(single);
/* Temporarily disable netpoll until the interface is down */
netpoll_rx_disable(dev);
list_add(&dev->close_list, &single); list_add(&dev->close_list, &single);
retval = __dev_close_many(&single); retval = __dev_close_many(&single);
list_del(&single); list_del(&single);
netpoll_rx_enable(dev);
return retval; return retval;
} }
...@@ -1398,14 +1398,9 @@ int dev_close(struct net_device *dev) ...@@ -1398,14 +1398,9 @@ int dev_close(struct net_device *dev)
if (dev->flags & IFF_UP) { if (dev->flags & IFF_UP) {
LIST_HEAD(single); LIST_HEAD(single);
/* Block netpoll rx while the interface is going down */
netpoll_rx_disable(dev);
list_add(&dev->close_list, &single); list_add(&dev->close_list, &single);
dev_close_many(&single); dev_close_many(&single);
list_del(&single); list_del(&single);
netpoll_rx_enable(dev);
} }
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment