RFC: Make check_func_arg table driven
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest11 patches 16 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/11 | btf: Fix BTF_SET_START_GLOBAL macroinclude/ tools/ | +6 | 2 replies | |
| 2/11 | btf: add a global set of valid BTF socket idsinclude/ net/ tools/ | +9 | 1 reply | |
| 3/11 | btf: make btf_set_contains take a const pointerinclude/ kernel/ | +2 | 1 reply | |
| 4/11 | bpf: check scalar or invalid register in check_helper_mem_accesskernel/ | +11 | 2 replies | |
| 5/11 | bpf: allow specifying a set of BTF IDs for helper argumentsinclude/ kernel/ kernel/ +6 more | +76 | 6 replies | |
| 6/11 | bpf: make reference tracking in check_func_arg generickernel/ | +10 | 1 reply | |
| 7/11 | bpf: always check access to PTR_TO_CTX regardless of arg_typekernel/ | +6 | 0 replies | |
| 8/11 | bpf: set meta->raw_mode for pointers to memory closer to it's usekernel/ | +5 | 0 replies | |
| 9/11 | bpf: check ARG_PTR_TO_SPINLOCK register type in check_func_argkernel/ | +14 | 0 replies | |
| 10/11 | bpf: hoist type checking for nullable arg typeskernel/ | +31 | 1 reply | |
| 11/11 | bpf: use a table to drive helper arg type checksinclude/ kernel/ | +117 | 0 replies |
Reviews trailers per patch
4 of 11 patches have a Reviewed-by or Acked-by.
| Patch | Andrii Nakryiko |
|---|---|
| 1/11 | |
| 2/11 | |
| 3/11 | A-b |
| 4/11 | A-b |
| 5/11 | |
| 6/11 | A-b |
| 7/11 | |
| 8/11 | |
| 9/11 | |
| 10/11 | A-b |
| 11/11 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH bpf-next 00/11] RFC: Make check_func_arg table driven
This is what happened when I got sidetracked from my work on sockmap bpf_iter support [1]. For that I wanted to allow passing a BTF pointer to functions expecting a PTR_TO_SOCKET. At first it wasn't at all obvious to me how to add this to check_func_arg, so I started refactoring the function bit by bit. This RFC series is the result of that.
Note: this series is based on top of sockmap iterator, hence the RFC status.
Currently, check_func_arg has this pretty gnarly if statement that compares the valid arg_type with the actualy reg_type. Sprinkled in-between are checks for register_is_null, to short circuit these tests if we're dealing with a nullable arg_type. There is also some code for later bounds / access checking hidden away in there.
This series of patches refactors the function into something like this:
if (reg_is_null && arg_type_is_nullable)
skip type checkingdo type checking, including BTF validation
do bounds / access checking
The type checking is now table driven, which makes it easy to extend the acceptable types. Maybe more importantly, using a table makes it easy to provide more helpful verifier output (see the last patch).
I realise there are quite a few patches here. The most interesting ones are #5 where I introduce a btf_id_set for each helper arg, #10 where I simplify the nullable type checking and finally #11 where I add the table of compatible types.
There are some more simplifications that we could do that could get rid of resolve_map_arg_type, but the series is already too long.
Martin: you said that you're working on extending PTR_TO_SOCK_COMMON, would this series help you with that?
1: https://lore.kernel.org/bpf/[email protected]/T/#t
Lorenz Bauer (11):
btf: Fix BTF_SET_START_GLOBAL macro
btf: add a global set of valid BTF socket ids
btf: make btf_set_contains take a const pointer
bpf: check scalar or invalid register in check_helper_mem_access
bpf: allow specifying a set of BTF IDs for helper arguments
bpf: make reference tracking in check_func_arg generic
bpf: always check access to PTR_TO_CTX regardless of arg_type
bpf: set meta->raw_mode for pointers to memory closer to it's use
bpf: check ARG_PTR_TO_SPINLOCK register type in check_func_arg
bpf: hoist type checking for nullable arg types
bpf: use a table to drive helper arg type checks
include/linux/bpf.h | 25 ++- include/linux/btf_ids.h | 7 +- kernel/bpf/bpf_inode_storage.c | 8 +- kernel/bpf/btf.c | 24 +-- kernel/bpf/stackmap.c | 5 +- kernel/bpf/verifier.c | 355 ++++++++++++++++++--------------- kernel/trace/bpf_trace.c | 15 +- net/core/bpf_sk_storage.c | 10 +- net/core/filter.c | 38 ++-- net/ipv4/bpf_tcp_ca.c | 24 +-- tools/include/linux/btf_ids.h | 7 +- 11 files changed, 269 insertions(+), 249 deletions(-)
Signature · 1 line
2.25.1