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>

diff --git a/net/core/dev.c b/net/core/dev.c
index e0a1be9868242a0ef5add51e30c98cdf3ae048e4..03624192862afce2c36e562fa0e985388fddcc14 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6656,7 +6656,7 @@ void __netif_napi_del(struct napi_struct *napi)
                return;
 
        napi_hash_del(napi);
-       list_del_init(&napi->dev_list);
+       list_del_rcu(&napi->dev_list);
        napi_free_frags(napi);
 
        flush_gro_hash(napi);

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 2338753e936b7188d7d0ccb350cee8a34dd88172..c310c7c1cef7f21538d248926aab6303cecf68b0 100644 (file)
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -297,7 +297,7 @@ static int netpoll_owner_active(struct net_device *dev)
 {
        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())
                        return 1;
        }