net: core: allow netdev_upper_get_next_dev_rcu from bh context
Subsystems (3)
PATCH 1/1 net: core: allow netdev_upper_get_next_dev_rcu from bh context
Since XDP programs are called from a NAPI poll context, the RCU reference liveness is ensured by local_bh_disable().
Commit aeea1b86f936 ("bpf, devmap: Exclude XDP broadcast to master device") started to call netdev_upper_get_next_dev_rcu() from this context, but missed adding rcu_read_lock_bh_held() as a condition to the RCU checks.
While both bh_disabled and rcu_read_lock() provide RCU protection, lockdep complains since the check condition is insufficient [1].
Add rcu_read_lock_bh_held() as condition to help lockdep to understand the dereference is safe, in the same way as commit 694cea395fde ("bpf:
Allow RCU-protected lookups to happen from bh context").
[1]
WARNING: net/core/dev.c:8099 at netdev_upper_get_next_dev_rcu+0x96/0xd0, CPU#0: swapper/0/0 ... RIP: 0010:netdev_upper_get_next_dev_rcu+0x96/0xd0 ... <IRQ> dev_map_enqueue_multi+0x411/0x970 xdp_do_redirect+0xdf2/0x1030 __igc_xdp_run_prog+0x6a0/0xc80 igc_poll+0x34b0/0x70b0 __napi_poll.constprop.0+0x98/0x490 net_rx_action+0x8f2/0xfa0 handle_softirqs+0x1c7/0x710 __irq_exit_rcu+0xb1/0xf0 irq_exit_rcu+0x9/0x20 common_interrupt+0x7f/0x90 </IRQ>
--- net/core/dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/core/dev.c +2 -1
@@ -8103,7 +8103,8 @@ struct net_device *netdev_upper_get_next_dev_rcu(struct net_device *dev, {struct netdev_adjacent *upper; -WARN_ON_ONCE (!rcu_read_lock_held () && !lockdep_rtnl_is_held ()); +WARN_ON_ONCE (!rcu_read_lock_held () && !rcu_read_lock_bh_held () && + !lockdep_rtnl_is_held ()); upper = list_entry_rcu((*iter)->next, struct netdev_adjacent, list);
Signature · 1 line
2.51.0
Quoted 42 lines · Kohei Enju
Since XDP programs are called from a NAPI poll context, the RCU reference liveness is ensured by
local_bh_disable().Commit
aeea1b86f936("bpf, devmap: Exclude XDP broadcast to master device") started to callnetdev_upper_get_next_dev_rcu()from this context, but missed addingrcu_read_lock_bh_held()as a condition to the RCU checks.
While bothbh_disabledandrcu_read_lock()provide RCU protection, lockdep complains since the check condition is insufficient [1].Add
rcu_read_lock_bh_held()as condition to help lockdep to understand the dereference is safe, in the same way as commit694cea395fde("bpf:
Allow RCU-protected lookups to happen from bh context").[1]
WARNING: net/core/dev.c:8099 at netdev_upper_get_next_dev_rcu+0x96/0xd0, CPU#0: swapper/0/0 ... RIP: 0010:netdev_upper_get_next_dev_rcu+0x96/0xd0 ... <IRQ> dev_map_enqueue_multi+0x411/0x970 xdp_do_redirect+0xdf2/0x1030 __igc_xdp_run_prog+0x6a0/0xc80 igc_poll+0x34b0/0x70b0 __napi_poll.constprop.0+0x98/0x490 net_rx_action+0x8f2/0xfa0 handle_softirqs+0x1c7/0x710 __irq_exit_rcu+0xb1/0xf0 irq_exit_rcu+0x9/0x20 common_interrupt+0x7f/0x90 </IRQ>Signed-off-by Kohei Enju <[email protected]>--- net/core/dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)net/core/dev.c +0
-0
net/core/dev.c struct net_device *netdev_upper_get_next_dev_rcu(struct net_device *dev, · line 8106
Quoted 5 lines
net/core/dev.c +1
-1@@ -8103,7 +8103,8 @@ struct net_device *netdev_upper_get_next_dev_rcu(struct net_device *dev, {struct netdev_adjacent *upper; -WARN_ON_ONCE (!rcu_read_lock_held () && !lockdep_rtnl_is_held ()); + WARN_ON_ONCE(!rcu_read_lock_held() && !rcu_read_lock_bh_held() &&
lgtm after re-reading some of the threads related to commit 694cea395fde.
Jakub, if it looks good to you also, can you take it to the net-next tree? Thanks.
Quoted 4 lines
net/core/dev.c +1
-0+ !lockdep_rtnl_is_held()); upper = list_entry_rcu((*iter)->next, struct netdev_adjacent, list);
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 11 lines · On Fri, 20 Feb 2026 11:09:17 +0000 you wrote:
Since XDP programs are called from a NAPI poll context, the RCU reference liveness is ensured by
local_bh_disable().Commit
aeea1b86f936("bpf, devmap: Exclude XDP broadcast to master device") started to callnetdev_upper_get_next_dev_rcu()from this context, but missed addingrcu_read_lock_bh_held()as a condition to the RCU checks.
While bothbh_disabledandrcu_read_lock()provide RCU protection, lockdep complains since the check condition is insufficient [1].[...]
Here is the summary with links:
- [v1,bpf-next] net: core: allow netdev_upper_get_next_dev_rcu from bh context
https://git.kernel.org/netdev/net-next/c/39feb171f361
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html