All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eduard Zingerman <eddyz87@gmail.com>
To: stable@vger.kernel.org, ast@kernel.org
Cc: andrii@kernel.org, daniel@iogearbox.net, martin.lau@linux.dev,
	yonghong.song@linux.dev, mykolal@fb.com,
	gregkh@linuxfoundation.org, mat.gienieczko@tum.de,
	Eduard Zingerman <eddyz87@gmail.com>
Subject: [PATCH 6.6.y 00/17] bpf: backport of iterator and callback handling fixes
Date: Thu, 25 Jan 2024 02:15:37 +0200	[thread overview]
Message-ID: <20240125001554.25287-1-eddyz87@gmail.com> (raw)

This is a backport of two upstream patch-sets:
1. "exact states comparison for iterator convergence checks"
   https://lore.kernel.org/all/20231024000917.12153-1-eddyz87@gmail.com/
2. "verify callbacks as if they are called unknown number of times"
   https://lore.kernel.org/all/20231121020701.26440-1-eddyz87@gmail.com/
  
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 <mat.gienieczko@tum.de>.
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

-- 
2.43.0


             reply	other threads:[~2024-01-25  0:16 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-25  0:15 Eduard Zingerman [this message]
2024-01-25  0:15 ` [PATCH 6.6.y 01/17] bpf: move explored_state() closer to the beginning of verifier.c Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 02/17] bpf: extract same_callsites() as utility function Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 03/17] bpf: exact states comparison for iterator convergence checks Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 04/17] selftests/bpf: tests with delayed read/precision makrs in loop body Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 05/17] bpf: correct loop detection for iterators convergence Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 06/17] selftests/bpf: test if state loops are detected in a tricky case Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 07/17] bpf: print full verifier states on infinite loop detection Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 08/17] selftests/bpf: track tcp payload offset as scalar in xdp_synproxy Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 09/17] selftests/bpf: track string payload offset as scalar in strobemeta Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 10/17] bpf: extract __check_reg_arg() utility function Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 11/17] bpf: extract setup_func_entry() " Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 12/17] bpf: verify callbacks as if they are called unknown number of times Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 13/17] selftests/bpf: tests for iterating callbacks Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 14/17] bpf: widening for callback iterators Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 15/17] selftests/bpf: test widening for iterating callbacks Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 16/17] bpf: keep track of max number of bpf_loop callback iterations Eduard Zingerman
2024-01-25  0:15 ` [PATCH 6.6.y 17/17] selftests/bpf: check if max number of bpf_loop iterations is tracked Eduard Zingerman
2024-01-27  1:13 ` [PATCH 6.6.y 00/17] bpf: backport of iterator and callback handling fixes Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240125001554.25287-1-eddyz87@gmail.com \
    --to=eddyz87@gmail.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=martin.lau@linux.dev \
    --cc=mat.gienieczko@tum.de \
    --cc=mykolal@fb.com \
    --cc=stable@vger.kernel.org \
    --cc=yonghong.song@linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.