diff options
| author | Eric Dumazet <edumazet@google.com> | 2020-03-09 18:22:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-09 18:32:03 -0700 |
| commit | afe207d80a61e4d6e7cfa0611a4af46d0ba95628 (patch) | |
| tree | 357419b398e0a28517032150280eb488c6278ac0 /drivers/net/ipvlan | |
| parent | 018d26fcd12a75fb9b5fe233762aa3f2f0854b88 (diff) | |
| download | linux-afe207d80a61e4d6e7cfa0611a4af46d0ba95628.tar.bz2 | |
ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast()
Commit e18b353f102e ("ipvlan: add cond_resched_rcu() while
processing muticast backlog") added a cond_resched_rcu() in a loop
using rcu protection to iterate over slaves.
This is breaking rcu rules, so lets instead use cond_resched()
at a point we can reschedule
Fixes: e18b353f102e ("ipvlan: add cond_resched_rcu() while processing muticast backlog")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ipvlan')
| -rw-r--r-- | drivers/net/ipvlan/ipvlan_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c index 5759e91dec71..8801d093135c 100644 --- a/drivers/net/ipvlan/ipvlan_core.c +++ b/drivers/net/ipvlan/ipvlan_core.c @@ -277,7 +277,6 @@ void ipvlan_process_multicast(struct work_struct *work) } ipvlan_count_rx(ipvlan, len, ret == NET_RX_SUCCESS, true); local_bh_enable(); - cond_resched_rcu(); } rcu_read_unlock(); @@ -294,6 +293,7 @@ void ipvlan_process_multicast(struct work_struct *work) } if (dev) dev_put(dev); + cond_resched(); } } |