Commit afe207d8 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast()

Commit e18b353f ("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: e18b353f ("ipvlan: add cond_resched_rcu() while processing muticast backlog")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 018d26fc
...@@ -277,7 +277,6 @@ void ipvlan_process_multicast(struct work_struct *work) ...@@ -277,7 +277,6 @@ void ipvlan_process_multicast(struct work_struct *work)
} }
ipvlan_count_rx(ipvlan, len, ret == NET_RX_SUCCESS, true); ipvlan_count_rx(ipvlan, len, ret == NET_RX_SUCCESS, true);
local_bh_enable(); local_bh_enable();
cond_resched_rcu();
} }
rcu_read_unlock(); rcu_read_unlock();
...@@ -294,6 +293,7 @@ void ipvlan_process_multicast(struct work_struct *work) ...@@ -294,6 +293,7 @@ void ipvlan_process_multicast(struct work_struct *work)
} }
if (dev) if (dev)
dev_put(dev); dev_put(dev);
cond_resched();
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment