Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Eric W. Biederman and committed by
David S. Miller
3f4df206 944e2948

+4 -9
+4 -9
net/core/dev.c
··· 1313 1313 might_sleep(); 1314 1314 1315 1315 list_for_each_entry(dev, head, close_list) { 1316 + /* Temporarily disable netpoll until the interface is down */ 1317 + netpoll_rx_disable(dev); 1318 + 1316 1319 call_netdevice_notifiers(NETDEV_GOING_DOWN, dev); 1317 1320 1318 1321 clear_bit(__LINK_STATE_START, &dev->state); ··· 1346 1343 1347 1344 dev->flags &= ~IFF_UP; 1348 1345 net_dmaengine_put(); 1346 + netpoll_rx_enable(dev); 1349 1347 } 1350 1348 1351 1349 return 0; ··· 1357 1353 int retval; 1358 1354 LIST_HEAD(single); 1359 1355 1360 - /* Temporarily disable netpoll until the interface is down */ 1361 - netpoll_rx_disable(dev); 1362 - 1363 1356 list_add(&dev->close_list, &single); 1364 1357 retval = __dev_close_many(&single); 1365 1358 list_del(&single); 1366 1359 1367 - netpoll_rx_enable(dev); 1368 1360 return retval; 1369 1361 } 1370 1362 ··· 1398 1398 if (dev->flags & IFF_UP) { 1399 1399 LIST_HEAD(single); 1400 1400 1401 - /* Block netpoll rx while the interface is going down */ 1402 - netpoll_rx_disable(dev); 1403 - 1404 1401 list_add(&dev->close_list, &single); 1405 1402 dev_close_many(&single); 1406 1403 list_del(&single); 1407 - 1408 - netpoll_rx_enable(dev); 1409 1404 } 1410 1405 return 0; 1411 1406 }