bpf: verifier: refactor bpf_wq handling #6107
Closed
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-rc[bot]](https://avatars.githubusercontent.com/u/70728002?s=80&v=4){kind=small}
|
Upstream branch: de73422 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
2a180ed to
22821ea
Compare
|
Upstream branch: 0db4941 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/1009123=>bpf-next
branch
from
9ce7178 to
9b00fa5
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
22821ea to
3bfc6dc
Compare
|
Upstream branch: 56b4d16 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/1009123=>bpf-next
branch
from
9b00fa5 to
e01fe4b
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
3bfc6dc to
78417cf
Compare
|
Upstream branch: 56b4d16 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/1009123=>bpf-next
branch
from
e01fe4b to
a93f55c
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
78417cf to
cdcea0f
Compare
|
Upstream branch: 56b4d16 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/1009123=>bpf-next
branch
from
a93f55c to
706d165
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
cdcea0f to
5ba1e72
Compare
Move bpf_wq map-field validation into the common helper by adding a BPF_WORKQUEUE case that maps to record->wq_off, and switch process_wq_func() to use it instead of doing its own offset math. Fix handling maps with no BTF and non-constant offsets for the bpf_wq. This de-duplicates logic with other internal structs (task_work, timer), keeps error reporting consistent, and makes future changes to the layout handling centralized. Fixes: d940c9b ("bpf: add support for KF_ARG_PTR_TO_WORKQUEUE") Signed-off-by: Mykyta Yatsenko <[email protected]> Acked-by: Andrii Nakryiko <[email protected]> Acked-by: Eduard Zingerman <[email protected]>
Add bpf_wq selftests to verify: * BPF program using non-constant offset of struct bpf_wq is rejected * BPF program using map with no BTF for storing struct bpf_wq is rejected Signed-off-by: Mykyta Yatsenko <[email protected]> Tested-by: Eduard Zingerman <[email protected]>
arraymap and hashtab duplicate the logic that checks for and frees
internal structs (timer, workqueue, task_work) based on
BTF record flags. Centralize this by introducing two helpers:
* bpf_map_has_internal_structs(map)
Returns true if the map value contains any of internal structs:
BPF_TIMER | BPF_WORKQUEUE | BPF_TASK_WORK.
* bpf_map_free_internal_structs(map, obj)
Frees the internal structs for a single value object.
Convert arraymap and both the prealloc/malloc hashtab paths to use the
new generic functions. This keeps the functionality for when/how to free
these special fields in one place and makes it easier to add support for
new internal structs in the future without touching every map
implementation.
Signed-off-by: Mykyta Yatsenko <[email protected]>
Acked-by: Eduard Zingerman <[email protected]>
|
Upstream branch: 56b4d16 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/1009123=>bpf-next
branch
from
706d165 to
7542778
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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: verifier: refactor bpf_wq handling
version: 3
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=1009123