diff mbox series

[bpf-next,v4,5/6] net: core: Allow netdev_lower_get_next_private_rcu in bh context

Message ID 20210728234350.28796-6-joamaki@gmail.com
State Superseded
Headers show
Series [bpf-next,v4,1/6] net: bonding: Refactor bond_xmit_hash for use with xdp_buff | expand

Commit Message

Jussi Maki July 28, 2021, 11:43 p.m. UTC 
From: Jussi Maki <joamaki@gmail.com>

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 [1] and modify the WARN_ON to also
check rcu_read_lock_bh_held().

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=694cea395fded425008e93cd90cfdf7a451674af

Signed-off-by: Jussi Maki <joamaki@gmail.com>
---
 net/core/dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/net/core/dev.c b/net/core/dev.c
index 99cb14242164..9cdb551db5dd 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7588,7 +7588,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);