Skip to content

Fix global subprog verification context

Kumar Kartikeya Dwivedi bpf 3 versions – Applied

Status from this message: This series was applied to bpf/bpf.git (master)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest2 patches 3 repliesApplied 2/2
  2. v22 patches 5 repliesSuperseded
  3. v12 patches 1 replySuperseded

Changes in v3 from the cover letter

v2: https://lore.kernel.org/bpf/[email protected]

* Clarify that globals are checked only in contexts from which they are reached, with two passes only when both contexts occur. (Alexei)
* Implement in_sleepable_context() as !in_rcu_cs(). (Alexei, Eduard)
* Keep the original subprogram traversal order and repeat until all called contexts have been verified. (Eduard)
* Explain why instruction accounting needs the saved total and why the exception callback uses the main program's context. (Eduard)
* Rename the do_check_common() parameter to is_sleepable. (BPF CI)
* Preserve the harmless global calls with __weak __noinline and check their instruction totals across both contexts. Drop the redundant task-work global RCU test and retain the review acknowledgment. (Eduard)

Patches in v3 All 2 applied

#Subject and filesSizeRepliesApplied
1/2bpf: Verify global subprogs in each sleepability contextinclude/linux/bpf.h kernel/bpf/verifier.c+40 -361 replyApplied
2/2selftests/bpf: Test global subprog callback contextstools/testing/selftests/bpf/progs/verifier_async_cb_context.c+106 -00 repliesApplied

Reviews trailers per patch

All 2 patches have a Reviewed-by or Acked-by.

PatchEduard Zingerman
1/2A-b
2/2A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH bpf v3 0/2] Fix global subprog verification context

Global subprogs can be invoked in both sleepable and non-sleepable contexts, but are verified based on context assumptions for the program type as a whole and not the precise context in which they are invoked. Nicholas identified that this can violate verifier safety assumptions. Verify global subprogs once for each observed sleepability context and add workqueue callback regression tests.

Changelog:
----------
v2 -> v3
v2: https://lore.kernel.org/bpf/[email protected]

* Clarify that globals are checked only in contexts from which they are reached, with two passes only when both contexts occur. (Alexei)
* Implement in_sleepable_context() as !in_rcu_cs(). (Alexei, Eduard)
* Keep the original subprogram traversal order and repeat until all called contexts have been verified. (Eduard)
* Explain why instruction accounting needs the saved total and why the exception callback uses the main program's context. (Eduard)
* Rename the do_check_common() parameter to is_sleepable. (BPF CI)
* Preserve the harmless global calls with __weak __noinline and check their instruction totals across both contexts. Drop the redundant task-work global RCU test and retain the review acknowledgment. (Eduard)

v1 -> v2
v1: https://lore.kernel.org/bpf/[email protected]

* Preserve the harmless global subprog calls in the positive test with barrier() so LLVM cannot eliminate the intended coverage.
* Return zero explicitly from workqueue callbacks after global subprog calls.
* Document cumulative instruction accounting across verification contexts.
* Fix BPF multi-line comment formatting.

Kumar Kartikeya Dwivedi (2):
bpf: Verify global subprogs in each sleepability context selftests/bpf: Test global subprog callback contexts

 include/linux/bpf.h                           |   5 +-
 kernel/bpf/verifier.c                         |  71 ++++++------
 .../bpf/progs/verifier_async_cb_context.c     | 106 ++++++++++++++++++
 3 files changed, 146 insertions(+), 36 deletions(-)

base-commit: 29fcf9ce4bbdf4cc339def776860e1c0095bca98

Signature · 1 line
2.53.0