net: make sure napi_list is safe for RCU traversal

netpoll needs to traverse dev->napi_list under RCU, make
sure it uses the right iterator and that removal from this
list is handled safely.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2020-09-09 10:37:53 -07:00 committed by David S. Miller
parent 4d092dd204
commit 5251ef8299
2 changed files with 2 additions and 2 deletions

View File

@ -6656,7 +6656,7 @@ void __netif_napi_del(struct napi_struct *napi)
return; return;
napi_hash_del(napi); napi_hash_del(napi);
list_del_init(&napi->dev_list); list_del_rcu(&napi->dev_list);
napi_free_frags(napi); napi_free_frags(napi);
flush_gro_hash(napi); flush_gro_hash(napi);

View File

@ -297,7 +297,7 @@ static int netpoll_owner_active(struct net_device *dev)
{ {
struct napi_struct *napi; struct napi_struct *napi;
list_for_each_entry(napi, &dev->napi_list, dev_list) { list_for_each_entry_rcu(napi, &dev->napi_list, dev_list) {
if (napi->poll_owner == smp_processor_id()) if (napi->poll_owner == smp_processor_id())
return 1; return 1;
} }