iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit afe207d80a61e4d6e7cfa0611a4af46d0ba95628 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Eric Dumazet 2020-03-09 18:22:58 -07:00 committed by Greg Kroah-Hartman
parent 276a875f71
commit 8621153cb6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ipvlan/ipvlan_core.c
View File

@ -240,7 +240,6 @@ void ipvlan_process_multicast(struct work_struct *work)
ret = netif_rx(nskb);
acct:
ipvlan_count_rx(ipvlan, len, ret == NET_RX_SUCCESS, true);
cond_resched_rcu();
}
rcu_read_unlock();
@ -252,6 +251,7 @@ acct:
} else {
kfree_skb(skb);
}
cond_resched();
}
}