Skip to content

Commit afe207d

Browse files
edumazetdavem330
authored andcommitted
ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast()
Commit e18b353 ("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: e18b353 ("ipvlan: add cond_resched_rcu() while processing muticast backlog") Signed-off-by: Eric Dumazet <[email protected]> Cc: Mahesh Bandewar <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 018d26f commit afe207d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/net/ipvlan/ipvlan_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ void ipvlan_process_multicast(struct work_struct *work)
277277
}
278278
ipvlan_count_rx(ipvlan, len, ret == NET_RX_SUCCESS, true);
279279
local_bh_enable();
280-
cond_resched_rcu();
281280
}
282281
rcu_read_unlock();
283282

@@ -294,6 +293,7 @@ void ipvlan_process_multicast(struct work_struct *work)
294293
}
295294
if (dev)
296295
dev_put(dev);
296+
cond_resched();
297297
}
298298
}
299299

0 commit comments

Comments
 (0)