Merge branch 'Sockmap copying'

Browse source

Lorenz Bauer says:

====================
Changes in v2:
- Check sk_fullsock in map_update_elem (Martin)

Enable calling map_update_elem on sockmaps from bpf_iter context. This
in turn allows us to copy a sockmap by iterating its elements.

The change itself is tiny, all thanks to the ground work from Martin,
whose series [1] this patch is based on. I updated the tests to do some
copying, and also included two cleanups.

I'm sending this out now rather than when Martin's series has landed
because I hope this can get in before the merge window (potentially)
closes this weekend.

1: https://lore.kernel.org/bpf/20200925000337.3853598-1-kafai@fb.com/
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

...

This commit is contained in:

Alexei Starovoitov 2020-09-28 16:40:47 -07:00

parent efa90b5093 5b87adc3ce

commit 84a20d8e87

5 changed files with 90 additions and 50 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

2

kernel/bpf/verifier.c

View file

3

net/core/sock_map.c

View file

100

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

View file

32

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

View file

3

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

View file