Skip to content

bpf: backport of iterator and callback handling fixes

Eduard Zingerman stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest17 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17bpf: move explored_state() closer to the beginning of verifier.ckernel/bpf/verifier.c+13 -150 replies
2/17bpf: extract same_callsites() as utility functionkernel/bpf/verifier.c+15 -50 replies
3/17bpf: exact states comparison for iterator convergence checksinclude/linux/bpf_verifier.h kernel/bpf/verifier.c+188 -310 replies
4/17selftests/bpf: tests with delayed read/precision makrs in loop bodytools/testing/selftests/bpf/progs/iters.c+518 -00 replies
5/17bpf: correct loop detection for iterators convergenceinclude/linux/bpf_verifier.h kernel/bpf/verifier.c+218 -40 replies
6/17selftests/bpf: test if state loops are detected in a tricky casetools/testing/selftests/bpf/progs/iters.c+177 -00 replies
7/17bpf: print full verifier states on infinite loop detectionkernel/bpf/verifier.c+4 -00 replies
8/17selftests/bpf: track tcp payload offset as scalar in xdp_synproxytools/testing/selftests/bpf/progs/xdp_synproxy_kern.c+52 -320 replies
9/17selftests/bpf: track string payload offset as scalar in strobemetatools/testing/selftests/bpf/progs/strobemeta.h+48 -300 replies
10/17bpf: extract __check_reg_arg() utility functionkernel/bpf/verifier.c+13 -60 replies
11/17bpf: extract setup_func_entry() utility functionkernel/bpf/verifier.c+48 -360 replies
12/17bpf: verify callbacks as if they are called unknown number of timesinclude/linux/bpf_verifier.h kernel/bpf/verifier.c tools/testing/selftests/bpf/progs/cb_refs.c +1 more+237 -1120 replies
13/17selftests/bpf: tests for iterating callbackstools/testing/selftests/bpf/prog_tests/verifier.c tools/testing/selftests/bpf/progs/verifier_iterating_callbacks.c+149 -00 replies
14/17bpf: widening for callback iteratorskernel/bpf/verifier.c+22 -20 replies
15/17selftests/bpf: test widening for iterating callbackstools/testing/selftests/bpf/progs/verifier_iterating_callbacks.c+20 -00 replies
16/17bpf: keep track of max number of bpf_loop callback iterationsinclude/linux/bpf_verifier.h kernel/bpf/verifier.c tools/testing/selftests/bpf/progs/verifier_subprog_precision.c+53 -120 replies
17/17selftests/bpf: check if max number of bpf_loop iterations is trackedtools/testing/selftests/bpf/progs/verifier_iterating_callbacks.c+75 -00 replies

Reviews trailers per patch

9 of 17 patches have a Reviewed-by or Acked-by.

PatchAndrii Nakryiko
1/17
2/17
3/17
4/17
5/17R-b
6/17
7/17A-b
8/17A-b
9/17A-b
10/17A-b
11/17A-b
12/17A-b
13/17A-b
14/17A-b
15/17
16/17
17/17

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

Read the v1 thread

Cover letter [PATCH 6.6.y 00/17] bpf: backport of iterator and callback handling fixes

This is a backport of two upstream patch-sets:
1. "exact states comparison for iterator convergence checks"
https://lore.kernel.org/all/[email protected]/
2. "verify callbacks as if they are called unknown number of times"
https://lore.kernel.org/all/[email protected]/

Both patch-sets fix BPF verifier logic related to handling loops:
for bpf iterators, and for helper functions that accept callback functions.

The backport of (2) was requested as a response to bug report by Mateusz Gienieczko <[email protected]>.
The (1) is a dependency of (2).

The patch-set was tested by running BPF verifier selftests on my local qemu-based setup.

Most of the commits could be cherry-picked but three required merging:

