Merge tag 'for-6.7/io_uring-sockopt-2023-10-30' of git://git.kernel.dk/linux
Pull io_uring {get,set}sockopt support from Jens Axboe: "This adds support for using getsockopt and setsockopt via io_uring. The main use cases for this is to enable use of direct descriptors, rather than first instantiating a normal file descriptor, doing the option tweaking needed, then turning it into a direct descriptor. With this support, we can avoid needing a regular file descriptor completely. The net and bpf bits have been signed off on their side" * tag 'for-6.7/io_uring-sockopt-2023-10-30' of git://git.kernel.dk/linux: selftests/bpf/sockopt: Add io_uring support io_uring/cmd: Introduce SOCKET_URING_OP_SETSOCKOPT io_uring/cmd: Introduce SOCKET_URING_OP_GETSOCKOPT io_uring/cmd: return -EOPNOTSUPP if net is disabled selftests/net: Extract uring helpers to be reusable tools headers: Grab copy of io_uring.h io_uring/cmd: Pass compat mode in issue_flags net/socket: Break down __sys_getsockopt net/socket: Break down __sys_setsockopt bpf: Add sockptr support for setsockopt bpf: Add sockptr support for getsockopt
No related branches found
No related tags found
Showing
- include/linux/bpf-cgroup.h 5 additions, 4 deletionsinclude/linux/bpf-cgroup.h
- include/linux/io_uring.h 1 addition, 0 deletionsinclude/linux/io_uring.h
- include/net/sock.h 4 additions, 2 deletionsinclude/net/sock.h
- include/uapi/linux/io_uring.h 8 additions, 0 deletionsinclude/uapi/linux/io_uring.h
- io_uring/uring_cmd.c 53 additions, 0 deletionsio_uring/uring_cmd.c
- kernel/bpf/cgroup.c 14 additions, 11 deletionskernel/bpf/cgroup.c
- net/core/sock.c 0 additions, 8 deletionsnet/core/sock.c
- net/socket.c 67 additions, 37 deletionsnet/socket.c
- tools/include/io_uring/mini_liburing.h 282 additions, 0 deletionstools/include/io_uring/mini_liburing.h
- tools/include/uapi/linux/io_uring.h 757 additions, 0 deletionstools/include/uapi/linux/io_uring.h
- tools/testing/selftests/bpf/prog_tests/sockopt.c 107 additions, 6 deletionstools/testing/selftests/bpf/prog_tests/sockopt.c
- tools/testing/selftests/net/Makefile 1 addition, 0 deletionstools/testing/selftests/net/Makefile
- tools/testing/selftests/net/io_uring_zerocopy_tx.c 2 additions, 266 deletionstools/testing/selftests/net/io_uring_zerocopy_tx.c
Loading
Please register or sign in to comment