From: Jussi Maki Date: Sat, 31 Jul 2021 05:57:36 +0000 (+0000) Subject: net, core: Allow netdev_lower_get_next_private_rcu in bh context X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=689186699931313c7a42462602bd5c03eef77f9f;p=linux.git net, core: Allow netdev_lower_get_next_private_rcu in bh context For the XDP bonding slave lookup to work in the NAPI poll context in which the redudant rcu_read_lock() has been removed we have to follow the same approach as in 694cea395fde ("bpf: Allow RCU-protected lookups to happen from bh context") and modify the WARN_ON to also check rcu_read_lock_bh_held(). Signed-off-by: Jussi Maki Signed-off-by: Daniel Borkmann Cc: Toke Høiland-Jørgensen Link: https://lore.kernel.org/bpf/20210731055738.16820-6-joamaki@gmail.com --- diff --git a/net/core/dev.c b/net/core/dev.c index 9eb6dc9e02b31..e5045b628dec2 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -7615,7 +7615,7 @@ void *netdev_lower_get_next_private_rcu(struct net_device *dev, { struct netdev_adjacent *lower; - WARN_ON_ONCE(!rcu_read_lock_held()); + WARN_ON_ONCE(!rcu_read_lock_held() && !rcu_read_lock_bh_held()); lower = list_entry_rcu((*iter)->next, struct netdev_adjacent, list);