Message ID | 20200310012258.196797-1-edumazet@google.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | [net] ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast() | expand |
From: Eric Dumazet <edumazet@google.com> Date: Mon, 9 Mar 2020 18:22:58 -0700 > 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> Applied, thanks for the quick fix Eric.
On 3/9/20 6:33 PM, David Miller wrote: > From: Eric Dumazet <edumazet@google.com> > Date: Mon, 9 Mar 2020 18:22:58 -0700 > >> 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> > > Applied, thanks for the quick fix Eric. > Sure thing ;)
diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c index 5759e91dec7105cb6d27ce8b4e47eae26f711ad5..8801d093135c3e72ca22643a8fbc7bf896727e4b 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(); } }
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> --- drivers/net/ipvlan/ipvlan_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)