bpf: cgroup: allow multi-attach program to replace itself
Subsystems (5)
PATCH 1/1 bpf: cgroup: allow multi-attach program to replace itself
When using BPF_PROG_ATTACH to attach a program to a cgroup in BPF_F_ALLOW_MULTI mode, it is not possible to replace a program with itself. This is because the check for duplicate programs doesn't take the replacement program into account.
Replacing a program with itself might seem weird, but it has some uses: first, it allows resetting the associated cgroup storage. Second, it makes the API consistent with the non-ALLOW_MULTI usage, where it is possible to replace a program with itself. Third, it aligns BPF_PROG_ATTACH with bpf_link, where replacing itself is also supported.
Sice this code has been refactored a few times this change will
only apply to v5.7 and later. Adjustments could be made to
commit 1020c1f24a94 ("bpf: Simplify __cgroup_bpf_attach") and
commit d7bf2c10af05 ("bpf: allocate cgroup storage entries on attaching bpf programs") as well as commit 324bda9e6c5a ("bpf: multi program support for cgroup+bpf")
--- kernel/bpf/cgroup.c | 2 +- .../testing/selftests/bpf/prog_tests/cgroup_attach_multi.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-)
kernel/bpf/cgroup.c +1 -1
@@ -378,7 +378,7 @@ static struct bpf_prog_list *find_attach_entry(struct list_head *progs, }list_for_each_entry (pl, progs, node) { -if (prog && pl->prog == prog) +if (prog && pl->prog == prog && prog != replace_prog)/* disallow attaching the same prog twice */ return ERR_PTR (-EINVAL );if (link && pl->link == link)
tools/testing/selftests/bpf/prog_tests/cgroup_attach_multi.c +7 -0
@@ -230,6 +230,13 @@ void test_cgroup_attach_multi(void) "prog_replace", "errno=%d\n", errno)) goto err; +/* replace program with itself */ + attach_opts.replace_prog_fd = allow_prog[6 ]; +if (CHECK (bpf_prog_attach_xattr (allow_prog[6 ], cg1, +BPF_CGROUP_INET_EGRESS , &attach_opts), +"prog_replace" ,"errno=%d\n" , errno)) + goto err; + value =0 ;CHECK_FAIL (bpf_map_update_elem (map_fd, &key, &value,0 ));CHECK_FAIL (system (PING_CMD ));
Signature · 1 line
2.25.1
Alexei Starovoitov
AppliedQuoted 13 lines · Lorenz Bauer
When using
BPF_PROG_ATTACHto attach a program to a cgroup inBPF_F_ALLOW_MULTImode, it is not possible to replace a program with itself. This is because the check for duplicate programs doesn't take the replacement program into account.Replacing a program with itself might seem weird, but it has some uses: first, it allows resetting the associated cgroup storage. Second, it makes the API consistent with the non-ALLOW_MULTI usage, where it is possible to replace a program with itself. Third, it aligns
BPF_PROG_ATTACHwithbpf_link, where replacing itself is also supported.
Quoted 8 lines
Sice this code has been refactored a few times this change will
only apply to v5.7 and later. Adjustments could be made to
commit1020c1f24a94("bpf: Simplify__cgroup_bpf_attach") and
commitd7bf2c10af05("bpf: allocate cgroup storage entries on attaching bpf programs") as well as commit324bda9e6c5a("bpf: multi program support for cgroup+bpf")Signed-off-by Lorenz Bauer <[email protected]>Fixes af6eea57437a ("bpf: Implement bpf_link-based cgroup BPF program attachment")
Applied. Thanks