Merge branch 'fix-lockdep-warning-for-htab-of-map'

Browse source

Hou Tao says:

====================
The patch set fixes a lockdep warning for htab of map. The
warning is found when running test_maps. The warning occurs when
htab_put_fd_value() attempts to acquire map_idr_lock to free the map id
of the inner map while already holding the bucket lock (raw_spinlock_t).

The fix moves the invocation of free_htab_elem() after
htab_unlock_bucket() and adds a test case to verify the solution.
====================

Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>

...

This commit is contained in:

Alexei Starovoitov 2024-11-08 11:40:16 -08:00 • committed by Andrii Nakryiko

parent 269e7c97ca cb55657c7f

commit 266a557981

9 changed files with 203 additions and 38 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

56

kernel/bpf/hashtab.c

View file

3

tools/testing/selftests/bpf/bpf_util.h

View file

4

tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c

View file

4

tools/testing/selftests/bpf/prog_tests/lsm_cgroup.c

View file

132

tools/testing/selftests/bpf/prog_tests/map_in_map.c

View file

4

tools/testing/selftests/bpf/prog_tests/sock_addr.c

View file

30

tools/testing/selftests/bpf/progs/update_map_in_htab.c

View file

4

tools/testing/selftests/bpf/test_maps.c

View file

4

tools/testing/selftests/bpf/test_verifier.c

View file