| Action | Upstream commit                                                                                 |
|--------+-------------------------------------------------------------------------------------------------|
| pick   | 3c4e420cb653 ("bpf: move explored_state() closer to the beginning of verifier.c ")              |
| pick   | 4c97259abc9b ("bpf: extract same_callsites() as utility function ")                             |
| merge  | 2793a8b015f7 ("bpf: exact states comparison for iterator convergence checks ")                  |
| pick   | 389ede06c297 ("selftests/bpf: tests with delayed read/precision makrs in loop body ")           |
| pick   | 2a0992829ea3 ("bpf: correct loop detection for iterators convergence ")                         |
| pick   | 64870feebecb ("selftests/bpf: test if state loops are detected in a tricky case ")              |
| pick   | b4d8239534fd ("bpf: print full verifier states on infinite loop detection ")                    |
| drop   | dedd6c894110 ("Merge branch 'exact-states-comparison-for-iterator-convergence-checks' ")        |
|--------+-------------------------------------------------------------------------------------------------|
| pick   | 977bc146d4eb ("selftests/bpf: track tcp payload offset as scalar in xdp_synproxy ")             |
| pick   | 87eb0152bcc1 ("selftests/bpf: track string payload offset as scalar in strobemeta ")            |
| pick   | 683b96f9606a ("bpf: extract __check_reg_arg() utility function ")                               |
| pick   | 58124a98cb8e ("bpf: extract setup_func_entry() utility function ")                              |
| merge  | ab5cfac139ab ("bpf: verify callbacks as if they are called unknown number of times ")           |
| pick   | 958465e217db ("selftests/bpf: tests for iterating callbacks ")                                  |
| pick   | cafe2c21508a ("bpf: widening for callback iterators ")                                          |
| pick   | 9f3330aa644d ("selftests/bpf: test widening for iterating callbacks ")                          |
| merge  | bb124da69c47 ("bpf: keep track of max number of bpf_loop callback iterations ")                 |
| pick   | 57e2a52deeb1 ("selftests/bpf: check if max number of bpf_loop iterations is tracked ")          |
| drop   | acb12c859ac7 ("Merge branch 'verify-callbacks-as-if-they-are-called-unknown-number-of-times' ") |

Note:
I don't know how deal with merge commits, so I just dropped those. These commits are empty but contain cover letters for both series, so it might be useful to pick those (how?).

Eduard Zingerman (17):
bpf: move explored_state() closer to the beginning of verifier.c
bpf: extract same_callsites() as utility function
bpf: exact states comparison for iterator convergence checks selftests/bpf: tests with delayed read/precision makrs in loop body
bpf: correct loop detection for iterators convergence selftests/bpf: test if state loops are detected in a tricky case
bpf: print full verifier states on infinite loop detection selftests/bpf: track tcp payload offset as scalar in xdp_synproxy selftests/bpf: track string payload offset as scalar in strobemeta
bpf: extract __check_reg_arg() utility function
bpf: extract setup_func_entry() utility function
bpf: verify callbacks as if they are called unknown number of times selftests/bpf: tests for iterating callbacks
bpf: widening for callback iterators
selftests/bpf: test widening for iterating callbacks
bpf: keep track of max number of bpf_loop callback iterations selftests/bpf: check if max number of bpf_loop iterations is tracked

 include/linux/bpf_verifier.h                  |  32 +
 kernel/bpf/verifier.c                         | 875 ++++++++++++++----
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 tools/testing/selftests/bpf/progs/cb_refs.c   |   1 +
 tools/testing/selftests/bpf/progs/iters.c     | 695 ++++++++++++++
 .../testing/selftests/bpf/progs/strobemeta.h  |  78 +-
 .../bpf/progs/verifier_iterating_callbacks.c  | 242 +++++
 .../bpf/progs/verifier_subprog_precision.c    |  86 +-
 .../selftests/bpf/progs/xdp_synproxy_kern.c   |  84 +-
 9 files changed, 1830 insertions(+), 265 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_iterating_callbacks.c
Signature · 1 line
2.43.0