bpf: Implement mprog API on top of existing cgroup progs #8917
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![kernel-patches-daemon-bpf[bot]](https://avatars.githubusercontent.com/u/70728002?s=60&v=4){kind=small}
|
Upstream branch: b69d441 |
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
8b8229f to
4b2ad00
Compare
|
Upstream branch: 32c563d |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
758ca27 to
9cd43c0
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
4b2ad00 to
13a3aab
Compare
|
Upstream branch: 0f2d39f |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
9cd43c0 to
f4bcb75
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
13a3aab to
f1ad525
Compare
|
Upstream branch: cf15cdc |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
f4bcb75 to
98c5538
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
f1ad525 to
d99abbe
Compare
|
Upstream branch: cb4a119 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
98c5538 to
b6ef7e3
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
d99abbe to
3deadef
Compare
|
Upstream branch: 5a8cb23 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
b6ef7e3 to
ea76308
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
3deadef to
71504b4
Compare
|
Upstream branch: c8ce7db |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
ea76308 to
7003617
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
71504b4 to
4861ed7
Compare
|
Upstream branch: 7220eab |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
7003617 to
1e39891
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
4861ed7 to
833154b
Compare
|
Upstream branch: 149e0cf |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
1e39891 to
969751d
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
833154b to
db8d927
Compare
|
Upstream branch: 1cb0f56 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
fefb4d7 to
d592313
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
b62c574 to
7b56de2
Compare
|
Upstream branch: b615ce5 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
d592313 to
4cbef7a
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
7b56de2 to
49174bd
Compare
|
Upstream branch: b615ce5 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
4cbef7a to
2ab9034
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
49174bd to
f3a4188
Compare
|
Upstream branch: 25b6d5d |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
2ab9034 to
672bc8f
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
f3a4188 to
f10d83e
Compare
|
Upstream branch: 4e2e684 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
672bc8f to
bd0cc7e
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
f10d83e to
9857a0f
Compare
|
Upstream branch: d90f0bc |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
bd0cc7e to
5c35a15
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
9857a0f to
b93b30b
Compare
added 5 commits
May 22, 2025 09:35
One of key items in mprog API is revision for prog list. The revision number will be increased if the prog list changed, e.g., attach, detach or replace. Add 'revisions' field to struct cgroup_bpf, representing revisions for all cgroup related attachment types. The initial revision value is set to 1, the same as kernel mprog implementations. Acked-by: Andrii Nakryiko <[email protected]> Signed-off-by: Yonghong Song <[email protected]>
Current cgroup prog ordering is appending at attachment time. This is not ideal. In some cases, users want specific ordering at a particular cgroup level. To address this, the existing mprog API seems an ideal solution with supporting BPF_F_BEFORE and BPF_F_AFTER flags. But there are a few obstacles to directly use kernel mprog interface. Currently cgroup bpf progs already support prog attach/detach/replace and link-based attach/detach/replace. For example, in struct bpf_prog_array_item, the cgroup_storage field needs to be together with bpf prog. But the mprog API struct bpf_mprog_fp only has bpf_prog as the member, which makes it difficult to use kernel mprog interface. In another case, the current cgroup prog detach tries to use the same flag as in attach. This is different from mprog kernel interface which uses flags passed from user space. So to avoid modifying existing behavior, I made the following changes to support mprog API for cgroup progs: - The support is for prog list at cgroup level. Cross-level prog list (a.k.a. effective prog list) is not supported. - Previously, BPF_F_PREORDER is supported only for prog attach, now BPF_F_PREORDER is also supported by link-based attach. - For attach, BPF_F_BEFORE/BPF_F_AFTER/BPF_F_ID/BPF_F_LINK is supported similar to kernel mprog but with different implementation. - For detach and replace, use the existing implementation. - For attach, detach and replace, the revision for a particular prog list, associated with a particular attach type, will be updated by increasing count by 1. Signed-off-by: Yonghong Song <[email protected]>
Currently libbpf supports bpf_program__attach_cgroup() with signature:
LIBBPF_API struct bpf_link *
bpf_program__attach_cgroup(const struct bpf_program *prog, int cgroup_fd);
To support mprog style attachment, additionsl fields like flags,
relative_{fd,id} and expected_revision are needed.
Add a new API:
LIBBPF_API struct bpf_link *
bpf_program__attach_cgroup_opts(const struct bpf_program *prog, int cgroup_fd,
const struct bpf_cgroup_opts *opts);
where bpf_cgroup_opts contains all above needed fields.
Acked-by: Andrii Nakryiko <[email protected]>
Signed-off-by: Yonghong Song <[email protected]>
Move static inline functions id_from_prog_fd() and id_from_link_fd() from prog_tests/tc_helpers.h to test_progs.h so these two functions can be reused for later cgroup mprog selftests. Signed-off-by: Yonghong Song <[email protected]>
Two tests are added:
- cgroup_mprog_opts, which mimics tc_opts.c ([1]). Both prog and link
attach are tested. Some negative tests are also included.
- cgroup_mprog_ordering, which actually runs the program with some mprog
API flags.
[1] https://github.com/torvalds/linux/blob/master/tools/testing/selftests/bpf/prog_tests/tc_opts.c
Signed-off-by: Yonghong Song <[email protected]>
|
Upstream branch: 5ead949 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/952282=>bpf-next
branch
from
5c35a15 to
510e1e5
Compare
|
At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=963862 expired. Closing PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request for series with
subject: bpf: Implement mprog API on top of existing cgroup progs
version: 2
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=961050