]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
bpf: Use RCU-safe iteration in dev_map_redirect_multi() SKB path
authorDavid Carlier <devnexen@gmail.com>
Fri, 20 Mar 2026 07:26:45 +0000 (07:26 +0000)
committerMartin KaFai Lau <martin.lau@kernel.org>
Tue, 24 Mar 2026 22:17:20 +0000 (15:17 -0700)
commit8ed82f807bb09d2c8455aaa665f2c6cb17bc6a19
tree27f7c58062916545bbba11173f7f6658d35e7d4f
parent7f5b0a60a8b925db0cde62d87f1031dc04acbeb2
bpf: Use RCU-safe iteration in dev_map_redirect_multi() SKB path

The DEVMAP_HASH branch in dev_map_redirect_multi() uses
hlist_for_each_entry_safe() to iterate hash buckets, but this function
runs under RCU protection (called from xdp_do_generic_redirect_map()
in softirq context). Concurrent writers (__dev_map_hash_update_elem,
dev_map_hash_delete_elem) modify the list using RCU primitives
(hlist_add_head_rcu, hlist_del_rcu).

hlist_for_each_entry_safe() performs plain pointer dereferences without
rcu_dereference(), missing the acquire barrier needed to pair with
writers' rcu_assign_pointer(). On weakly-ordered architectures (ARM64,
POWER), a reader can observe a partially-constructed node. It also
defeats CONFIG_PROVE_RCU lockdep validation and KCSAN data-race
detection.

Replace with hlist_for_each_entry_rcu() using rcu_read_lock_bh_held()
as the lockdep condition, consistent with the rcu_dereference_check()
used in the DEVMAP (non-hash) branch of the same functions. Also fix
the same incorrect lockdep_is_held(&dtab->index_lock) condition in
dev_map_enqueue_multi(), where the lock is not held either.

Fixes: e624d4ed4aa8 ("xdp: Extend xdp_redirect_map with broadcast support")
Signed-off-by: David Carlier <devnexen@gmail.com>
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Link: https://patch.msgid.link/20260320072645.16731-1-devnexen@gmail.com
kernel/bpf/devmap.c