Skip to content

bpf: Avoid deadlock using trylock when popping LRU free nodes

Leon Hwang bpf linux-kselftest lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 6 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3bpf: Factor out bpf_lru_node_set_hash() helperkernel/bpf/bpf_lru_list.c+16 -20 replies
2/3bpf: Avoid deadlock using trylock when popping LRU free nodeskernel/bpf/bpf_lru_list.c+10 -76 replies
3/3selftests/bpf: Allow -ENOMEM on LRU map updatestools/testing/selftests/bpf/map_tests/map_percpu_stats.c+2 -10 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH bpf-next 0/3] bpf: Avoid deadlock using trylock when popping LRU free nodes

Switch the free-node pop paths to raw_spin_trylock*() so callers don't block on contended LRU locks. This is a narrower change than Menglong's approach [1], which aimed to eliminate the deadlock entirely.

The trylock-based approach avoids deadlocks in long-lived critical sections, while still allowing locking in short-lived ones. Although it does not completely eliminate the possibility of deadlock, it significantly reduces the likelihood in practice.

LRU-related deadlocks have been observed multiple times, including:

- [syzbot] [bpf?] possible deadlock in bpf_lru_push_free (2) [2]
- Re: [PATCH bpf v3 0/4] bpf: Free special fields when update hash and local storage maps [3]
- Raw log of CI failure [4]

BTW, this series also factors out the bpf_lru_node_set_hash() helper, along with a comment describing the required ordering and locking constraints.

Links:
[1] https://lore.kernel.org/bpf/[email protected]/
[2] https://lore.kernel.org/bpf/[email protected]/
[3] https://lore.kernel.org/bpf/CAEf4BzbTJCUx0D=zjx6+5m5iiGhwLzaP94hnw36ZMDHAf4-U_w@mail.gmail.com/
[4] https://github.com/kernel-patches/bpf/actions/runs/20943173932/job/60181505085

Leon Hwang (3):
bpf: Factor out bpf_lru_node_set_hash() helper
bpf: Avoid deadlock using trylock when popping LRU free nodes selftests/bpf: Allow -ENOMEM on LRU map updates

 kernel/bpf/bpf_lru_list.c                     | 35 ++++++++++++++-----
 .../bpf/map_tests/map_percpu_stats.c          |  3 +-
 2 files changed, 28 insertions(+), 10 deletions(-)

--
2.52.0