Merge branch 'bpf-sockopt-hooks'

Stanislav Fomichev says: ==================== This series implements two new per-cgroup hooks: getsockopt and setsockopt along with a new sockopt program type. The idea is pretty similar to recently introduced cgroup sysctl hooks, but implementation is simpler (no need to convert to/from strings). What this can be applied to: * move business logic of what tos/priority/etc can be set by containers (either pass or reject) * handle existing options (or introduce new ones) differently by propagating some information in cgroup/socket local storage Compared to a simple syscall/{g,s}etsockopt tracepoint, those hooks are context aware. Meaning, they can access underlying socket and use cgroup and socket local storage. v9: * allow overwriting setsocktop arguments (Alexei Starovoitov) (see individual changes for more changelog details) ==================== Signed-off-by: Alexei Starovoitov <ast@kernel.org>
2026-10-14 05:55:17 +00:00 · 2019-06-27 15:25:17 -07:00 · 2019-06-27 15:25:17 -07:00 · 2ec1899e99
commit 2ec1899e99
parent 3b1c667e47 f6d08d9d85
30 changed files with 2415 additions and 10 deletions
--- a/Documentation/bpf/index.rst
+++ b/Documentation/bpf/index.rst
--- a/Documentation/bpf/prog_cgroup_sockopt.rst
+++ b/Documentation/bpf/prog_cgroup_sockopt.rst
--- a/include/linux/bpf-cgroup.h
+++ b/include/linux/bpf-cgroup.h
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
--- a/include/linux/bpf_types.h
+++ b/include/linux/bpf_types.h
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
--- a/kernel/bpf/cgroup.c
+++ b/kernel/bpf/cgroup.c
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
--- a/net/core/filter.c
+++ b/net/core/filter.c
--- a/net/socket.c
+++ b/net/socket.c
--- a/tools/bpf/bpftool/Documentation/bpftool-cgroup.rst
+++ b/tools/bpf/bpftool/Documentation/bpftool-cgroup.rst
--- a/tools/bpf/bpftool/Documentation/bpftool-prog.rst
+++ b/tools/bpf/bpftool/Documentation/bpftool-prog.rst
--- a/tools/bpf/bpftool/bash-completion/bpftool
+++ b/tools/bpf/bpftool/bash-completion/bpftool
--- a/tools/bpf/bpftool/cgroup.c
+++ b/tools/bpf/bpftool/cgroup.c
--- a/tools/bpf/bpftool/main.h
+++ b/tools/bpf/bpftool/main.h
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
--- a/tools/lib/bpf/libbpf_probes.c
+++ b/tools/lib/bpf/libbpf_probes.c
--- a/tools/testing/selftests/bpf/.gitignore
+++ b/tools/testing/selftests/bpf/.gitignore
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
--- a/tools/testing/selftests/bpf/progs/sockopt_multi.c
+++ b/tools/testing/selftests/bpf/progs/sockopt_multi.c
--- a/tools/testing/selftests/bpf/progs/sockopt_sk.c
+++ b/tools/testing/selftests/bpf/progs/sockopt_sk.c
--- a/tools/testing/selftests/bpf/test_section_names.c
+++ b/tools/testing/selftests/bpf/test_section_names.c
--- a/tools/testing/selftests/bpf/test_sockopt.c
+++ b/tools/testing/selftests/bpf/test_sockopt.c
--- a/tools/testing/selftests/bpf/test_sockopt_multi.c
+++ b/tools/testing/selftests/bpf/test_sockopt_multi.c
--- a/tools/testing/selftests/bpf/test_sockopt_sk.c
+++ b/tools/testing/selftests/bpf/test_sockopt_sk.c