[bpf-next,v5,00/12] Dynptr fixes

Message

Kumar Kartikeya Dwivedi Jan. 21, 2023, 12:22 a.m. UTC

This is part 2 of https://lore.kernel.org/bpf/[e-mail].

Changelog:
----------
v4 -> v5
v5: https://lore.kernel.org/bpf/[e-mail]

 * Add comments, tests from Joanne
 * Add Joanne's acks

v3 -> v4
v3: https://lore.kernel.org/bpf/[e-mail]

 * Adopt BPF ASM tests to more readable style (Alexei)

v2 -> v3
v2: https://lore.kernel.org/bpf/[e-mail]

 * Fix slice invalidation logic for unreferenced dynptrs (Joanne)
 * Add selftests for precise slice invalidation on destruction
 * Add Joanne's acks

v1 -> v2
v1: https://lore.kernel.org/bpf/[e-mail]

 * Return error early in case of overwriting referenced dynptr slots (Andrii, Joanne)
 * Rename destroy_stack_slots_dynptr to destroy_if_dynptr_stack_slot (Joanne)
 * Invalidate dynptr slices associated with dynptr in destroy_if_dynptr_stack_slot (Joanne)
 * Combine both dynptr_get_spi and is_spi_bounds_valid (Joanne)
 * Compute spi once in process_dynptr_func and pass it as parameter instead of recomputing (Joanne)
 * Add comments expanding REG_LIVE_WRITTEN marking in unmark_stack_slots_dynptr (Joanne)
 * Add comments explaining why destroy_if_dynptr_stack_slot call needs to be done for both spi
   and spi - 1 (Joanne)
 * Port BPF assembly tests from test_verifier to test_progs framework (Andrii)
 * Address misc feedback, rebase to bpf-next

Old v1 -> v1
Old v1: https://lore.kernel.org/bpf/[e-mail]

 * Allow overwriting dynptr stack slots from dynptr init helpers
 * Fix a bug in alignment check where reg->var_off.value was still not included
 * Address other minor nits

Eduard Zingerman (1):
  selftests/bpf: convenience macro for use with 'asm volatile' blocks

Kumar Kartikeya Dwivedi (11):
  bpf: Fix state pruning for STACK_DYNPTR stack slots
  bpf: Fix missing var_off check for ARG_PTR_TO_DYNPTR
  bpf: Fix partial dynptr stack slot reads/writes
  bpf: Invalidate slices on destruction of dynptrs on stack
  bpf: Allow reinitializing unreferenced dynptr stack slots
  bpf: Combine dynptr_get_spi and is_spi_bounds_valid
  bpf: Avoid recomputing spi in process_dynptr_func
  selftests/bpf: Add dynptr pruning tests
  selftests/bpf: Add dynptr var_off tests
  selftests/bpf: Add dynptr partial slot overwrite tests
  selftests/bpf: Add dynptr helper tests

 include/linux/bpf_verifier.h                  |   5 +-
 kernel/bpf/verifier.c                         | 407 +++++++++++++---
 .../bpf/prog_tests/kfunc_dynptr_param.c       |   2 +-
 tools/testing/selftests/bpf/progs/bpf_misc.h  |   7 +
 .../testing/selftests/bpf/progs/dynptr_fail.c | 453 +++++++++++++++++-
 5 files changed, 798 insertions(+), 76 deletions(-)


base-commit: 00b8f39f1d15c7e16e3f5ca7538f522f3a89131f

Comments

Alexei Starovoitov Jan. 21, 2023, 2 a.m. UTC | #1

On Fri, Jan 20, 2023 at 4:22 PM Kumar Kartikeya Dwivedi
<[e-mail]> wrote:
>
> This is part 2 of https://lore.kernel.org/bpf/[e-mail].
>
> Changelog:
> ----------
> v4 -> v5
> v5: https://lore.kernel.org/bpf/[e-mail]
>
>  * Add comments, tests from Joanne
>  * Add Joanne's acks

This is great already.
Let's address any further comments in the follow up.
Thank you for fixing these issues.
Applied.

[e-mail] Jan. 21, 2023, 2:10 a.m. UTC | #2

Hello:

This series was applied to bpf/bpf-next.git (master)
by Alexei Starovoitov <[e-mail]>:

On Sat, 21 Jan 2023 05:52:29 +0530 you wrote:
> This is part 2 of https://lore.kernel.org/bpf/[e-mail].
> 
> Changelog:
> ----------
> v4 -> v5
> v5: https://lore.kernel.org/bpf/[e-mail]
> 
> [...]

Here is the summary with links:
  - [bpf-next,v5,01/12] bpf: Fix state pruning for STACK_DYNPTR stack slots
    https://git.kernel.org/bpf/bpf-next/c/d6fefa1105da
  - [bpf-next,v5,02/12] bpf: Fix missing var_off check for ARG_PTR_TO_DYNPTR
    https://git.kernel.org/bpf/bpf-next/c/79168a669d81
  - [bpf-next,v5,03/12] bpf: Fix partial dynptr stack slot reads/writes
    https://git.kernel.org/bpf/bpf-next/c/ef8fc7a07c0e
  - [bpf-next,v5,04/12] bpf: Invalidate slices on destruction of dynptrs on stack
    https://git.kernel.org/bpf/bpf-next/c/f8064ab90d66
  - [bpf-next,v5,05/12] bpf: Allow reinitializing unreferenced dynptr stack slots
    https://git.kernel.org/bpf/bpf-next/c/379d4ba831cf
  - [bpf-next,v5,06/12] bpf: Combine dynptr_get_spi and is_spi_bounds_valid
    https://git.kernel.org/bpf/bpf-next/c/f5b625e5f8bb
  - [bpf-next,v5,07/12] bpf: Avoid recomputing spi in process_dynptr_func
    https://git.kernel.org/bpf/bpf-next/c/1ee72bcbe48d
  - [bpf-next,v5,08/12] selftests/bpf: convenience macro for use with 'asm volatile' blocks
    https://git.kernel.org/bpf/bpf-next/c/91b875a5e43b
  - [bpf-next,v5,09/12] selftests/bpf: Add dynptr pruning tests
    https://git.kernel.org/bpf/bpf-next/c/f4d24edf1b92
  - [bpf-next,v5,10/12] selftests/bpf: Add dynptr var_off tests
    https://git.kernel.org/bpf/bpf-next/c/ef4810135396
  - [bpf-next,v5,11/12] selftests/bpf: Add dynptr partial slot overwrite tests
    https://git.kernel.org/bpf/bpf-next/c/011edc8e49b8
  - [bpf-next,v5,12/12] selftests/bpf: Add dynptr helper tests
    https://git.kernel.org/bpf/bpf-next/c/ae8e354c497a

You are awesome, thank you!