Allow variable offsets for syscall PTR_TO_CTX
Status from this message: This series was applied to bpf/bpf-next.git (master)
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v5 Latest7 patches 1 replyApplied 7/7
- v47 patches 5 repliesSuperseded
- v33 patches 13 repliesSuperseded
Earlier versions · 2
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v2 | 3 patches | 0 replies | Superseded | |
| v1 | 4 patches | 5 replies | Superseded |
Changes in v5 from the cover letter
v4: https://lore.kernel.org/bpf/[email protected]
* Use is_var_ctx_off_allowed() consistently.
* Add acks. (Emil)
Patches in v5 All 7 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/7 | bpf: Support variable offsets for syscall PTR_TO_CTXkernel/ tools/ tools/ | +65 | 0 replies | Applied |
| 2/7 | bpf: Enable unaligned accesses for syscall ctxkernel/ | +1 | 0 replies | Applied |
| 3/7 | selftests/bpf: Convert ctx tests from ASM to Ctools/ tools/ | +35 | 0 replies | Applied |
| 4/7 | selftests/bpf: Add syscall ctx variable offset teststools/ tools/ | +267 | 0 replies | Applied |
| 5/7 | selftests/bpf: Test modified syscall ctx for ARG_PTR_TO_CTXtools/ | +94 | 0 replies | Applied |
| 6/7 | selftests/bpf: Add tests for unaligned syscall ctx accessestools/ | +133 | 0 replies | Applied |
| 7/7 | selftests/bpf: Add tests for syscall ctx accesses beyond U16_MAXtools/ | +108 | 1 reply | Applied |
Reviews trailers per patch
All 7 patches have a Reviewed-by or Acked-by.
| Patch | Emil Tsalapatis | Puranjay Mohan | Mykyta Yatsenko |
|---|---|---|---|
| 1/7 | R-b | A-b | A-b |
| 2/7 | R-b | ||
| 3/7 | R-b | ||
| 4/7 | R-b | A-b | A-b |
| 5/7 | R-b | A-b | A-b |
| 6/7 | R-b | ||
| 7/7 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.
Cover letter [PATCH bpf-next v5 0/7] Allow variable offsets for syscall PTR_TO_CTX
Enable pointer modification with variable offsets accumulated in the register for PTR_TO_CTX for syscall programs where it won't be rewritten, and the context is user-supplied and checked against the max offset. See patches for details. Fixed offset support landed in [0].
By combining this set with [0], examples like the one below should succeed verification now.
SEC("syscall")
int prog(void *ctx) {
int *arr = ctx;
int i;
bpf_for(i, 0, 100)
arr[i] *= i;
return 0;}
[0]: https://lore.kernel.org/bpf/[email protected]
Changelog:
----------
v4 -> v5
v4: https://lore.kernel.org/bpf/[email protected]
* Use is_var_ctx_off_allowed() consistently.
* Add acks. (Emil)
v3 -> v4
v3: https://lore.kernel.org/bpf/[email protected]
* Drop comment around describing choice of fixed or variable offsets. (Eduard)
* Simplify offset adjustment for different cases. (Eduard)
* Add PTR_TO_CTX case in __check_mem_access(). (Eduard)
* Drop aligned access constraint from syscall_prog_is_valid_access().
* Wrap naked checks for BPF_PROG_TYPE_SYSCALL in a utility function. (Eduard)
* Split tests into separate clean up and addition patches. (Eduard)
* Remove CAP_SYS_ADMIN changes. (Eduard)
* Enable unaligned access to syscall ctx, add tests.
* Add more tests for various corner cases.
* Add acks. (Puranjay, Mykyta)
v2 -> v3
v2: https://lore.kernel.org/bpf/[email protected]
* Prevent arg_type for KF_ARG_PTR_TO_CTX from applying to other cases due to preceding fallthrough. (Gemini/Sashiko)
v1 -> v2
v1: https://lore.kernel.org/bpf/[email protected]
* Harden check_func_arg_reg_off check with ARG_PTR_TO_CTX.
* Add tests for unmodified ctx into tail calls.
* Squash unmodified ctx change into base commit.
* Add Reviewed-by's from Emil.
Kumar Kartikeya Dwivedi (7):
bpf: Support variable offsets for syscall PTR_TO_CTX
bpf: Enable unaligned accesses for syscall ctx selftests/bpf: Convert ctx tests from ASM to C selftests/bpf: Add syscall ctx variable offset tests selftests/bpf: Test modified syscall ctx for ARG_PTR_TO_CTX selftests/bpf: Add tests for unaligned syscall ctx accesses selftests/bpf: Add tests for syscall ctx accesses beyond U16_MAX
kernel/bpf/syscall.c | 3 +- kernel/bpf/verifier.c | 103 +-- .../selftests/bpf/prog_tests/verifier.c | 2 +- .../selftests/bpf/progs/verifier_ctx.c | 591 ++++++++++++++++-- .../bpf/progs/verifier_global_subprogs.c | 95 ++- .../selftests/bpf/test_kmods/bpf_testmod.c | 2 +- 6 files changed, 703 insertions(+), 93 deletions(-)
base-commit: a1aa9ef47c299c5bbc30594d3c2f0589edf908e6
Signature · 1 line
2.52.0