Merge branch 'replace-cg_bpf-prog'

Browse source

Andrey Ignatov says:

====================
v3->v4:
- use OPTS_VALID and OPTS_GET to handle bpf_prog_attach_opts.

v2->v3:
- rely on DECLARE_LIBBPF_OPTS from libbpf_common.h;
- separate "required" and "optional" arguments in bpf_prog_attach_xattr;
- convert test_cgroup_attach to prog_tests;
- move the new selftest to prog_tests/cgroup_attach_multi.

v1->v2:
- move DECLARE_LIBBPF_OPTS from libbpf.h to bpf.h (patch 4);
- switch new libbpf API to OPTS framework;
- switch selftest to libbpf OPTS framework.

This patch set adds support for replacing cgroup-bpf programs attached with
BPF_F_ALLOW_MULTI flag so that any program in a list can be updated to a new
version without service interruption and order of programs can be preserved.

Please see patch 3 for details on the use-case and API changes.

Other patches:
Patch 1 is preliminary refactoring of __cgroup_bpf_attach to simplify it.
Patch 2 is minor cleanup of hierarchy_allows_attach.
Patch 4 extends libbpf API to support new set of attach attributes.
Patch 5 converts test_cgroup_attach to prog_tests.
Patch 6 adds selftest coverage for the new API.
====================

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

...

This commit is contained in:

Alexei Starovoitov 2019-12-19 21:22:26 -08:00

parent c92bbaa0fd 06ac0186bd

commit 99cacdc6f6

15 changed files with 652 additions and 626 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

4

include/linux/bpf-cgroup.h

View file

10

include/uapi/linux/bpf.h

View file

97

kernel/bpf/cgroup.c

View file

4

kernel/bpf/syscall.c

View file

5

kernel/cgroup/cgroup.c

View file

10

tools/include/uapi/linux/bpf.h

View file

17

tools/lib/bpf/bpf.c

View file

11

tools/lib/bpf/bpf.h

View file

1

tools/lib/bpf/libbpf.map

View file

1

tools/testing/selftests/bpf/.gitignore vendored

View file

3

tools/testing/selftests/bpf/Makefile

View file

111

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

View file

285

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

View file

148

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

View file

571

tools/testing/selftests/bpf/test_cgroup_attach.c

View file