Add fd_array_cnt attribute for BPF_PROG_LOAD #8148
Closed
+535
−98
Conversation
This file contains 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: c8d02b5 |
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
789c0d4
to
b87df96
Compare
|
Upstream branch: 45e04eb |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/909801=>bpf-next
branch
from
fb2399d
to
f425c0b
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
b87df96
to
767031f
Compare
|
Upstream branch: 3bfb49d |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/909801=>bpf-next
branch
from
f425c0b
to
0f5b2c8
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
767031f
to
953be85
Compare
|
Upstream branch: c721d8f |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/909801=>bpf-next
branch
from
0f5b2c8
to
cff4715
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
953be85
to
e5644e7
Compare
|
Upstream branch: c721d8f |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/909801=>bpf-next
branch
from
cff4715
to
9d749eb
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
e5644e7
to
5d3ed6f
Compare
Add a new helper to get a pointer to a struct btf from a file descriptor. This helper doesn't increase a refcnt. Add a comment explaining this and pointing to a corresponding function which does take a reference. Signed-off-by: Anton Protopopov <[email protected]>
Move some inlined map/prog compatibility checks from the resolve_pseudo_ldimm64() function to the dedicated check_map_prog_compatibility() function. Call the latter function from the add_used_map_from_fd() function directly. This simplifies code and optimizes logic a bit, as before these changes the check_map_prog_compatibility() function was executed on every map usage, which doesn't make sense, as it doesn't include any per-instruction checks, only map type vs. prog type. (This patch also simplifies a consequent patch which will call the add_used_map_from_fd() function from another code path.) Signed-off-by: Anton Protopopov <[email protected]> Acked-by: Andrii Nakryiko <[email protected]>
The fd_array attribute of the BPF_PROG_LOAD syscall may contain a set of file descriptors: maps or btfs. This field was introduced as a sparse array. Introduce a new attribute, fd_array_cnt, which, if present, indicates that the fd_array is a continuous array of the corresponding length. If fd_array_cnt is non-zero, then every map in the fd_array will be bound to the program, as if it was used by the program. This functionality is similar to the BPF_PROG_BIND_MAP syscall, but such maps can be used by the verifier during the program load. Signed-off-by: Anton Protopopov <[email protected]>
Add new fd_array_cnt field to bpf_prog_load_opts and pass it in bpf_attr, if set. Signed-off-by: Anton Protopopov <[email protected]>
Add a new set of tests to test the new field in PROG_LOAD-related
part of bpf_attr: fd_array_cnt.
Add the following test cases:
* fd_array_cnt/no-fd-array: program is loaded in a normal
way, without any fd_array present
* fd_array_cnt/fd-array-ok: pass two extra non-used maps,
check that they're bound to the program
* fd_array_cnt/fd-array-dup-input: pass a few extra maps,
only two of which are unique
* fd_array_cnt/fd-array-ref-maps-in-array: pass a map in
fd_array which is also referenced from within the program
* fd_array_cnt/fd-array-trash-input: pass array with some trash
* fd_array_cnt/fd-array-with-holes: pass an array with holes (fd=0)
* fd_array_cnt/fd-array-2big: pass too large array
All the tests above are using the bpf(2) syscall directly,
no libbpf involved.
Signed-off-by: Anton Protopopov <[email protected]>
The bpf_remove_insns() function returns WARN_ON_ONCE(error), where error is a result of bpf_adj_branches(), and thus should be always 0 However, if for any reason it is not 0, then it will be converted to boolean by WARN_ON_ONCE and returned to user space as 1, not an actual error value. Fix this by returning the original err after the WARN check. Signed-off-by: Anton Protopopov <[email protected]> Acked-by: Jiri Olsa <[email protected]>
Replace magic constants in a BTF structure initialization code by proper macros, as is done in other similar selftests. Signed-off-by: Anton Protopopov <[email protected]> Suggested-by: Eduard Zingerman <[email protected]>
|
Upstream branch: c721d8f |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/909801=>bpf-next
branch
from
9d749eb
to
81dba58
Compare
|
At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=913320 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: Add fd_array_cnt attribute for BPF_PROG_LOAD
version: 3
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=913320