Merge branch 'bpf-fix-backward-progress-bug-in-bpf_iter_udp'

Browse source

Martin KaFai Lau says:

====================
bpf: Fix backward progress bug in bpf_iter_udp

From: Martin KaFai Lau <martin.lau@kernel.org>

This patch set fixes an issue in bpf_iter_udp that makes backward
progress and prevents the user space process from finishing. There is
a test at the end to reproduce the bug.

Please see individual patches for details.

v3:
- Fixed the iter_fd check and local_port check in the
  patch 3 selftest. (Yonghong)
- Moved jhash2 to test_jhash.h in the patch 3. (Yonghong)
- Added explanation in the bucket selection in the patch 3. (Yonghong)

v2:
- Added patch 1 to fix another bug that goes back to
  the previous bucket
- Simplify the fix in patch 2 to always reset iter->offset to 0
- Add a test case to close all udp_sk in a bucket while
  in the middle of the iteration.
====================

Link: https://lore.kernel.org/r/20240112190530.3751661-1-martin.lau@linux.dev
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

...

This commit is contained in:

Alexei Starovoitov 2024-01-13 11:01:44 -08:00

parent 894d750831 dbd7db7787

commit 8e33d5db7d

5 changed files with 270 additions and 12 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

22

net/ipv4/udp.c

View file

135

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

View file

3

tools/testing/selftests/bpf/progs/bpf_tracing_net.h

View file

91

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

View file

31

tools/testing/selftests/bpf/progs/test_jhash.h

View file