Merge branch 'update-sockmap-from-prog'
Lorenz Bauer says: ==================== We're currently building a control plane for our BPF socket dispatch work. As part of that, we have a need to create a copy of an existing sockhash, to allow us to change the keys. I previously proposed allowing privileged userspace to look up sockets, which doesn't work due to security concerns (see [1]). In follow up discussions during BPF office hours we identified bpf_iter as a possible solution: instead of accessing sockets from user space we can iterate the source sockhash, and insert the values into a new map. Enabling this requires two pieces: the ability to iterate sockmap and sockhash, as well as being able to call map_update_elem from BPF. This patch set implements the latter: it's now possible to update sockmap from BPF context. As a next step, we can implement bpf_iter for sockmap. === I've done some more fixups, and audited the safe contexts more thoroughly. As a result I'm removing CGROUP_SKB, SK_MSG and SK_SKB for now. Changes in v3: - Use CHECK as much as possible (Yonghong) - Reject ARG_PTR_TO_MAP_VALUE_OR_NULL for sockmap (Yonghong) - Remove CGROUP_SKB, SK_MSG, SK_SKB from safe contexts - Test that the verifier rejects update from unsafe context Changes in v2: - Fix warning in patch #2 (Jakub K) - Renamed override_map_arg_type (John) - Only allow updating sockmap from known safe contexts (John) - Use __s64 for sockmap updates from user space (Yonghong) - Various small test fixes around test macros and such (Yonghong) Thank your for your reviews! 1: https://lore.kernel.org/bpf/20200310174711.7490-1-lmb@cloudflare.com/ ==================== Signed-off-by:Alexei Starovoitov <ast@kernel.org>
Showing
- include/linux/bpf.h 7 additions, 0 deletionsinclude/linux/bpf.h
- include/linux/skmsg.h 0 additions, 17 deletionsinclude/linux/skmsg.h
- kernel/bpf/syscall.c 3 additions, 2 deletionskernel/bpf/syscall.c
- kernel/bpf/verifier.c 71 additions, 2 deletionskernel/bpf/verifier.c
- net/core/skmsg.c 28 additions, 6 deletionsnet/core/skmsg.c
- net/core/sock_map.c 35 additions, 54 deletionsnet/core/sock_map.c
- net/ipv4/tcp_bpf.c 5 additions, 8 deletionsnet/ipv4/tcp_bpf.c
- net/ipv4/udp_bpf.c 4 additions, 5 deletionsnet/ipv4/udp_bpf.c
- tools/testing/selftests/bpf/prog_tests/sockmap_basic.c 78 additions, 0 deletionstools/testing/selftests/bpf/prog_tests/sockmap_basic.c
- tools/testing/selftests/bpf/progs/test_sockmap_invalid_update.c 23 additions, 0 deletions...testing/selftests/bpf/progs/test_sockmap_invalid_update.c
- tools/testing/selftests/bpf/progs/test_sockmap_update.c 48 additions, 0 deletionstools/testing/selftests/bpf/progs/test_sockmap_update.c
Loading
Please register or sign in to comment